diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b11e3cd531..5b3f4336e6 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
 ## References
 _Add references/links to any related issues or PRs. These may include:_
-* Fixes #[issue-number]
-* Related to [REST Contract](https://github.com/DSpace/Rest7Contract)
+* Fixes #`issue-number` (if this fixes an issue ticket)
+* Related to DSpace/RestContract#`pr-number`  (if a corresponding REST Contract PR exists)
 
 ## Description
 Short summary of changes (1-2 sentences).
@@ -22,5 +22,7 @@ _This checklist provides a reminder of what we are going to look for when review
 - [ ] My PR passes Checkstyle validation based on the [Code Style Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Style+Guide).
 - [ ] My PR includes Javadoc for _all new (or modified) public methods and classes_. It also includes Javadoc for large or complex private methods.
 - [ ] My PR passes all tests and includes new/updated Unit or Integration Tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
-- [ ] If my PR includes new, third-party dependencies (in any `pom.xml`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
-- [ ] If my PR modifies the REST API, I've linked to the REST Contract page (or open PR) related to this change.
+- [ ] If my PR includes new libraries/dependencies (in any `pom.xml`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] If my PR modifies REST API endpoints, I've opened a separate [REST Contract](https://github.com/DSpace/RestContract/blob/main/README.md) PR related to this change.
+- [ ] If my PR includes new configurations, I've provided basic technical documentation in the PR itself.
+- [ ] If my PR fixes an issue ticket, I've [linked them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4060dbd672..52714a8ba2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,14 +6,15 @@ name: Build
 # Run this Build for all pushes / PRs to current branch
 on: [push, pull_request]
 
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
 jobs:
   tests:
     runs-on: ubuntu-latest
     env:
       # Give Maven 1GB of memory to work with
-      # Suppress all Maven "downloading" messages in logs (see https://stackoverflow.com/a/35653426)
-      # This also slightly speeds builds, as there is less logging
-      MAVEN_OPTS: "-Xmx1024M -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+      MAVEN_OPTS: "-Xmx1024M"
     strategy:
       # Create a matrix of two separate configurations for Unit vs Integration Tests
       # This will ensure those tasks are run in parallel
@@ -44,18 +45,18 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # https://github.com/actions/setup-java
       - name: Install JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
       # https://github.com/actions/cache
       - name: Cache Maven dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           # Cache entire ~/.m2/repository
           path: ~/.m2/repository
@@ -67,17 +68,17 @@ jobs:
       - name: Run Maven ${{ matrix.type }}
         env:
           TEST_FLAGS: ${{ matrix.mvnflags }}
-        run: mvn install -B -V -P-assembly -Pcoverage-report $TEST_FLAGS
+        run: mvn --no-transfer-progress -V install -P-assembly -Pcoverage-report $TEST_FLAGS
 
       # If previous step failed, save results of tests to downloadable artifact for this job
       # (This artifact is downloadable at the bottom of any job's summary page)
       - name: Upload Results of ${{ matrix.type }} to Artifact
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.type }} results
           path: ${{ matrix.resultsdir }}
 
       # https://github.com/codecov/codecov-action
       - name: Upload coverage to Codecov.io
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
diff --git a/.github/workflows/codescan.yml b/.github/workflows/codescan.yml
new file mode 100644
index 0000000000..7580b4ba3d
--- /dev/null
+++ b/.github/workflows/codescan.yml
@@ -0,0 +1,59 @@
+# DSpace CodeQL code scanning configuration for GitHub
+# https://docs.github.com/en/code-security/code-scanning
+#
+# NOTE: Code scanning must be run separate from our default build.yml
+# because CodeQL requires a fresh build with all tests *disabled*.
+name: "Code Scanning"
+
+# Run this code scan for all pushes / PRs to main branch. Also run once a week.
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+    # Don't run if PR is only updating static documentation
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+  schedule:
+    - cron: "37 0 * * 1"
+
+jobs:
+  analyze:
+    name: Analyze Code
+    runs-on: ubuntu-latest
+    # Limit permissions of this GitHub action. Can only write to security-events
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # https://github.com/actions/setup-java
+      - name: Install JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: 'temurin'
+
+      # Initializes the CodeQL tools for scanning.
+      # https://github.com/github/codeql-action
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          # Codescan Javascript as well since a few JS files exist in REST API's interface
+          languages: java, javascript
+
+      # Autobuild attempts to build any compiled languages
+      # NOTE: Based on testing, this autobuild process works well for DSpace. A custom
+      # DSpace build w/caching (like in build.yml) was about the same speed as autobuild.
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # Perform GitHub Code Scanning.
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 34539abc16..64e12f01aa 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,6 +12,9 @@ on:
       - 'dspace-**'
   pull_request:
 
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
 jobs:
   docker:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace'
@@ -31,21 +34,30 @@ jobs:
       # We turn off 'latest' tag by default.
       TAGS_FLAVOR: |
         latest=false
+      # Architectures / Platforms for which we will build Docker images
+      # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
+      # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64. NOTE: The ARM64 build takes MUCH
+      # longer (around 45mins or so) which is why we only run it when pushing a new Docker image.
+      PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }}
 
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # https://github.com/docker/setup-buildx-action
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
+
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU emulation to build for multiple architectures
+        uses: docker/setup-qemu-action@v2
 
       # https://github.com/docker/login-action
       - name: Login to DockerHub
         # Only login if not a PR, as PRs only trigger a Docker build and not a push
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -57,7 +69,7 @@ jobs:
       # Get Metadata for docker_build_deps step below
       - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-dependencies' image
         id: meta_build_deps
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: dspace/dspace-dependencies
           tags: ${{ env.IMAGE_TAGS }}
@@ -66,10 +78,11 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push 'dspace-dependencies' image
         id: docker_build_deps
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile.dependencies
+          platforms: ${{ env.PLATFORMS }}
           # For pull requests, we run the Docker build (to ensure no PR changes break the build),
           # but we ONLY do an image push to DockerHub if it's NOT a PR
           push: ${{ github.event_name != 'pull_request' }}
@@ -83,7 +96,7 @@ jobs:
       # Get Metadata for docker_build step below
       - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace' image
         id: meta_build
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: dspace/dspace
           tags: ${{ env.IMAGE_TAGS }}
@@ -91,10 +104,11 @@ jobs:
 
       - name: Build and push 'dspace' image
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile
+          platforms: ${{ env.PLATFORMS }}
           # For pull requests, we run the Docker build (to ensure no PR changes break the build),
           # but we ONLY do an image push to DockerHub if it's NOT a PR
           push: ${{ github.event_name != 'pull_request' }}
@@ -108,7 +122,7 @@ jobs:
       # Get Metadata for docker_build_test step below
       - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-test' image
         id: meta_build_test
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: dspace/dspace
           tags: ${{ env.IMAGE_TAGS }}
@@ -119,10 +133,11 @@ jobs:
 
       - name: Build and push 'dspace-test' image
         id: docker_build_test
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile.test
+          platforms: ${{ env.PLATFORMS }}
           # For pull requests, we run the Docker build (to ensure no PR changes break the build),
           # but we ONLY do an image push to DockerHub if it's NOT a PR
           push: ${{ github.event_name != 'pull_request' }}
@@ -136,7 +151,7 @@ jobs:
       # Get Metadata for docker_build_test step below
       - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-cli' image
         id: meta_build_cli
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: dspace/dspace-cli
           tags: ${{ env.IMAGE_TAGS }}
@@ -144,13 +159,14 @@ jobs:
 
       - name: Build and push 'dspace-cli' image
         id: docker_build_cli
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile.cli
+          platforms: ${{ env.PLATFORMS }}
           # For pull requests, we run the Docker build (to ensure no PR changes break the build),
           # but we ONLY do an image push to DockerHub if it's NOT a PR
           push: ${{ github.event_name != 'pull_request' }}
           # Use tags / labels provided by 'docker/metadata-action' above
           tags: ${{ steps.meta_build_cli.outputs.tags }}
-          labels: ${{ steps.meta_build_cli.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta_build_cli.outputs.labels }}
diff --git a/.github/workflows/issue_opened.yml b/.github/workflows/issue_opened.yml
index 3ccdd22a0d..5d7c1c30f7 100644
--- a/.github/workflows/issue_opened.yml
+++ b/.github/workflows/issue_opened.yml
@@ -5,25 +5,22 @@ on:
   issues:
     types: [opened]
 
+permissions: {}
 jobs:
   automation:
     runs-on: ubuntu-latest
     steps:
     # Add the new issue to a project board, if it needs triage
-    # See https://github.com/marketplace/actions/create-project-card-action
-    - name: Add issue to project board
+    # See https://github.com/actions/add-to-project
+    - name: Add issue to triage board
       # Only add to project board if issue is flagged as "needs triage" or has no labels
       # NOTE: By default we flag new issues as "needs triage" in our issue template
       if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
-      uses: technote-space/create-project-card-action@v1
+      uses: actions/add-to-project@v0.3.0
       # Note, the authentication token below is an ORG level Secret. 
-      # It must be created/recreated manually via a personal access token with "public_repo" and "admin:org" permissions
+      # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
       # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token
       # This is necessary because the "DSpace Backlog" project is an org level project (i.e. not repo specific)
       with:
-        GITHUB_TOKEN: ${{ secrets.ORG_PROJECT_TOKEN }}
-        PROJECT: DSpace Backlog
-        COLUMN: Triage
-        CHECK_ORG_PROJECT: true
-      # Ignore errors.
-      continue-on-error: true
+        github-token: ${{ secrets.TRIAGE_PROJECT_TOKEN }}
+        project-url: https://github.com/orgs/DSpace/projects/24
diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml
index dcbab18f1b..d71d244c2b 100644
--- a/.github/workflows/label_merge_conflicts.yml
+++ b/.github/workflows/label_merge_conflicts.yml
@@ -5,21 +5,32 @@ name: Check for merge conflicts
 # NOTE: This means merge conflicts are only checked for when a PR is merged to main.
 on:
   push:
-    branches:
-      - main
+    branches: [ main ]
+  # So that the `conflict_label_name` is removed if conflicts are resolved,
+  # we allow this to run for `pull_request_target` so that github secrets are available.
+  pull_request_target:
+    types: [ synchronize ]
+
+permissions: {}
 
 jobs:
   triage:
+    # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace'
+    if: github.repository == 'dspace/dspace'
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
-      # See: https://github.com/mschilde/auto-label-merge-conflicts/
+      # See: https://github.com/prince-chrismc/label-merge-conflicts-action
       - name: Auto-label PRs with merge conflicts
-        uses: mschilde/auto-label-merge-conflicts@v2.0
+        uses: prince-chrismc/label-merge-conflicts-action@v2
         # Add "merge conflict" label if a merge conflict is detected. Remove it when resolved.
         # Note, the authentication token is created automatically
         # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
         with:
-          CONFLICT_LABEL_NAME: 'merge conflict'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        # Ignore errors
-        continue-on-error: true
+          conflict_label_name: 'merge conflict'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          conflict_comment: |
+            Hi @${author},
+            Conflicts have been detected against the base branch.
+            Please [resolve these conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts) as soon as you can. Thanks!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..45a6af9ce5
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,45 @@
+# How to Contribute
+
+DSpace is a community built and supported project. We do not have a centralized development or support team, but have a dedicated group of volunteers who help us improve the software, documentation, resources, etc.
+
+* [Contribute new code via a Pull Request](#contribute-new-code-via-a-pull-request)
+* [Contribute documentation](#contribute-documentation)
+* [Help others on mailing lists or Slack](#help-others-on-mailing-lists-or-slack)
+* [Join a working or interest group](#join-a-working-or-interest-group)
+
+## Contribute new code via a Pull Request
+
+We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
+Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC7x/Release+Notes).
+
+Code Contribution Checklist
+- [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
+- [ ] PRs **must** pass Checkstyle validation based on our [Code Style Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Style+Guide).
+- [ ] PRs **must** include Javadoc for _all new/modified public methods and classes_. Larger private methods should also have Javadoc
+- [ ] PRs **must** pass all automated tests and include new/updated Unit or Integration tests based on our [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] If a PR includes new libraries/dependencies (in any `pom.xml`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] Basic technical documentation _should_ be provided for any new features or changes to the REST API. REST API changes should be documented in our [Rest Contract](https://github.com/DSpace/RestContract).
+- [ ] If a PR fixes an issue ticket, please [link them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+
+Additional details on the code contribution process can be found in our [Code Contribution Guidelines](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines)
+
+## Contribute documentation
+
+DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC7x 
+
+If you find areas of the DSpace Documentation which you wish to improve, please request a Wiki account by emailing wikihelp@lyrasis.org.
+Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) or email) for access to edit our Documentation.
+
+## Help others on mailing lists or Slack
+
+DSpace has our own [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) community and [Mailing Lists](https://wiki.lyrasis.org/display/DSPACE/Mailing+Lists) where discussions take place and questions are answered.
+Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via LYRASIS).
+
+## Join a working or interest group
+
+Most of the work in building/improving DSpace comes via [Working Groups](https://wiki.lyrasis.org/display/DSPACE/DSpace+Working+Groups) or [Interest Groups](https://wiki.lyrasis.org/display/DSPACE/DSpace+Interest+Groups).
+
+All working/interest groups are open to anyone to join and participate.  A few key groups to be aware of include:
+
+* [DSpace 7 Working Group](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+Working+Group) - This is the main (mostly volunteer) development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs.
+* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers.
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 8a21c60a68..444a1bcf0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ USER dspace
 ADD --chown=dspace . /app/
 # Build DSpace (note: this build doesn't include the optional, deprecated "dspace-rest" webapp)
 # Copy the dspace-installer directory to /install.  Clean up the build to keep the docker image small
-RUN mvn package && \
+RUN mvn --no-transfer-progress package && \
   mv /app/dspace/target/${TARGET_DIR}/* /install && \
   mvn clean
 
diff --git a/Dockerfile.cli b/Dockerfile.cli
index e8966f7bb6..76e559fc83 100644
--- a/Dockerfile.cli
+++ b/Dockerfile.cli
@@ -19,7 +19,7 @@ USER dspace
 # Copy the DSpace source code (from local machine) into the workdir (excluding .dockerignore contents)
 ADD --chown=dspace . /app/
 # Build DSpace.  Copy the dspace-installer directory to /install.  Clean up the build to keep the docker image small
-RUN mvn package && \
+RUN mvn --no-transfer-progress package && \
   mv /app/dspace/target/${TARGET_DIR}/* /install && \
   mvn clean
 
diff --git a/Dockerfile.test b/Dockerfile.test
index 568ff9b60a..4e9b2b5b43 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -22,7 +22,7 @@ USER dspace
 ADD --chown=dspace . /app/
 # Build DSpace (INCLUDING the optional, deprecated "dspace-rest" webapp)
 # Copy the dspace-installer directory to /install.  Clean up the build to keep the docker image small
-RUN mvn package -Pdspace-rest && \
+RUN mvn --no-transfer-progress package -Pdspace-rest && \
   mv /app/dspace/target/${TARGET_DIR}/* /install && \
   mvn clean
 
@@ -58,9 +58,11 @@ COPY --from=ant_build /dspace $DSPACE_INSTALL
 # NOTE: secretRequired="false" should only be used when AJP is NOT accessible from an external network. But, secretRequired="true" isn't supported by mod_proxy_ajp until Apache 2.5
 RUN sed -i '/Service name="Catalina".*/a \\n    <Connector protocol="AJP/1.3" port="8009" address="0.0.0.0" redirectPort="8443" URIEncoding="UTF-8" secretRequired="false" />' $TOMCAT_INSTALL/conf/server.xml
 # Expose Tomcat port and AJP port
-EXPOSE 8080 8009
+EXPOSE 8080 8009 8000
 # Give java extra memory (2GB)
 ENV JAVA_OPTS=-Xmx2000m
+# Set up debugging
+ENV CATALINA_OPTS=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:8000
 
 # Link the DSpace 'server' webapp into Tomcat's webapps directory.
 # This ensures that when we start Tomcat, it runs from /server path (e.g. http://localhost:8080/server/)
diff --git a/LICENSES_THIRD_PARTY b/LICENSES_THIRD_PARTY
index f918af1c3e..92d0b71a70 100644
--- a/LICENSES_THIRD_PARTY
+++ b/LICENSES_THIRD_PARTY
@@ -21,28 +21,29 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
     Apache Software License, Version 2.0:
 
         * Ant-Contrib Tasks (ant-contrib:ant-contrib:1.0b3 - http://ant-contrib.sourceforge.net)
-        * AWS SDK for Java - Core (com.amazonaws:aws-java-sdk-core:1.12.116 - https://aws.amazon.com/sdkforjava)
-        * AWS Java SDK for AWS KMS (com.amazonaws:aws-java-sdk-kms:1.12.116 - https://aws.amazon.com/sdkforjava)
-        * AWS Java SDK for Amazon S3 (com.amazonaws:aws-java-sdk-s3:1.12.116 - https://aws.amazon.com/sdkforjava)
-        * JMES Path Query library (com.amazonaws:jmespath-java:1.12.116 - https://aws.amazon.com/sdkforjava)
-        * jcommander (com.beust:jcommander:1.78 - https://jcommander.org)
+        * AWS SDK for Java - Core (com.amazonaws:aws-java-sdk-core:1.12.261 - https://aws.amazon.com/sdkforjava)
+        * AWS Java SDK for AWS KMS (com.amazonaws:aws-java-sdk-kms:1.12.261 - https://aws.amazon.com/sdkforjava)
+        * AWS Java SDK for Amazon S3 (com.amazonaws:aws-java-sdk-s3:1.12.261 - https://aws.amazon.com/sdkforjava)
+        * JMES Path Query library (com.amazonaws:jmespath-java:1.12.261 - https://aws.amazon.com/sdkforjava)
         * HPPC Collections (com.carrotsearch:hppc:0.8.1 - http://labs.carrotsearch.com/hppc.html/hppc)
-        * parso (com.epam:parso:2.0.11 - https://github.com/epam/parso)
+        * com.drewnoakes:metadata-extractor (com.drewnoakes:metadata-extractor:2.16.0 - https://drewnoakes.com/code/exif/)
+        * parso (com.epam:parso:2.0.14 - https://github.com/epam/parso)
+        * Esri Geometry API for Java (com.esri.geometry:esri-geometry-api:2.2.0 - https://github.com/Esri/geometry-api-java)
         * ClassMate (com.fasterxml:classmate:1.3.0 - http://github.com/cowtowncoder/java-classmate)
-        * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.12.3 - http://github.com/FasterXML/jackson)
-        * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.12.3 - https://github.com/FasterXML/jackson-core)
-        * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.12.3 - http://github.com/FasterXML/jackson)
-        * Jackson dataformat: CBOR (com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 - http://github.com/FasterXML/jackson-dataformats-binary)
-        * Jackson dataformat: Smile (com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.11.2 - http://github.com/FasterXML/jackson-dataformats-binary)
+        * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.12.6 - http://github.com/FasterXML/jackson)
+        * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.12.6 - https://github.com/FasterXML/jackson-core)
+        * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.12.6.1 - http://github.com/FasterXML/jackson)
+        * Jackson dataformat: CBOR (com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6 - http://github.com/FasterXML/jackson-dataformats-binary)
+        * Jackson dataformat: Smile (com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 - http://github.com/FasterXML/jackson-dataformats-binary)
         * Jackson-dataformat-YAML (com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1 - https://github.com/FasterXML/jackson-dataformats-text)
-        * Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.3 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8)
-        * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.3 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
+        * Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.3 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8)
         * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
-        * Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.3 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names)
+        * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
+        * Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.3 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names)
         * Java UUID Generator (com.fasterxml.uuid:java-uuid-generator:4.0.1 - https://github.com/cowtowncoder/java-uuid-generator)
-        * Woodstox (com.fasterxml.woodstox:woodstox-core:5.0.3 - https://github.com/FasterXML/woodstox)
+        * Woodstox (com.fasterxml.woodstox:woodstox-core:6.2.4 - https://github.com/FasterXML/woodstox)
         * zjsonpatch (com.flipkart.zjsonpatch:zjsonpatch:0.4.6 - https://github.com/flipkart-incubator/zjsonpatch/)
-        * Caffeine cache (com.github.ben-manes.caffeine:caffeine:2.8.4 - https://github.com/ben-manes/caffeine)
+        * Caffeine cache (com.github.ben-manes.caffeine:caffeine:2.9.2 - https://github.com/ben-manes/caffeine)
         * btf (com.github.java-json-tools:btf:1.3 - https://github.com/java-json-tools/btf)
         * jackson-coreutils (com.github.java-json-tools:jackson-coreutils:2.0 - https://github.com/java-json-tools/jackson-coreutils)
         * jackson-coreutils-equivalence (com.github.java-json-tools:jackson-coreutils-equivalence:1.0 - https://github.com/java-json-tools/jackson-coreutils)
@@ -50,41 +51,40 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * json-schema-validator (com.github.java-json-tools:json-schema-validator:2.2.14 - https://github.com/java-json-tools/json-schema-validator)
         * msg-simple (com.github.java-json-tools:msg-simple:1.2 - https://github.com/java-json-tools/msg-simple)
         * uri-template (com.github.java-json-tools:uri-template:0.10 - https://github.com/java-json-tools/uri-template)
-        * Open JSON (com.github.openjson:openjson:1.0.12 - https://github.com/openjson/openjson)
         * JCIP Annotations under Apache License (com.github.stephenc.jcip:jcip-annotations:1.0-1 - http://stephenc.github.com/jcip-annotations)
         * Google APIs Client Library for Java (com.google.api-client:google-api-client:1.23.0 - https://github.com/google/google-api-java-client/google-api-client)
         * Google Analytics API v3-rev145-1.23.0 (com.google.apis:google-api-services-analytics:v3-rev145-1.23.0 - http://nexus.sonatype.org/oss-repository-hosting.html/google-api-services-analytics)
         * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.1 - http://findbugs.sourceforge.net/)
-        * Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson)
-        * error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
+        * Gson (com.google.code.gson:gson:2.9.0 - https://github.com/google/gson/gson)
+        * error-prone annotations (com.google.errorprone:error_prone_annotations:2.7.1 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
         * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
-        * Guava: Google Core Libraries for Java (com.google.guava:guava:30.0-jre - https://github.com/google/guava/guava)
+        * Guava: Google Core Libraries for Java (com.google.guava:guava:31.0.1-jre - https://github.com/google/guava)
         * Guava: Google Core Libraries for Java (JDK5 Backport) (com.google.guava:guava-jdk5:17.0 - http://code.google.com/p/guava-libraries/guava-jdk5)
         * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
         * Google HTTP Client Library for Java (com.google.http-client:google-http-client:1.23.0 - https://github.com/google/google-http-java-client/google-http-client)
+        * GSON extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-gson:1.41.7 - https://github.com/googleapis/google-http-java-client/google-http-client-gson)
         * Jackson 2 extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-jackson2:1.23.0 - https://github.com/google/google-http-java-client/google-http-client-jackson2)
         * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
-        * Google OAuth Client Library for Java (com.google.oauth-client:google-oauth-client:1.32.1 - https://github.com/googleapis/google-oauth-java-client/google-oauth-client)
+        * Google OAuth Client Library for Java (com.google.oauth-client:google-oauth-client:1.33.3 - https://github.com/googleapis/google-oauth-java-client/google-oauth-client)
         * ConcurrentLinkedHashMap (com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2 - http://code.google.com/p/concurrentlinkedhashmap)
-        * JSON.simple (com.googlecode.json-simple:json-simple:1.1.1 - http://code.google.com/p/json-simple/)
         * libphonenumber (com.googlecode.libphonenumber:libphonenumber:8.11.1 - https://github.com/google/libphonenumber/)
-        * Jackcess (com.healthmarketscience.jackcess:jackcess:3.0.1 - https://jackcess.sourceforge.io)
-        * Jackcess Encrypt (com.healthmarketscience.jackcess:jackcess-encrypt:3.0.0 - http://jackcessencrypt.sf.net)
-        * project ':json-path' (com.jayway.jsonpath:json-path:2.4.0 - https://github.com/jayway/JsonPath)
-        * project ':json-path-assert' (com.jayway.jsonpath:json-path-assert:2.4.0 - https://github.com/jayway/JsonPath)
+        * Jackcess (com.healthmarketscience.jackcess:jackcess:4.0.1 - https://jackcess.sourceforge.io)
+        * Jackcess Encrypt (com.healthmarketscience.jackcess:jackcess-encrypt:4.0.1 - http://jackcessencrypt.sf.net)
+        * project ':json-path' (com.jayway.jsonpath:json-path:2.6.0 - https://github.com/jayway/JsonPath)
+        * project ':json-path-assert' (com.jayway.jsonpath:json-path-assert:2.6.0 - https://github.com/jayway/JsonPath)
         * Disruptor Framework (com.lmax:disruptor:3.4.2 - http://lmax-exchange.github.com/disruptor)
         * builder-commons (com.lyncode:builder-commons:1.0.2 - http://nexus.sonatype.org/oss-repository-hosting.html/builder-commons)
         * MaxMind DB Reader (com.maxmind.db:maxmind-db:1.2.2 - http://dev.maxmind.com/)
         * MaxMind GeoIP2 API (com.maxmind.geoip2:geoip2:2.11.0 - http://dev.maxmind.com/geoip/geoip2/web-services)
         * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:7.9 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
-        * opencsv (com.opencsv:opencsv:5.2 - http://opencsv.sf.net)
+        * opencsv (com.opencsv:opencsv:5.6 - http://opencsv.sf.net)
         * java-libpst (com.pff:java-libpst:0.9.3 - https://github.com/rjohnsondev/java-libpst)
-        * rome (com.rometools:rome:1.12.2 - http://rometools.com/rome)
-        * rome-utils (com.rometools:rome-utils:1.12.2 - http://rometools.com/rome-utils)
+        * rome (com.rometools:rome:1.18.0 - http://rometools.com/rome)
+        * rome-modules (com.rometools:rome-modules:1.18.0 - http://rometools.com/rome-modules)
+        * rome-utils (com.rometools:rome-utils:1.18.0 - http://rometools.com/rome-utils)
         * fastinfoset (com.sun.xml.fastinfoset:FastInfoset:1.2.15 - http://fi.java.net)
         * T-Digest (com.tdunning:t-digest:3.1 - https://github.com/tdunning/t-digest)
         * JSON library from Android SDK (com.vaadin.external.google:android-json:0.0.20131108.vaadin1 - http://developer.android.com/sdk)
-        * HikariCP (com.zaxxer:HikariCP-java7:2.4.13 - https://github.com/brettwooldridge/HikariCP)
         * SparseBitSet (com.zaxxer:SparseBitSet:1.2 - https://github.com/brettwooldridge/SparseBitSet)
         * Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/)
         * Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/)
@@ -98,30 +98,24 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Apache Commons Validator (commons-validator:commons-validator:1.5.0 - http://commons.apache.org/proper/commons-validator/)
         * GeoJson POJOs for Jackson (de.grundid.opendatalab:geojson-jackson:1.14 - https://github.com/opendatalab-de/geojson-jackson)
         * Boilerpipe -- Boilerplate Removal and Fulltext Extraction from HTML pages (de.l3s.boilerpipe:boilerpipe:1.1.0 - http://code.google.com/p/boilerpipe/)
-        * SentimentAnalysisParser (edu.usc.ir:sentiment-analysis-parser:0.1 - https://github.com/USCDataScience/SentimentAnalysisParser)
         * OpenAIRE Funders Model (eu.openaire:funders-model:2.0.0 - https://api.openaire.eu)
         * Metrics Core (io.dropwizard.metrics:metrics-core:4.1.5 - https://metrics.dropwizard.io/metrics-core)
         * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.1.5 - https://metrics.dropwizard.io/metrics-graphite)
         * Metrics Integration for Jetty 9.3 and higher (io.dropwizard.metrics:metrics-jetty9:4.1.5 - https://metrics.dropwizard.io/metrics-jetty9)
         * Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.1.5 - https://metrics.dropwizard.io/metrics-jmx)
         * JVM Integration for Metrics (io.dropwizard.metrics:metrics-jvm:4.1.5 - https://metrics.dropwizard.io/metrics-jvm)
-        * Netty (io.netty:netty:3.10.6.Final - http://netty.io/)
-        * Netty/Buffer (io.netty:netty-buffer:4.1.50.Final - https://netty.io/netty-buffer/)
+        * micrometer-core (io.micrometer:micrometer-core:1.8.6 - https://github.com/micrometer-metrics/micrometer)
         * Netty/Buffer (io.netty:netty-buffer:4.1.68.Final - https://netty.io/netty-buffer/)
-        * Netty/Codec (io.netty:netty-codec:4.1.50.Final - https://netty.io/netty-codec/)
         * Netty/Codec (io.netty:netty-codec:4.1.68.Final - https://netty.io/netty-codec/)
         * Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.53.Final - https://netty.io/netty-codec-http/)
         * Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.53.Final - https://netty.io/netty-codec-socks/)
-        * Netty/Common (io.netty:netty-common:4.1.50.Final - https://netty.io/netty-common/)
         * Netty/Common (io.netty:netty-common:4.1.68.Final - https://netty.io/netty-common/)
-        * Netty/Handler (io.netty:netty-handler:4.1.50.Final - https://netty.io/netty-handler/)
         * Netty/Handler (io.netty:netty-handler:4.1.68.Final - https://netty.io/netty-handler/)
         * Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.53.Final - https://netty.io/netty-handler-proxy/)
-        * Netty/Resolver (io.netty:netty-resolver:4.1.50.Final - https://netty.io/netty-resolver/)
-        * Netty/Transport (io.netty:netty-transport:4.1.50.Final - https://netty.io/netty-transport/)
+        * Netty/Resolver (io.netty:netty-resolver:4.1.68.Final - https://netty.io/netty-resolver/)
         * Netty/Transport (io.netty:netty-transport:4.1.68.Final - https://netty.io/netty-transport/)
-        * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.50.Final - https://netty.io/netty-transport-native-epoll/)
-        * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.50.Final - https://netty.io/netty-transport-native-unix-common/)
+        * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.68.Final - https://netty.io/netty-transport-native-epoll/)
+        * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.68.Final - https://netty.io/netty-transport-native-unix-common/)
         * OpenTracing API (io.opentracing:opentracing-api:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-api)
         * OpenTracing-noop (io.opentracing:opentracing-noop:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-noop)
         * OpenTracing-util (io.opentracing:opentracing-util:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-util)
@@ -147,53 +141,44 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.11.13 - https://bytebuddy.net/byte-buddy)
         * Byte Buddy agent (net.bytebuddy:byte-buddy-agent:1.11.13 - https://bytebuddy.net/byte-buddy-agent)
         * eigenbase-properties (net.hydromatic:eigenbase-properties:1.1.5 - http://github.com/julianhyde/eigenbase-properties)
-        * Java Native Access (net.java.dev.jna:jna:5.5.0 - https://github.com/java-native-access/jna)
         * json-unit-core (net.javacrumbs.json-unit:json-unit-core:2.19.0 - https://github.com/lukas-krecan/JsonUnit/json-unit-core)
         * "Java Concurrency in Practice" book annotations (net.jcip:jcip-annotations:1.0 - http://jcip.net/)
         * ASM based accessors helper used by json-smart (net.minidev:accessors-smart:1.2 - http://www.minidev.net/)
+        * ASM based accessors helper used by json-smart (net.minidev:accessors-smart:2.4.7 - https://urielch.github.io/)
         * JSON Small and Fast Parser (net.minidev:json-smart:2.3 - http://www.minidev.net/)
-        * ehcache (net.sf.ehcache:ehcache:2.10.6 - http://ehcache.org)
-        * Ehcache Core (net.sf.ehcache:ehcache-core:2.6.11 - http://ehcache.org)
+        * JSON Small and Fast Parser (net.minidev:json-smart:2.4.7 - https://urielch.github.io/)
         * Abdera Core (org.apache.abdera:abdera-core:1.1.3 - http://abdera.apache.org/abdera-core)
         * I18N Libraries (org.apache.abdera:abdera-i18n:1.1.3 - http://abdera.apache.org)
         * Apache Ant Core (org.apache.ant:ant:1.10.11 - https://ant.apache.org/)
         * Apache Ant Launcher (org.apache.ant:ant-launcher:1.10.11 - https://ant.apache.org/)
         * Apache Commons BCEL (org.apache.bcel:bcel:6.4.0 - https://commons.apache.org/proper/commons-bcel)
-        * Calcite Core (org.apache.calcite:calcite-core:1.18.0 - https://calcite.apache.org/calcite-core)
-        * Calcite Linq4j (org.apache.calcite:calcite-linq4j:1.18.0 - https://calcite.apache.org/calcite-linq4j)
-        * Apache Calcite Avatica (org.apache.calcite.avatica:avatica-core:1.13.0 - https://calcite.apache.org/avatica/avatica-core)
+        * Calcite Core (org.apache.calcite:calcite-core:1.27.0 - https://calcite.apache.org)
+        * Calcite Linq4j (org.apache.calcite:calcite-linq4j:1.27.0 - https://calcite.apache.org)
+        * Apache Calcite Avatica (org.apache.calcite.avatica:avatica-core:1.18.0 - https://calcite.apache.org/avatica)
         * Apache Commons Collections (org.apache.commons:commons-collections4:4.1 - http://commons.apache.org/proper/commons-collections/)
-        * Apache Commons Compress (org.apache.commons:commons-compress:1.20 - https://commons.apache.org/proper/commons-compress/)
-        * Apache Commons Configuration (org.apache.commons:commons-configuration2:2.7 - https://commons.apache.org/proper/commons-configuration/)
-        * Apache Commons CSV (org.apache.commons:commons-csv:1.8 - https://commons.apache.org/proper/commons-csv/)
+        * Apache Commons Compress (org.apache.commons:commons-compress:1.21 - https://commons.apache.org/proper/commons-compress/)
+        * Apache Commons Configuration (org.apache.commons:commons-configuration2:2.8.0 - https://commons.apache.org/proper/commons-configuration/)
+        * Apache Commons CSV (org.apache.commons:commons-csv:1.9.0 - https://commons.apache.org/proper/commons-csv/)
         * Apache Commons DBCP (org.apache.commons:commons-dbcp2:2.8.0 - https://commons.apache.org/dbcp/)
         * Apache Commons Exec (org.apache.commons:commons-exec:1.3 - http://commons.apache.org/proper/commons-exec/)
-        * Apache Commons Lang (org.apache.commons:commons-lang3:3.7 - http://commons.apache.org/proper/commons-lang/)
+        * Apache Commons Lang (org.apache.commons:commons-lang3:3.12.0 - https://commons.apache.org/proper/commons-lang/)
         * Apache Commons Math (org.apache.commons:commons-math3:3.6.1 - http://commons.apache.org/proper/commons-math/)
         * Apache Commons Pool (org.apache.commons:commons-pool2:2.9.0 - https://commons.apache.org/proper/commons-pool/)
-        * Apache Commons Text (org.apache.commons:commons-text:1.8 - https://commons.apache.org/proper/commons-text)
         * Apache Commons Text (org.apache.commons:commons-text:1.9 - https://commons.apache.org/proper/commons-text)
         * Curator Client (org.apache.curator:curator-client:2.13.0 - http://curator.apache.org/curator-client)
         * Curator Framework (org.apache.curator:curator-framework:2.13.0 - http://curator.apache.org/curator-framework)
         * Curator Recipes (org.apache.curator:curator-recipes:2.13.0 - http://curator.apache.org/curator-recipes)
-        * Apache CXF Core (org.apache.cxf:cxf-core:3.3.6 - https://cxf.apache.org)
-        * Apache CXF Runtime JAX-RS Frontend (org.apache.cxf:cxf-rt-frontend-jaxrs:3.3.6 - https://cxf.apache.org)
-        * Apache CXF JAX-RS Client (org.apache.cxf:cxf-rt-rs-client:3.3.6 - https://cxf.apache.org)
-        * Apache CXF Runtime Security functionality (org.apache.cxf:cxf-rt-security:3.3.6 - https://cxf.apache.org)
-        * Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:3.3.6 - https://cxf.apache.org)
-        * JTA 1.1 (org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 - http://geronimo.apache.org/specs/geronimo-jta_1.1_spec)
-        * Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:1.1.3 - http://geronimo.apache.org/maven/specs/geronimo-ws-metadata_2.0_spec/1.1.3)
-        * Apache Hadoop Annotations (org.apache.hadoop:hadoop-annotations:3.2.0 - no url defined)
-        * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:3.2.0 - no url defined)
-        * Apache Hadoop Common (org.apache.hadoop:hadoop-common:3.2.0 - no url defined)
-        * Apache Hadoop HDFS Client (org.apache.hadoop:hadoop-hdfs-client:3.2.0 - no url defined)
+        * Apache Hadoop Annotations (org.apache.hadoop:hadoop-annotations:3.2.2 - no url defined)
+        * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:3.2.2 - no url defined)
+        * Apache Hadoop Common (org.apache.hadoop:hadoop-common:3.2.2 - no url defined)
+        * Apache Hadoop HDFS Client (org.apache.hadoop:hadoop-hdfs-client:3.2.2 - no url defined)
         * htrace-core4 (org.apache.htrace:htrace-core4:4.1.0-incubating - http://incubator.apache.org/projects/htrace.html)
         * Apache HttpClient (org.apache.httpcomponents:httpclient:4.5.13 - http://hc.apache.org/httpcomponents-client)
         * Apache HttpClient Cache (org.apache.httpcomponents:httpclient-cache:4.2.6 - http://hc.apache.org/httpcomponents-client)
-        * Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.4 - http://hc.apache.org/httpcomponents-core-ga)
-        * Apache HttpClient Mime (org.apache.httpcomponents:httpmime:4.5.12 - http://hc.apache.org/httpcomponents-client)
-        * Apache James :: Mime4j :: Core (org.apache.james:apache-mime4j-core:0.8.3 - http://james.apache.org/mime4j/apache-mime4j-core)
-        * Apache James :: Mime4j :: DOM (org.apache.james:apache-mime4j-dom:0.8.3 - http://james.apache.org/mime4j/apache-mime4j-dom)
+        * Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.15 - http://hc.apache.org/httpcomponents-core-ga)
+        * Apache HttpClient Mime (org.apache.httpcomponents:httpmime:4.5.13 - http://hc.apache.org/httpcomponents-client)
+        * Apache James :: Mime4j :: Core (org.apache.james:apache-mime4j-core:0.8.4 - http://james.apache.org/mime4j/apache-mime4j-core)
+        * Apache James :: Mime4j :: DOM (org.apache.james:apache-mime4j-dom:0.8.4 - http://james.apache.org/mime4j/apache-mime4j-dom)
         * Apache Jena - Libraries POM (org.apache.jena:apache-jena-libs:2.13.0 - http://jena.apache.org/apache-jena-libs/)
         * Apache Jena - ARQ (SPARQL 1.1 Query Engine) (org.apache.jena:jena-arq:2.13.0 - http://jena.apache.org/jena-arq/)
         * Apache Jena - Core (org.apache.jena:jena-core:2.13.0 - http://jena.apache.org/jena-core/)
@@ -207,121 +192,135 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Apache Log4j API (org.apache.logging.log4j:log4j-api:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-api/)
         * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-core/)
         * Apache Log4j JUL Adapter (org.apache.logging.log4j:log4j-jul:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-jul/)
+        * Apache Log4j Layout for JSON template (org.apache.logging.log4j:log4j-layout-template-json:2.16.0 - https://logging.apache.org/log4j/2.x/log4j-layout-template-json/)
         * Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j-impl:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/)
         * Apache Log4j Web (org.apache.logging.log4j:log4j-web:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-web/)
-        * Lucene Common Analyzers (org.apache.lucene:lucene-analyzers-common:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-common)
-        * Lucene ICU Analysis Components (org.apache.lucene:lucene-analyzers-icu:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-icu)
-        * Lucene Kuromoji Japanese Morphological Analyzer (org.apache.lucene:lucene-analyzers-kuromoji:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-kuromoji)
-        * Lucene Nori Korean Morphological Analyzer (org.apache.lucene:lucene-analyzers-nori:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-nori)
-        * Lucene Phonetic Filters (org.apache.lucene:lucene-analyzers-phonetic:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-phonetic)
-        * Lucene Smart Chinese Analyzer (org.apache.lucene:lucene-analyzers-smartcn:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-smartcn)
-        * Lucene Stempel Analyzer (org.apache.lucene:lucene-analyzers-stempel:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-stempel)
-        * Lucene Memory (org.apache.lucene:lucene-backward-codecs:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-backward-codecs)
-        * Lucene Classification (org.apache.lucene:lucene-classification:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-classification)
-        * Lucene codecs (org.apache.lucene:lucene-codecs:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-codecs)
-        * Lucene Core (org.apache.lucene:lucene-core:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-core)
-        * Lucene Expressions (org.apache.lucene:lucene-expressions:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-expressions)
-        * Lucene Grouping (org.apache.lucene:lucene-grouping:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-grouping)
-        * Lucene Highlighter (org.apache.lucene:lucene-highlighter:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-highlighter)
-        * Lucene Join (org.apache.lucene:lucene-join:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-join)
-        * Lucene Memory (org.apache.lucene:lucene-memory:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-memory)
-        * Lucene Miscellaneous (org.apache.lucene:lucene-misc:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-misc)
-        * Lucene Queries (org.apache.lucene:lucene-queries:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-queries)
-        * Lucene QueryParsers (org.apache.lucene:lucene-queryparser:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-queryparser)
-        * Lucene Sandbox (org.apache.lucene:lucene-sandbox:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-sandbox)
-        * Lucene Spatial Extras (org.apache.lucene:lucene-spatial-extras:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-spatial-extras)
-        * Lucene Spatial 3D (org.apache.lucene:lucene-spatial3d:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-spatial3d)
-        * Lucene Suggest (org.apache.lucene:lucene-suggest:8.8.1 - https://lucene.apache.org/lucene-parent/lucene-suggest)
-        * Apache OpenNLP Tools (org.apache.opennlp:opennlp-tools:1.9.2 - https://www.apache.org/opennlp/opennlp-tools/)
+        * Lucene Common Analyzers (org.apache.lucene:lucene-analyzers-common:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-common)
+        * Lucene ICU Analysis Components (org.apache.lucene:lucene-analyzers-icu:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-icu)
+        * Lucene Kuromoji Japanese Morphological Analyzer (org.apache.lucene:lucene-analyzers-kuromoji:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-kuromoji)
+        * Lucene Nori Korean Morphological Analyzer (org.apache.lucene:lucene-analyzers-nori:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-nori)
+        * Lucene Phonetic Filters (org.apache.lucene:lucene-analyzers-phonetic:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-phonetic)
+        * Lucene Smart Chinese Analyzer (org.apache.lucene:lucene-analyzers-smartcn:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-smartcn)
+        * Lucene Stempel Analyzer (org.apache.lucene:lucene-analyzers-stempel:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-analyzers-stempel)
+        * Lucene Memory (org.apache.lucene:lucene-backward-codecs:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-backward-codecs)
+        * Lucene Classification (org.apache.lucene:lucene-classification:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-classification)
+        * Lucene codecs (org.apache.lucene:lucene-codecs:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-codecs)
+        * Lucene Core (org.apache.lucene:lucene-core:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-core)
+        * Lucene Expressions (org.apache.lucene:lucene-expressions:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-expressions)
+        * Lucene Grouping (org.apache.lucene:lucene-grouping:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-grouping)
+        * Lucene Highlighter (org.apache.lucene:lucene-highlighter:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-highlighter)
+        * Lucene Join (org.apache.lucene:lucene-join:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-join)
+        * Lucene Memory (org.apache.lucene:lucene-memory:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-memory)
+        * Lucene Miscellaneous (org.apache.lucene:lucene-misc:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-misc)
+        * Lucene Queries (org.apache.lucene:lucene-queries:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-queries)
+        * Lucene QueryParsers (org.apache.lucene:lucene-queryparser:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-queryparser)
+        * Lucene Sandbox (org.apache.lucene:lucene-sandbox:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-sandbox)
+        * Lucene Spatial Extras (org.apache.lucene:lucene-spatial-extras:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-spatial-extras)
+        * Lucene Spatial 3D (org.apache.lucene:lucene-spatial3d:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-spatial3d)
+        * Lucene Suggest (org.apache.lucene:lucene-suggest:8.11.1 - https://lucene.apache.org/lucene-parent/lucene-suggest)
         * Apache FontBox (org.apache.pdfbox:fontbox:2.0.24 - http://pdfbox.apache.org/)
         * PDFBox JBIG2 ImageIO plugin (org.apache.pdfbox:jbig2-imageio:3.0.3 - https://www.apache.org/jbig2-imageio/)
         * Apache JempBox (org.apache.pdfbox:jempbox:1.8.16 - http://www.apache.org/pdfbox-parent/jempbox/)
         * Apache PDFBox (org.apache.pdfbox:pdfbox:2.0.24 - https://www.apache.org/pdfbox-parent/pdfbox/)
-        * Apache PDFBox tools (org.apache.pdfbox:pdfbox-tools:2.0.19 - https://www.apache.org/pdfbox-parent/pdfbox-tools/)
-        * Apache Preflight (org.apache.pdfbox:preflight:2.0.19 - https://www.apache.org/pdfbox-parent/preflight/)
-        * Apache XmpBox (org.apache.pdfbox:xmpbox:2.0.19 - https://www.apache.org/pdfbox-parent/xmpbox/)
-        * Apache POI (org.apache.poi:poi:3.17 - http://poi.apache.org/)
-        * Apache POI (org.apache.poi:poi-ooxml:3.17 - http://poi.apache.org/)
-        * Apache POI (org.apache.poi:poi-ooxml-schemas:3.17 - http://poi.apache.org/)
-        * Apache POI (org.apache.poi:poi-scratchpad:3.17 - http://poi.apache.org/)
-        * Apache SIS features (org.apache.sis.core:sis-feature:1.0 - http://sis.apache.org/core/sis-feature)
-        * Apache SIS metadata (org.apache.sis.core:sis-metadata:1.0 - http://sis.apache.org/core/sis-metadata)
-        * Apache SIS referencing (org.apache.sis.core:sis-referencing:1.0 - http://sis.apache.org/core/sis-referencing)
-        * Apache SIS utilities (org.apache.sis.core:sis-utility:1.0 - http://sis.apache.org/core/sis-utility)
-        * Apache SIS netCDF storage (org.apache.sis.storage:sis-netcdf:1.0 - http://sis.apache.org/storage/sis-netcdf)
-        * Apache SIS common storage (org.apache.sis.storage:sis-storage:1.0 - http://sis.apache.org/storage/sis-storage)
-        * Apache Solr Content Extraction Library (org.apache.solr:solr-cell:8.8.1 - https://lucene.apache.org/solr-parent/solr-cell)
-        * Apache Solr Core (org.apache.solr:solr-core:8.8.1 - https://lucene.apache.org/solr-parent/solr-core)
-        * Apache Solr Solrj (org.apache.solr:solr-solrj:8.8.1 - https://lucene.apache.org/solr-parent/solr-solrj)
+        * Apache PDFBox Debugger (org.apache.pdfbox:pdfbox-debugger:2.0.25 - https://www.apache.org/pdfbox-parent/pdfbox-debugger/)
+        * Apache PDFBox tools (org.apache.pdfbox:pdfbox-tools:2.0.25 - https://www.apache.org/pdfbox-parent/pdfbox-tools/)
+        * Apache XmpBox (org.apache.pdfbox:xmpbox:2.0.25 - https://www.apache.org/pdfbox-parent/xmpbox/)
+        * Apache POI - Common (org.apache.poi:poi:5.2.0 - https://poi.apache.org/)
+        * Apache POI - API based on OPC and OOXML schemas (org.apache.poi:poi-ooxml:5.2.0 - https://poi.apache.org/)
+        * Apache POI (org.apache.poi:poi-ooxml-lite:5.2.0 - https://poi.apache.org/)
+        * Apache POI (org.apache.poi:poi-scratchpad:5.2.0 - https://poi.apache.org/)
+        * Apache Solr Core (org.apache.solr:solr-core:8.11.1 - https://lucene.apache.org/solr-parent/solr-core)
+        * Apache Solr Solrj (org.apache.solr:solr-solrj:8.11.1 - https://lucene.apache.org/solr-parent/solr-solrj)
         * Apache Standard Taglib Implementation (org.apache.taglibs:taglibs-standard-impl:1.2.5 - http://tomcat.apache.org/taglibs/standard-1.2.5/taglibs-standard-impl)
         * Apache Standard Taglib Specification API (org.apache.taglibs:taglibs-standard-spec:1.2.5 - http://tomcat.apache.org/taglibs/standard-1.2.5/taglibs-standard-spec)
         * Apache Thrift (org.apache.thrift:libthrift:0.9.2 - http://thrift.apache.org)
-        * Apache Tika core (org.apache.tika:tika-core:1.24.1 - http://tika.apache.org/)
-        * Apache Tika Java-7 Components (org.apache.tika:tika-java7:1.24.1 - http://tika.apache.org/)
-        * Apache Tika parsers (org.apache.tika:tika-parsers:1.24.1 - http://tika.apache.org/)
-        * Apache Tika XMP (org.apache.tika:tika-xmp:1.24.1 - http://tika.apache.org/)
-        * tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:9.0.33 - https://tomcat.apache.org/)
-        * tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:9.0.33 - https://tomcat.apache.org/)
-        * tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:9.0.33 - https://tomcat.apache.org/)
-        * Apache Velocity - Engine (org.apache.velocity:velocity-engine-core:2.2 - http://velocity.apache.org/engine/devel/velocity-engine-core/)
+        * Apache Tika core (org.apache.tika:tika-core:2.3.0 - https://tika.apache.org/)
+        * Apache Tika Apple parser module (org.apache.tika:tika-parser-apple-module:2.3.0 - https://tika.apache.org/tika-parser-apple-module/)
+        * Apache Tika audiovideo parser module (org.apache.tika:tika-parser-audiovideo-module:2.3.0 - https://tika.apache.org/tika-parser-audiovideo-module/)
+        * Apache Tika cad parser module (org.apache.tika:tika-parser-cad-module:2.3.0 - https://tika.apache.org/tika-parser-cad-module/)
+        * Apache Tika code parser module (org.apache.tika:tika-parser-code-module:2.3.0 - https://tika.apache.org/tika-parser-code-module/)
+        * Apache Tika crypto parser module (org.apache.tika:tika-parser-crypto-module:2.3.0 - https://tika.apache.org/tika-parser-crypto-module/)
+        * Apache Tika digest commons (org.apache.tika:tika-parser-digest-commons:2.3.0 - https://tika.apache.org/tika-parser-digest-commons/)
+        * Apache Tika font parser module (org.apache.tika:tika-parser-font-module:2.3.0 - https://tika.apache.org/tika-parser-font-module/)
+        * Apache Tika html commons (org.apache.tika:tika-parser-html-commons:2.3.0 - https://tika.apache.org/tika-parser-html-commons/)
+        * Apache Tika html parser module (org.apache.tika:tika-parser-html-module:2.3.0 - https://tika.apache.org/tika-parser-html-module/)
+        * Apache Tika image parser module (org.apache.tika:tika-parser-image-module:2.3.0 - https://tika.apache.org/tika-parser-image-module/)
+        * Apache Tika mail commons (org.apache.tika:tika-parser-mail-commons:2.3.0 - https://tika.apache.org/tika-parser-mail-commons/)
+        * Apache Tika mail parser module (org.apache.tika:tika-parser-mail-module:2.3.0 - https://tika.apache.org/tika-parser-mail-module/)
+        * Apache Tika Microsoft parser module (org.apache.tika:tika-parser-microsoft-module:2.3.0 - https://tika.apache.org/tika-parser-microsoft-module/)
+        * Apache Tika miscellaneous office format parser module (org.apache.tika:tika-parser-miscoffice-module:2.3.0 - https://tika.apache.org/tika-parser-miscoffice-module/)
+        * Apache Tika news parser module (org.apache.tika:tika-parser-news-module:2.3.0 - https://tika.apache.org/tika-parser-news-module/)
+        * Apache Tika OCR parser module (org.apache.tika:tika-parser-ocr-module:2.3.0 - https://tika.apache.org/tika-parser-ocr-module/)
+        * Apache Tika PDF parser module (org.apache.tika:tika-parser-pdf-module:2.3.0 - https://tika.apache.org/tika-parser-pdf-module/)
+        * Apache Tika package parser module (org.apache.tika:tika-parser-pkg-module:2.3.0 - https://tika.apache.org/tika-parser-pkg-module/)
+        * Apache Tika text parser module (org.apache.tika:tika-parser-text-module:2.3.0 - https://tika.apache.org/tika-parser-text-module/)
+        * Apache Tika XML parser module (org.apache.tika:tika-parser-xml-module:2.3.0 - https://tika.apache.org/tika-parser-xml-module/)
+        * Apache Tika XMP commons (org.apache.tika:tika-parser-xmp-commons:2.3.0 - https://tika.apache.org/tika-parser-xmp-commons/)
+        * Apache Tika ZIP commons (org.apache.tika:tika-parser-zip-commons:2.3.0 - https://tika.apache.org/tika-parser-zip-commons/)
+        * Apache Tika standard parser package (org.apache.tika:tika-parsers-standard-package:2.3.0 - https://tika.apache.org/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/)
+        * tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:9.0.63 - https://tomcat.apache.org/)
+        * tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:9.0.63 - https://tomcat.apache.org/)
+        * tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:9.0.63 - https://tomcat.apache.org/)
+        * Apache Velocity - Engine (org.apache.velocity:velocity-engine-core:2.3 - http://velocity.apache.org/engine/devel/velocity-engine-core/)
         * Apache Velocity - JSR 223 Scripting (org.apache.velocity:velocity-engine-scripting:2.2 - http://velocity.apache.org/engine/devel/velocity-engine-scripting/)
         * Axiom API (org.apache.ws.commons.axiom:axiom-api:1.2.22 - http://ws.apache.org/axiom/)
-        * LLOM (org.apache.ws.commons.axiom:axiom-impl:1.2.22 - http://ws.apache.org/axiom/implementations/axiom-impl/)
         * Abdera Model (FOM) Implementation (org.apache.ws.commons.axiom:fom-impl:1.2.22 - http://ws.apache.org/axiom/implementations/fom-impl/)
-        * XmlSchema Core (org.apache.ws.xmlschema:xmlschema-core:2.2.5 - https://ws.apache.org/commons/xmlschema20/xmlschema-core/)
-        * XmlBeans (org.apache.xmlbeans:xmlbeans:3.1.0 - https://xmlbeans.apache.org/)
-        * zookeeper (org.apache.zookeeper:zookeeper:3.4.14 - no url defined)
+        * XmlBeans (org.apache.xmlbeans:xmlbeans:5.0.3 - https://xmlbeans.apache.org/)
+        * Apache ZooKeeper - Server (org.apache.zookeeper:zookeeper:3.6.2 - http://zookeeper.apache.org/zookeeper)
         * Apache ZooKeeper - Jute (org.apache.zookeeper:zookeeper-jute:3.6.2 - http://zookeeper.apache.org/zookeeper-jute)
-        * AssertJ fluent assertions (org.assertj:assertj-core:3.13.2 - http://assertj.org/assertj-core)
-        * Evo Inflector (org.atteo:evo-inflector:1.2.2 - http://atteo.org/static/evo-inflector)
+        * org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.0 - https://github.com/apiguardian-team/apiguardian)
+        * AssertJ fluent assertions (org.assertj:assertj-core:3.21.0 - https://assertj.github.io/doc/assertj-core/)
+        * Evo Inflector (org.atteo:evo-inflector:1.3 - http://atteo.org/static/evo-inflector)
         * jose4j (org.bitbucket.b_c:jose4j:0.6.5 - https://bitbucket.org/b_c/jose4j/)
         * TagSoup (org.ccil.cowan.tagsoup:tagsoup:1.2.1 - http://home.ccil.org/~cowan/XML/tagsoup/)
-        * Woodstox (org.codehaus.woodstox:woodstox-core-asl:4.4.1 - http://woodstox.codehaus.org)
         * jems (org.dmfs:jems:1.18 - https://github.com/dmfs/jems)
         * rfc3986-uri (org.dmfs:rfc3986-uri:0.8.1 - https://github.com/dmfs/uri-toolkit)
         * Jetty :: Apache JSP Implementation (org.eclipse.jetty:apache-jsp:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Apache :: JSTL module (org.eclipse.jetty:apache-jstl:9.4.15.v20190215 - http://tomcat.apache.org/taglibs/standard/)
-        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
-        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
-        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
-        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
+        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
+        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
         * Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.15.v20190215 - http://www.eclipse.org/jetty)
-        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-client)
-        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-continuation)
-        * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-deploy)
-        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.41.v20210516 - https://eclipse.org/jetty/jetty-http)
-        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.41.v20210516 - https://eclipse.org/jetty/jetty-io)
-        * Jetty :: JMX Management (org.eclipse.jetty:jetty-jmx:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-jmx)
+        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-client)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-continuation)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-continuation)
+        * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-deploy)
+        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-http)
+        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-io)
+        * Jetty :: JMX Management (org.eclipse.jetty:jetty-jmx:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-jmx)
         * Jetty :: JNDI Naming (org.eclipse.jetty:jetty-jndi:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Jetty :: Plus (org.eclipse.jetty:jetty-plus:9.4.15.v20190215 - http://www.eclipse.org/jetty)
-        * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-rewrite)
-        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-security)
-        * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.41.v20210516 - https://eclipse.org/jetty/jetty-server)
-        * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-servlet)
-        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-servlets)
-        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.41.v20210516 - https://eclipse.org/jetty/jetty-util)
-        * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-webapp)
-        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-xml)
-        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-client)
-        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-common)
-        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-hpack)
-        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
-        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-server)
+        * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-rewrite)
+        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-security)
+        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-security)
+        * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-server)
+        * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-servlet)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-servlets)
+        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-util)
+        * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-util-ajax)
+        * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-webapp)
+        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-xml)
+        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-client)
+        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.48.v20220622 - https://eclipse.org/jetty/http2-parent/http2-common)
+        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-hpack)
+        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.48.v20220622 - https://eclipse.org/jetty/http2-parent/http2-server)
         * Jetty :: Schemas (org.eclipse.jetty.toolchain:jetty-schemas:3.1.2 - https://eclipse.org/jetty/jetty-schemas)
         * Ehcache (org.ehcache:ehcache:3.4.0 - http://ehcache.org)
-        * flyway-core (org.flywaydb:flyway-core:6.5.7 - https://flywaydb.org/flyway-core)
+        * flyway-core (org.flywaydb:flyway-core:8.4.4 - https://flywaydb.org/flyway-core)
         * Ogg and Vorbis for Java, Core (org.gagravarr:vorbis-java-core:0.8 - https://github.com/Gagravarr/VorbisJava)
         * Apache Tika plugin for Ogg, Vorbis and FLAC (org.gagravarr:vorbis-java-tika:0.8 - https://github.com/Gagravarr/VorbisJava)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:6.0.18.Final - http://hibernate.org/validator/hibernate-validator)
-        * Hibernate Validator Portable Extension (org.hibernate.validator:hibernate-validator-cdi:6.0.18.Final - http://hibernate.org/validator/hibernate-validator-cdi)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:6.0.23.Final - http://hibernate.org/validator/hibernate-validator)
+        * Hibernate Validator Portable Extension (org.hibernate.validator:hibernate-validator-cdi:6.0.23.Final - http://hibernate.org/validator/hibernate-validator-cdi)
         * Javassist (org.javassist:javassist:3.25.0-GA - http://www.javassist.org/)
-        * Java Annotation Indexer (org.jboss:jandex:2.1.1.Final - http://www.jboss.org/jandex)
-        * JBoss Logging 3 (org.jboss.logging:jboss-logging:3.3.2.Final - http://www.jboss.org)
-        * JDOM (org.jdom:jdom:1.1.3 - http://www.jdom.org)
-        * JDOM (org.jdom:jdom2:2.0.6 - http://www.jdom.org)
+        * Java Annotation Indexer (org.jboss:jandex:2.4.2.Final - http://www.jboss.org/jandex)
+        * JBoss Logging 3 (org.jboss.logging:jboss-logging:3.4.3.Final - http://www.jboss.org)
+        * JDOM (org.jdom:jdom2:2.0.6.1 - http://www.jdom.org)
         * jtwig-core (org.jtwig:jtwig-core:5.87.0.RELEASE - http://jtwig.org)
         * jtwig-reflection (org.jtwig:jtwig-reflection:5.87.0.RELEASE - http://jtwig.org)
         * jtwig-spring (org.jtwig:jtwig-spring:5.87.0.RELEASE - http://jtwig.org)
@@ -341,69 +340,67 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Objenesis (org.objenesis:objenesis:3.2 - http://objenesis.org/objenesis)
         * parboiled-core (org.parboiled:parboiled-core:1.3.1 - http://parboiled.org)
         * parboiled-java (org.parboiled:parboiled-java:1.3.1 - http://parboiled.org)
-        * quartz (org.quartz-scheduler:quartz:2.3.2 - http://www.quartz-scheduler.org/quartz)
-        * rome-modules (org.rometools:rome-modules:1.0 - http://www.rometools.org)
         * RRD4J (org.rrd4j:rrd4j:3.5 - https://github.com/rrd4j/rrd4j/)
         * JSONassert (org.skyscreamer:jsonassert:1.5.0 - https://github.com/skyscreamer/JSONassert)
-        * Spring AOP (org.springframework:spring-aop:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Beans (org.springframework:spring-beans:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Context (org.springframework:spring-context:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Context Support (org.springframework:spring-context-support:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Core (org.springframework:spring-core:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Expression Language (SpEL) (org.springframework:spring-expression:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Commons Logging Bridge (org.springframework:spring-jcl:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring JDBC (org.springframework:spring-jdbc:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Object/Relational Mapping (org.springframework:spring-orm:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring TestContext Framework (org.springframework:spring-test:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Transaction (org.springframework:spring-tx:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Web (org.springframework:spring-web:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Web MVC (org.springframework:spring-webmvc:5.2.5.RELEASE - https://github.com/spring-projects/spring-framework)
-        * Spring Boot (org.springframework.boot:spring-boot:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot)
-        * Spring Boot AutoConfigure (org.springframework.boot:spring-boot-autoconfigure:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-autoconfigure)
+        * Spring AOP (org.springframework:spring-aop:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Beans (org.springframework:spring-beans:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Context (org.springframework:spring-context:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Context Support (org.springframework:spring-context-support:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Core (org.springframework:spring-core:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Expression Language (SpEL) (org.springframework:spring-expression:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Commons Logging Bridge (org.springframework:spring-jcl:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring JDBC (org.springframework:spring-jdbc:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Object/Relational Mapping (org.springframework:spring-orm:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring TestContext Framework (org.springframework:spring-test:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Transaction (org.springframework:spring-tx:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Web (org.springframework:spring-web:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * Spring Web MVC (org.springframework:spring-webmvc:5.3.20 - https://github.com/spring-projects/spring-framework)
+        * spring-boot (org.springframework.boot:spring-boot:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-actuator (org.springframework.boot:spring-boot-actuator:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-actuator-autoconfigure (org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-autoconfigure (org.springframework.boot:spring-boot-autoconfigure:2.6.8 - https://spring.io/projects/spring-boot)
         * Spring Boot Configuration Processor (org.springframework.boot:spring-boot-configuration-processor:2.0.0.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-tools/spring-boot-configuration-processor)
-        * Spring Boot Starter (org.springframework.boot:spring-boot-starter:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter)
-        * Spring Boot AOP Starter (org.springframework.boot:spring-boot-starter-aop:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-aop)
-        * Spring Boot Cache Starter (org.springframework.boot:spring-boot-starter-cache:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-cache)
-        * Spring Boot Data REST Starter (org.springframework.boot:spring-boot-starter-data-rest:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-data-rest)
-        * Spring Boot Json Starter (org.springframework.boot:spring-boot-starter-json:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json)
-        * Spring Boot Log4j 2 Starter (org.springframework.boot:spring-boot-starter-log4j2:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-log4j2)
-        * Spring Boot Security Starter (org.springframework.boot:spring-boot-starter-security:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-security)
-        * Spring Boot Test Starter (org.springframework.boot:spring-boot-starter-test:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-test)
-        * Spring Boot Tomcat Starter (org.springframework.boot:spring-boot-starter-tomcat:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat)
-        * Spring Boot Validation Starter (org.springframework.boot:spring-boot-starter-validation:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-validation)
-        * Spring Boot Web Starter (org.springframework.boot:spring-boot-starter-web:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web)
-        * Spring Boot Test (org.springframework.boot:spring-boot-test:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-test)
-        * Spring Boot Test Auto-Configure (org.springframework.boot:spring-boot-test-autoconfigure:2.2.6.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-test-autoconfigure)
-        * Spring Data Core (org.springframework.data:spring-data-commons:2.2.6.RELEASE - https://www.spring.io/spring-data/spring-data-commons)
-        * Spring Data REST - Core (org.springframework.data:spring-data-rest-core:3.2.6.RELEASE - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-core)
-        * Spring Data REST - HAL Browser (org.springframework.data:spring-data-rest-hal-browser:3.2.6.RELEASE - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-hal-browser)
-        * Spring Data REST - WebMVC (org.springframework.data:spring-data-rest-webmvc:3.2.6.RELEASE - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-webmvc)
-        * Spring HATEOAS (org.springframework.hateoas:spring-hateoas:1.0.4.RELEASE - https://github.com/spring-projects/spring-hateoas)
+        * spring-boot-starter (org.springframework.boot:spring-boot-starter:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-aop (org.springframework.boot:spring-boot-starter-aop:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-cache (org.springframework.boot:spring-boot-starter-cache:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-data-rest (org.springframework.boot:spring-boot-starter-data-rest:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-json (org.springframework.boot:spring-boot-starter-json:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-log4j2 (org.springframework.boot:spring-boot-starter-log4j2:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-tomcat (org.springframework.boot:spring-boot-starter-tomcat:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-test (org.springframework.boot:spring-boot-test:2.6.8 - https://spring.io/projects/spring-boot)
+        * spring-boot-test-autoconfigure (org.springframework.boot:spring-boot-test-autoconfigure:2.6.8 - https://spring.io/projects/spring-boot)
+        * Spring Data Core (org.springframework.data:spring-data-commons:2.6.4 - https://www.spring.io/spring-data/spring-data-commons)
+        * Spring Data REST - Core (org.springframework.data:spring-data-rest-core:3.6.4 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-core)
+        * Spring Data REST - WebMVC (org.springframework.data:spring-data-rest-webmvc:3.6.4 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-webmvc)
+        * Spring HATEOAS (org.springframework.hateoas:spring-hateoas:1.4.2 - https://github.com/spring-projects/spring-hateoas)
         * Spring Plugin - Core (org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE - https://github.com/spring-projects/spring-plugin/spring-plugin-core)
-        * spring-security-config (org.springframework.security:spring-security-config:5.2.2.RELEASE - http://spring.io/spring-security)
-        * spring-security-core (org.springframework.security:spring-security-core:5.2.2.RELEASE - http://spring.io/spring-security)
-        * spring-security-test (org.springframework.security:spring-security-test:5.2.2.RELEASE - http://spring.io/spring-security)
-        * spring-security-web (org.springframework.security:spring-security-web:5.2.2.RELEASE - http://spring.io/spring-security)
+        * spring-security-config (org.springframework.security:spring-security-config:5.6.5 - https://spring.io/projects/spring-security)
+        * spring-security-core (org.springframework.security:spring-security-core:5.6.5 - https://spring.io/projects/spring-security)
+        * spring-security-crypto (org.springframework.security:spring-security-crypto:5.6.5 - https://spring.io/projects/spring-security)
+        * spring-security-test (org.springframework.security:spring-security-test:5.6.5 - https://spring.io/projects/spring-security)
+        * spring-security-web (org.springframework.security:spring-security-web:5.6.5 - https://spring.io/projects/spring-security)
         * SWORD v2 :: Common Server Library (org.swordapp:sword2-server:1.0 - http://www.swordapp.org/)
-        * ISO Parser (org.tallison:isoparser:1.9.41.2 - https://github.com/tballison/mp4parser)
-        * org.tallison:metadata-extractor (org.tallison:metadata-extractor:2.13.0 - https://drewnoakes.com/code/exif/)
-        * XMPCore Shaded (org.tallison.xmp:xmpcore-shaded:6.1.10 - https://github.com/tballison)
         * snappy-java (org.xerial.snappy:snappy-java:1.1.7.6 - https://github.com/xerial/snappy-java)
         * xml-matchers (org.xmlmatchers:xml-matchers:0.10 - http://code.google.com/p/xml-matchers/)
-        * org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.6.4 - https://www.xmlunit.org/)
         * org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.8.0 - https://www.xmlunit.org/)
+        * org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.8.4 - https://www.xmlunit.org/)
         * org.xmlunit:xmlunit-placeholders (org.xmlunit:xmlunit-placeholders:2.8.0 - https://www.xmlunit.org/xmlunit-placeholders/)
-        * SnakeYAML (org.yaml:snakeyaml:1.25 - http://www.snakeyaml.org)
-        * SnakeYAML (org.yaml:snakeyaml:1.26 - http://www.snakeyaml.org)
-        * ROME, RSS and atOM utilitiEs for Java (rome:rome:1.0 - https://rome.dev.java.net/)
+        * SnakeYAML (org.yaml:snakeyaml:1.29 - http://www.snakeyaml.org)
         * software.amazon.ion:ion-java (software.amazon.ion:ion-java:1.0.2 - https://github.com/amznlabs/ion-java/)
+        * Xalan Java Serializer (xalan:serializer:2.7.2 - http://xml.apache.org/xalan-j/)
         * xalan (xalan:xalan:2.7.0 - no url defined)
-        * Xerces2-j (xerces:xercesImpl:2.12.0 - https://xerces.apache.org/xerces2-j/)
+        * Xalan Java (xalan:xalan:2.7.2 - http://xml.apache.org/xalan-j/)
+        * Xerces2-j (xerces:xercesImpl:2.12.2 - https://xerces.apache.org/xerces2-j/)
         * XML Commons External Components XML APIs (xml-apis:xml-apis:1.4.01 - http://xml.apache.org/commons/components/external/)
 
     BSD License:
 
         * AntLR Parser Generator (antlr:antlr:2.7.7 - http://www.antlr.org/)
+        * Adobe XMPCore (com.adobe.xmp:xmpcore:6.1.11 - https://www.adobe.com/devnet/xmp/library/eula-xmp-library-java.html)
         * coverity-escapers (com.coverity.security:coverity-escapers:1.1.1 - http://coverity.com/security)
         * Java Advanced Imaging Image I/O Tools API core (standalone) (com.github.jai-imageio:jai-imageio-core:1.4.0 - https://github.com/jai-imageio/jai-imageio-core)
         * JSONLD Java :: Core (com.github.jsonld-java:jsonld-java:0.5.1 - http://github.com/jsonld-java/jsonld-java/jsonld-java/)
@@ -411,41 +408,36 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.11.0 - https://developers.google.com/protocol-buffers/protobuf-java/)
         * JZlib (com.jcraft:jzlib:1.1.3 - http://www.jcraft.com/jzlib/)
         * dnsjava (dnsjava:dnsjava:2.1.7 - http://www.dnsjava.org)
-        * Units of Measurement API (javax.measure:unit-api:1.0 - http://unitsofmeasurement.github.io/)
         * jaxen (jaxen:jaxen:1.1.6 - http://jaxen.codehaus.org/)
-        * JLine (jline:jline:0.9.94 - http://jline.sourceforge.net)
         * ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.5.1-1 - http://www.antlr.org/antlr4-runtime)
         * commons-compiler (org.codehaus.janino:commons-compiler:3.0.9 - http://janino-compiler.github.io/commons-compiler/)
         * janino (org.codehaus.janino:janino:3.0.9 - http://janino-compiler.github.io/janino/)
-        * Stax2 API (org.codehaus.woodstox:stax2-api:3.1.4 - http://wiki.fasterxml.com/WoodstoxStax2)
-        * dom4j (org.dom4j:dom4j:2.1.1 - http://dom4j.github.io/)
+        * Stax2 API (org.codehaus.woodstox:stax2-api:4.2.1 - http://github.com/FasterXML/stax2-api)
         * Hamcrest Date (org.exparity:hamcrest-date:2.0.7 - https://github.com/exparity/hamcrest-date)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Hamcrest (org.hamcrest:hamcrest:2.1 - http://hamcrest.org/JavaHamcrest/)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * Hamcrest (org.hamcrest:hamcrest:2.2 - http://hamcrest.org/JavaHamcrest/)
         * Hamcrest All (org.hamcrest:hamcrest-all:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-all)
         * Hamcrest Core (org.hamcrest:hamcrest-core:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
-        * Hamcrest library (org.hamcrest:hamcrest-library:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-library)
-        * JBibTeX (org.jbibtex:jbibtex:1.0.10 - http://www.jbibtex.org)
+        * HdrHistogram (org.hdrhistogram:HdrHistogram:2.1.12 - http://hdrhistogram.github.io/HdrHistogram/)
+        * JBibTeX (org.jbibtex:jbibtex:1.0.20 - http://www.jbibtex.org)
         * asm (org.ow2.asm:asm:8.0.1 - http://asm.ow2.io/)
         * asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/)
         * asm-commons (org.ow2.asm:asm-commons:8.0.1 - http://asm.ow2.io/)
         * asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/)
         * asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/)
-        * PostgreSQL JDBC Driver (org.postgresql:postgresql:42.2.25 - https://jdbc.postgresql.org)
+        * PostgreSQL JDBC Driver (org.postgresql:postgresql:42.4.1 - https://jdbc.postgresql.org)
         * Reflections (org.reflections:reflections:0.9.12 - http://github.com/ronmamo/reflections)
         * JMatIO (org.tallison:jmatio:1.5 - https://github.com/tballison/jmatio)
         * XMLUnit for Java (xmlunit:xmlunit:1.3 - http://xmlunit.sourceforge.net/)
 
     Common Development and Distribution License (CDDL):
 
-        * JavaBeans Activation Framework (com.sun.activation:javax.activation:1.2.0 - http://java.net/all/javax.activation/)
         * istack common utility code runtime (com.sun.istack:istack-commons-runtime:3.0.7 - http://java.net/istack-commons/istack-commons-runtime/)
         * JavaMail API (com.sun.mail:javax.mail:1.6.2 - http://javaee.github.io/javamail/javax.mail)
         * JavaMail API (no providers) (com.sun.mail:mailapi:1.6.2 - http://javaee.github.io/javamail/mailapi)
         * Old JAXB Core (com.sun.xml.bind:jaxb-core:2.3.0.1 - http://jaxb.java.net/jaxb-bundles/jaxb-core)
         * Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:2.3.1 - http://jaxb.java.net/jaxb-bundles/jaxb-impl)
-        * saaj-impl (com.sun.xml.messaging.saaj:saaj-impl:1.4.0-b03 - http://java.net/saaj-impl/)
         * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:1.3.5 - https://projects.eclipse.org/projects/ee4j.ca)
         * jakarta.ws.rs-api (jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 - https://github.com/eclipse-ee4j/jaxrs-api)
         * JavaBeans Activation Framework (JAF) (javax.activation:activation:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
@@ -454,7 +446,6 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net)
         * javax.transaction API (javax.transaction:javax.transaction-api:1.3 - http://jta-spec.java.net)
         * jaxb-api (javax.xml.bind:jaxb-api:2.3.1 - https://github.com/javaee/jaxb-spec/jaxb-api)
-        * JAX-WS API (javax.xml.ws:jaxws-api:2.3.1 - https://github.com/javaee/jax-ws-spec)
         * JHighlight (org.codelibs:jhighlight:1.0.3 - https://github.com/codelibs/jhighlight)
         * HK2 API module (org.glassfish.hk2:hk2-api:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
         * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
@@ -464,10 +455,9 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:jakarta.inject:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/jakarta.inject)
         * JAXB Runtime (org.glassfish.jaxb:jaxb-runtime:2.3.1 - http://jaxb.java.net/jaxb-runtime-parent/jaxb-runtime)
         * TXW2 Runtime (org.glassfish.jaxb:txw2:2.3.1 - http://jaxb.java.net/jaxb-txw-parent/txw2)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
         * Java Transaction API (org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final - http://www.jboss.org/jboss-transaction-api_1.2_spec)
-        * MIME streaming extension (org.jvnet.mimepull:mimepull:1.9.7 - http://mimepull.java.net)
         * Extended StAX API (org.jvnet.staxex:stax-ex:1.8 - http://stax-ex.java.net/)
 
     Cordra (Version 2) License Agreement:
@@ -478,56 +468,55 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     Eclipse Distribution License, Version 1.0:
 
-        * JavaBeans Activation Framework (com.sun.activation:jakarta.activation:1.2.1 - https://github.com/eclipse-ee4j/jaf/jakarta.activation)
-        * JavaBeans Activation Framework API jar (jakarta.activation:jakarta.activation-api:1.2.1 - https://github.com/eclipse-ee4j/jaf/jakarta.activation-api)
         * Jakarta Activation API jar (jakarta.activation:jakarta.activation-api:1.2.2 - https://github.com/eclipse-ee4j/jaf/jakarta.activation-api)
-        * jakarta.xml.bind-api (jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api)
         * Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api)
         * javax.persistence-api (javax.persistence:javax.persistence-api:2.2 - https://github.com/javaee/jpa-spec)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Java Persistence API, Version 2.1 (org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final - http://hibernate.org)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * Java Persistence API, Version 2.1 (org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final - http://hibernate.org)
 
     Eclipse Public License:
 
         * System Rules (com.github.stefanbirkner:system-rules:1.19.0 - http://stefanbirkner.github.io/system-rules/)
-        * c3p0 (com.mchange:c3p0:0.9.5.5 - https://github.com/swaldman/c3p0)
-        * mchange-commons-java (com.mchange:mchange-commons-java:0.2.19 - https://github.com/swaldman/mchange-commons-java)
+        * H2 Database Engine (com.h2database:h2:2.1.210 - https://h2database.com)
         * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:1.3.5 - https://projects.eclipse.org/projects/ee4j.ca)
         * jakarta.ws.rs-api (jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 - https://github.com/eclipse-ee4j/jaxrs-api)
         * javax.persistence-api (javax.persistence:javax.persistence-api:2.2 - https://github.com/javaee/jpa-spec)
         * JUnit (junit:junit:4.13.1 - http://junit.org)
-        * AspectJ runtime (org.aspectj:aspectjrt:1.8.0 - http://www.aspectj.org)
-        * AspectJ weaver (org.aspectj:aspectjweaver:1.9.5 - http://www.aspectj.org)
+        * AspectJ Weaver (org.aspectj:aspectjweaver:1.9.7 - https://www.eclipse.org/aspectj/)
         * Eclipse Compiler for Java(TM) (org.eclipse.jdt:ecj:3.14.0 - http://www.eclipse.org/jdt)
         * Jetty :: Apache JSP Implementation (org.eclipse.jetty:apache-jsp:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Apache :: JSTL module (org.eclipse.jetty:apache-jstl:9.4.15.v20190215 - http://tomcat.apache.org/taglibs/standard/)
-        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
-        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
-        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
-        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
+        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
+        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
         * Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.15.v20190215 - http://www.eclipse.org/jetty)
-        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-client)
-        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-continuation)
-        * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-deploy)
-        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.41.v20210516 - https://eclipse.org/jetty/jetty-http)
-        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.41.v20210516 - https://eclipse.org/jetty/jetty-io)
-        * Jetty :: JMX Management (org.eclipse.jetty:jetty-jmx:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-jmx)
+        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-client)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-continuation)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-continuation)
+        * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-deploy)
+        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-http)
+        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-io)
+        * Jetty :: JMX Management (org.eclipse.jetty:jetty-jmx:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-jmx)
         * Jetty :: JNDI Naming (org.eclipse.jetty:jetty-jndi:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Jetty :: Plus (org.eclipse.jetty:jetty-plus:9.4.15.v20190215 - http://www.eclipse.org/jetty)
-        * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-rewrite)
-        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-security)
-        * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.41.v20210516 - https://eclipse.org/jetty/jetty-server)
-        * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-servlet)
-        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-servlets)
-        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.41.v20210516 - https://eclipse.org/jetty/jetty-util)
-        * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-webapp)
-        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.34.v20201102 - https://eclipse.org/jetty/jetty-xml)
-        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-client)
-        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-common)
-        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-hpack)
-        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
-        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.34.v20201102 - https://eclipse.org/jetty/http2-parent/http2-server)
+        * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-rewrite)
+        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-security)
+        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-security)
+        * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-server)
+        * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-servlet)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-servlets)
+        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-util)
+        * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-util-ajax)
+        * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-webapp)
+        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.48.v20220622 - https://eclipse.org/jetty/jetty-xml)
+        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-client)
+        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.48.v20220622 - https://eclipse.org/jetty/http2-parent/http2-common)
+        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-hpack)
+        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.48.v20220622 - https://eclipse.org/jetty/http2-parent/http2-server)
         * Jetty :: Schemas (org.eclipse.jetty.toolchain:jetty-schemas:3.1.2 - https://eclipse.org/jetty/jetty-schemas)
         * HK2 API module (org.glassfish.hk2:hk2-api:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
         * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
@@ -535,10 +524,10 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:1.0.3 - https://projects.eclipse.org/projects/ee4j/osgi-resource-locator)
         * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
         * javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:jakarta.inject:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/jakarta.inject)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Java Persistence API, Version 2.1 (org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final - http://hibernate.org)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * Java Persistence API, Version 2.1 (org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final - http://hibernate.org)
         * Jetty Server (org.mortbay.jetty:jetty:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty)
         * Jetty Servlet Tester (org.mortbay.jetty:jetty-servlet-tester:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-servlet-tester)
         * Jetty Utilities (org.mortbay.jetty:jetty-util:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-util)
@@ -552,21 +541,16 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * json-schema-validator (com.github.java-json-tools:json-schema-validator:2.2.14 - https://github.com/java-json-tools/json-schema-validator)
         * msg-simple (com.github.java-json-tools:msg-simple:1.2 - https://github.com/java-json-tools/msg-simple)
         * uri-template (com.github.java-json-tools:uri-template:0.10 - https://github.com/java-json-tools/uri-template)
-        * SpotBugs Annotations (com.github.spotbugs:spotbugs-annotations:3.1.9 - https://spotbugs.github.io/)
         * FindBugs-Annotations (com.google.code.findbugs:annotations:3.0.1u2 - http://findbugs.sourceforge.net/)
-        * c3p0 (com.mchange:c3p0:0.9.5.5 - https://github.com/swaldman/c3p0)
-        * mchange-commons-java (com.mchange:mchange-commons-java:0.2.19 - https://github.com/swaldman/mchange-commons-java)
-        * Java Native Access (net.java.dev.jna:jna:5.5.0 - https://github.com/java-native-access/jna)
         * JHighlight (org.codelibs:jhighlight:1.0.3 - https://github.com/codelibs/jhighlight)
-        * Hibernate ORM - hibernate-core (org.hibernate:hibernate-core:5.4.10.Final - http://hibernate.org/orm)
-        * Hibernate ORM - hibernate-ehcache (org.hibernate:hibernate-ehcache:5.4.10.Final - http://hibernate.org/orm)
-        * Hibernate ORM - hibernate-jpamodelgen (org.hibernate:hibernate-jpamodelgen:5.4.10.Final - http://hibernate.org/orm)
-        * Hibernate Commons Annotations (org.hibernate.common:hibernate-commons-annotations:5.1.0.Final - http://hibernate.org)
+        * Hibernate ORM - hibernate-core (org.hibernate:hibernate-core:5.6.5.Final - https://hibernate.org/orm)
+        * Hibernate ORM - hibernate-jcache (org.hibernate:hibernate-jcache:5.6.5.Final - https://hibernate.org/orm)
+        * Hibernate ORM - hibernate-jpamodelgen (org.hibernate:hibernate-jpamodelgen:5.6.5.Final - https://hibernate.org/orm)
+        * Hibernate Commons Annotations (org.hibernate.common:hibernate-commons-annotations:5.1.2.Final - http://hibernate.org)
         * im4java (org.im4java:im4java:1.4.0 - http://sourceforge.net/projects/im4java/)
-        * JacORB OMG-API (org.jacorb:jacorb-omgapi:3.9 - http://www.jacorb.org)
         * Javassist (org.javassist:javassist:3.25.0-GA - http://www.javassist.org/)
-        * Java RMI API (org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec:1.0.6.Final - http://www.jboss.org/jboss-rmi-api_1.0_spec)
         * XOM (xom:xom:1.2.5 - http://xom.nu)
+        * XOM (xom:xom:1.3.7 - https://xom.nu)
 
     Go License:
 
@@ -576,29 +560,21 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
         * Handle Server (net.handle:handle:9.3.0 - https://www.handle.net)
 
-    JDOM License (Apache-style license):
-
-        * jdom (jdom:jdom:1.0 - no url defined)
-
     MIT License:
 
         * Java SemVer (com.github.zafarkhaja:java-semver:0.9.0 - https://github.com/zafarkhaja/jsemver)
+        * dd-plist (com.googlecode.plist:dd-plist:1.23 - http://www.github.com/3breadt/dd-plist)
         * DigitalCollections: IIIF API Library (de.digitalcollections.iiif:iiif-apis:0.3.9 - https://github.com/dbmdz/iiif-apis)
-        * CDM core library (edu.ucar:cdm:4.5.5 - http://www.unidata.ucar.edu/software/netcdf-java/documentation.htm)
-        * GRIB IOSP and Feature Collection (edu.ucar:grib:4.5.5 - http://www.unidata.ucar.edu/software/netcdf-java/)
-        * HttpClient Wrappers (edu.ucar:httpservices:4.5.5 - http://www.unidata.ucar.edu/software/netcdf-java/documentation.htm)
-        * netCDF-4 IOSP JNI connection to C library (edu.ucar:netcdf4:4.5.5 - http://www.unidata.ucar.edu/software/netcdf-java/netcdf4/)
-        * udunits (edu.ucar:udunits:4.5.5 - http://www.unidata.ucar.edu/software/udunits//)
         * JOpt Simple (net.sf.jopt-simple:jopt-simple:5.0.4 - http://jopt-simple.github.io/jopt-simple)
-        * Bouncy Castle S/MIME API (org.bouncycastle:bcmail-jdk15on:1.65 - http://www.bouncycastle.org/java.html)
-        * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk15on:1.65 - http://www.bouncycastle.org/java.html)
-        * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk15on:1.65 - http://www.bouncycastle.org/java.html)
+        * Bouncy Castle S/MIME API (org.bouncycastle:bcmail-jdk15on:1.70 - https://www.bouncycastle.org/java.html)
+        * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk15on:1.70 - https://www.bouncycastle.org/java.html)
+        * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk15on:1.70 - https://www.bouncycastle.org/java.html)
+        * Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk15on:1.70 - https://www.bouncycastle.org/java.html)
         * org.brotli:dec (org.brotli:dec:0.1.2 - http://brotli.org/dec)
+        * Checker Qual (org.checkerframework:checker-qual:3.10.0 - https://checkerframework.org)
         * Checker Qual (org.checkerframework:checker-qual:3.5.0 - https://checkerframework.org)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Itadaki jbzip2 (org.itadaki:bzip2:0.9.1 - https://code.google.com/p/jbzip2/)
-        * jsoup Java HTML Parser (org.jsoup:jsoup:1.13.1 - https://jsoup.org/)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
         * mockito-core (org.mockito:mockito-core:3.12.4 - https://github.com/mockito/mockito)
         * mockito-inline (org.mockito:mockito-inline:3.12.4 - https://github.com/mockito/mockito)
         * ORCID - Model (org.orcid:orcid-model:3.0.2 - http://github.com/ORCID/orcid-model)
@@ -606,29 +582,33 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.25 - http://www.slf4j.org)
         * SLF4J API Module (org.slf4j:slf4j-api:1.7.25 - http://www.slf4j.org)
         * SLF4J Extensions Module (org.slf4j:slf4j-ext:1.7.28 - http://www.slf4j.org)
+        * HAL Browser (org.webjars:hal-browser:ad9b865 - http://webjars.org)
         * toastr (org.webjars.bowergithub.codeseven:toastr:2.1.4 - http://webjars.org)
-        * jquery (org.webjars.bowergithub.jquery:jquery-dist:3.5.1 - https://www.webjars.org)
-        * bootstrap (org.webjars.bowergithub.twbs:bootstrap:4.5.2 - https://www.webjars.org)
+        * backbone (org.webjars.bowergithub.jashkenas:backbone:1.4.1 - https://www.webjars.org)
+        * underscore (org.webjars.bowergithub.jashkenas:underscore:1.13.2 - https://www.webjars.org)
+        * jquery (org.webjars.bowergithub.jquery:jquery-dist:3.6.0 - https://www.webjars.org)
+        * urijs (org.webjars.bowergithub.medialize:uri.js:1.19.10 - https://www.webjars.org)
+        * bootstrap (org.webjars.bowergithub.twbs:bootstrap:4.6.1 - https://www.webjars.org)
+        * core-js (org.webjars.npm:core-js:3.25.2 - https://www.webjars.org)
+        * @json-editor/json-editor (org.webjars.npm:json-editor__json-editor:2.6.1 - https://www.webjars.org)
 
     Mozilla Public License:
 
         * juniversalchardet (com.googlecode.juniversalchardet:juniversalchardet:1.0.3 - http://juniversalchardet.googlecode.com/)
-        * h2 (com.h2database:h2:1.4.187 - no url defined)
+        * H2 Database Engine (com.h2database:h2:2.1.210 - https://h2database.com)
         * Saxon-HE (net.sf.saxon:Saxon-HE:9.8.0-14 - http://www.saxonica.com/)
         * Javassist (org.javassist:javassist:3.25.0-GA - http://www.javassist.org/)
         * Mozilla Rhino (org.mozilla:rhino:1.7.7.2 - https://developer.mozilla.org/en/Rhino)
 
-    OGC copyright:
-
-        * GeoAPI (org.opengis:geoapi:3.0.1 - http://www.geoapi.org/geoapi/)
-
     Public Domain:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * HdrHistogram (org.hdrhistogram:HdrHistogram:2.1.12 - http://hdrhistogram.github.io/HdrHistogram/)
+        * LatencyUtils (org.latencyutils:LatencyUtils:2.0.3 - http://latencyutils.github.io/LatencyUtils/)
         * Reflections (org.reflections:reflections:0.9.12 - http://github.com/ronmamo/reflections)
-        * XZ for Java (org.tukaani:xz:1.8 - https://tukaani.org/xz/java.html)
+        * XZ for Java (org.tukaani:xz:1.9 - https://tukaani.org/xz/java.html)
 
     The JSON License:
 
@@ -636,7 +616,7 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     UnRar License:
 
-        * Java UnRar (com.github.junrar:junrar:4.0.0 - https://github.com/junrar/junrar)
+        * Java Unrar (com.github.junrar:junrar:7.4.1 - https://github.com/junrar/junrar)
 
     Unicode/ICU License:
 
@@ -644,10 +624,10 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     W3C license:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
 
     jQuery license:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.30.1 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
diff --git a/README.md b/README.md
index 864a099c1d..af9158eff3 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Documentation for each release may be viewed online or downloaded via our [Docum
 The latest DSpace Installation instructions are available at:
 https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 
-Please be aware that, as a Java web application, DSpace requires a database (PostgreSQL or Oracle)
+Please be aware that, as a Java web application, DSpace requires a database (PostgreSQL)
 and a servlet container (usually Tomcat) in order to function.
 More information about these and all other prerequisites can be found in the Installation instructions above.
 
@@ -48,18 +48,7 @@ See [Running DSpace 7 with Docker Compose](dspace/src/main/docker-compose/README
 
 ## Contributing
 
-DSpace is a community built and supported project. We do not have a centralized development or support team,
-but have a dedicated group of volunteers who help us improve the software, documentation, resources, etc.
-
-We welcome contributions of any type. Here's a few basic guides that provide suggestions for contributing to DSpace:
-* [How to Contribute to DSpace](https://wiki.lyrasis.org/display/DSPACE/How+to+Contribute+to+DSpace): How to contribute in general (via code, documentation, bug reports, expertise, etc)
-* [Code Contribution Guidelines](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines): How to give back code or contribute features, bug fixes, etc.
-* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team): If you are not a developer, we also have an interest group specifically for repository managers. The DCAT group meets virtually, once a month, and sends open invitations to join their meetings via the [DCAT mailing list](https://groups.google.com/d/forum/DSpaceCommunityAdvisoryTeam).
-
-We also encourage GitHub Pull Requests (PRs) at any time. Please see our [Development with Git](https://wiki.lyrasis.org/display/DSPACE/Development+with+Git) guide for more info.
-
-In addition, a listing of all known contributors to DSpace software can be
-found online at: https://wiki.lyrasis.org/display/DSPACE/DSpaceContributors
+See [Contributing documentation](CONTRIBUTING.md)
 
 ## Getting Help
 
diff --git a/checkstyle.xml b/checkstyle.xml
index 815edaec7b..e0fa808d83 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -92,9 +92,7 @@ For more information on CheckStyle configurations below, see: http://checkstyle.
         <!-- Requirements for Javadocs for methods -->
         <module name="JavadocMethod">
             <!-- All public methods MUST HAVE Javadocs -->
-            <!-- <property name="scope" value="public"/> -->
-            <!-- TODO: Above rule has been disabled because of large amount of missing public method Javadocs -->
-            <property name="scope" value="nothing"/>
+            <property name="scope" value="public"/>
             <!-- Allow params, throws and return tags to be optional -->
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
diff --git a/docker-compose.yml b/docker-compose.yml
index f790257bdb..6008b873ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,6 +41,8 @@ services:
       target: 8080
     - published: 8009
       target: 8009
+    - published: 8000
+      target: 8000
     stdin_open: true
     tty: true
     volumes:
diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index f000f2e1ba..6850051600 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -334,18 +334,47 @@
     </profiles>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-ehcache</artifactId>
+            <artifactId>hibernate-core</artifactId>
+                <exclusions>
+                    <!-- Newer version pulled in via Jersey below -->
+                    <exclusion>
+                        <groupId>org.javassist</groupId>
+                        <artifactId>javassist</artifactId>
+                    </exclusion>
+                </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jcache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>${ehcache.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache
+             Caching dependencies for sherpa service. -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+            <version>${spring-boot.version}</version>
             <exclusions>
-                <!-- Newer version pulled in via Jersey below -->
                 <exclusion>
-                    <groupId>org.javassist</groupId>
-                    <artifactId>javassist</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>javax.cache</groupId>
+            <artifactId>cache-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
@@ -358,7 +387,7 @@
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
             <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0.Final</version>
+            <version>1.0.2.Final</version>
         </dependency>
 
         <dependency>
@@ -379,7 +408,7 @@
                     <groupId>org.ow2.asm</groupId>
                     <artifactId>asm-commons</artifactId>
                 </exclusion>
-                <!-- Newer version of Bouncycastle brought in via solr-cell -->
+                <!-- Newer version of Bouncycastle brought in via Tika -->
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcpkix-jdk15on</artifactId>
@@ -388,39 +417,6 @@
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-jdk15on</artifactId>
                 </exclusion>
-                <!-- Newer version of Jetty in our parent POM & via Solr -->
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-alpn-java-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-deploy</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-servlet</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-servlets</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-webapp</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-xml</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty.http2</groupId>
-                    <artifactId>http2-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty.http2</groupId>
-                    <artifactId>http2-server</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <!-- Jetty is needed to run Handle Server -->
@@ -505,7 +501,7 @@
         </dependency>
         <dependency>
             <groupId>org.jdom</groupId>
-            <artifactId>jdom</artifactId>
+            <artifactId>jdom2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
@@ -515,22 +511,11 @@
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>fontbox</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-scratchpad</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>
         </dependency>
+        <!-- Codebase at https://github.com/DSpace/oclc-harvester2 -->
         <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>oclc-harvester2</artifactId>
@@ -566,101 +551,49 @@
         </dependency>
         <!-- Used for RSS / ATOM syndication feeds -->
         <dependency>
-            <groupId>org.rometools</groupId>
+            <groupId>com.rometools</groupId>
+            <artifactId>rome</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.rometools</groupId>
             <artifactId>rome-modules</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.jbibtex</groupId>
             <artifactId>jbibtex</artifactId>
-            <version>1.0.10</version>
+            <version>1.0.20</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+        </dependency>
 
+        <!-- SolrJ is used to communicate with Solr throughout the dspace-api -->
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
             <version>${solr.client.version}</version>
-            <exclusions>
-                <!-- Newer Jetty version brought in via Parent POM -->
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <!-- Solr Core is needed for Integration Tests (to run a MockSolrServer)     -->
+        <!-- Solr Core is only needed for Integration Tests (to run a MockSolrServer) -->
         <!-- The following Solr / Lucene dependencies also support integration tests -->
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-core</artifactId>
             <scope>test</scope>
             <version>${solr.client.version}</version>
-            <exclusions>
-                <!-- Newer version brought in by opencsv -->
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-                <!-- Newer Jetty version brought in via Parent POM -->
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-cell</artifactId>
-            <exclusions>
-                <!-- Newer version brought in by opencsv -->
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-                <!-- Newer Jetty version brought in via Parent POM -->
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-core</artifactId>
         </dependency>
-        <!-- Used for full-text indexing with Solr -->
-        <dependency>
-            <groupId>org.apache.tika</groupId>
-            <artifactId>tika-parsers</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-analyzers-icu</artifactId>
@@ -676,9 +609,15 @@
             <artifactId>lucene-analyzers-stempel</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Tika is used to extract full text from documents in order to index in Solr -->
         <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-parsers-standard-package</artifactId>
         </dependency>
 
         <dependency>
@@ -702,13 +641,6 @@
             <version>1.1.1</version>
         </dependency>
 
-        <!--  Gson: Java to Json conversion -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -736,7 +668,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>6.5.7</version>
+            <version>8.4.4</version>
         </dependency>
 
         <!-- Google Analytics -->
@@ -792,44 +724,6 @@
             <artifactId>jaxb-runtime</artifactId>
         </dependency>
 
-        <!-- Apache Axiom -->
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>${axiom.version}</version>
-            <exclusions>
-                <!-- Exclude Geronimo as it is NOT necessary when using javax.activation (which we use)
-                     See: https://ws.apache.org/axiom/userguide/ch04.html#d0e732 -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <!-- Exclude Woodstox, as later version provided by Solr dependencies -->
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>woodstox-core-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>${axiom.version}</version>
-            <exclusions>
-                <!-- Exclude Geronimo as it is NOT necessary when using javax.activation (which we use)
-                     See: https://ws.apache.org/axiom/userguide/ch04.html#d0e732 -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <!-- Exclude Woodstox, as later version provided by Solr dependencies -->
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>woodstox-core-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- Jersey / JAX-RS client (javax.ws.rs.*) dependencies needed to integrate with external sources/services -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -848,7 +742,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.116</version>
+            <version>1.12.261</version>
         </dependency>
 
         <dependency>
@@ -885,18 +779,25 @@
             <version>20180130</version>
         </dependency>
 
+        <!-- Useful for testing command-line tools -->
+        <dependency>
+            <groupId>com.github.stefanbirkner</groupId>
+            <artifactId>system-rules</artifactId>
+            <version>1.19.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Used for Solr core export/import -->
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>5.2</version>
+            <version>5.6</version>
         </dependency>
 
         <!-- Email templating -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-            <type>jar</type>
         </dependency>
 
         <dependency>
@@ -918,18 +819,18 @@
             <version>2.0.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.stefanbirkner</groupId>
-            <artifactId>system-rules</artifactId>
-            <version>1.19.0</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-junit-rule</artifactId>
             <version>5.11.2</version>
             <scope>test</scope>
+            <exclusions>
+                <!-- Exclude snakeyaml to avoid conflicts with: spring-boot-starter-cache -->
+            	<exclusion>
+            		<groupId>org.yaml</groupId>
+            		<artifactId>snakeyaml</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -938,11 +839,6 @@
           <!-- for mockserver -->
           <!-- Solve dependency convergence issues related to
                'mockserver-junit-rule' by selecting the versions we want to use. -->
-          <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.9</version>
-          </dependency>
           <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
@@ -971,7 +867,7 @@
           <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-            <version>2.2</version>
+            <version>2.3</version>
           </dependency>
           <dependency>
               <groupId>org.xmlunit</groupId>
diff --git a/dspace-api/src/main/java/org/dspace/access/status/AccessStatusHelper.java b/dspace-api/src/main/java/org/dspace/access/status/AccessStatusHelper.java
new file mode 100644
index 0000000000..1cacbf6aed
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/access/status/AccessStatusHelper.java
@@ -0,0 +1,30 @@
+/**
+ * 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/
+ */
+package org.dspace.access.status;
+
+import java.sql.SQLException;
+import java.util.Date;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Plugin interface for the access status calculation.
+ */
+public interface AccessStatusHelper {
+    /**
+     * Calculate the access status for the item.
+     *
+     * @param context the DSpace context
+     * @param item    the item
+     * @return an access status value
+     * @throws SQLException An exception that provides information on a database access error or other errors.
+     */
+    public String getAccessStatusFromItem(Context context, Item item, Date threshold)
+        throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/access/status/AccessStatusServiceImpl.java b/dspace-api/src/main/java/org/dspace/access/status/AccessStatusServiceImpl.java
new file mode 100644
index 0000000000..544dc99cb4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/access/status/AccessStatusServiceImpl.java
@@ -0,0 +1,66 @@
+/**
+ * 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/
+ */
+package org.dspace.access.status;
+
+import java.sql.SQLException;
+import java.util.Date;
+
+import org.dspace.access.status.service.AccessStatusService;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.service.PluginService;
+import org.dspace.services.ConfigurationService;
+import org.joda.time.LocalDate;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation for the access status calculation service.
+ */
+public class AccessStatusServiceImpl implements AccessStatusService {
+    // Plugin implementation, set from the DSpace configuration by init().
+    protected AccessStatusHelper helper = null;
+
+    protected Date forever_date = null;
+
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
+
+    @Autowired(required = true)
+    protected PluginService pluginService;
+
+    /**
+     * Initialize the bean (after dependency injection has already taken place).
+     * Ensures the configurationService is injected, so that we can get the plugin
+     * and the forever embargo date threshold from the configuration.
+     * Called by "init-method" in Spring configuration.
+     *
+     * @throws Exception on generic exception
+     */
+    public void init() throws Exception {
+        if (helper == null) {
+            helper = (AccessStatusHelper) pluginService.getSinglePlugin(AccessStatusHelper.class);
+            if (helper == null) {
+                throw new IllegalStateException("The AccessStatusHelper plugin was not defined in "
+                        + "DSpace configuration.");
+            }
+
+            // Defines the embargo forever date threshold for the access status.
+            // Look at EmbargoService.FOREVER for some improvements?
+            int year = configurationService.getIntProperty("access.status.embargo.forever.year");
+            int month = configurationService.getIntProperty("access.status.embargo.forever.month");
+            int day = configurationService.getIntProperty("access.status.embargo.forever.day");
+
+            forever_date = new LocalDate(year, month, day).toDate();
+        }
+    }
+
+    @Override
+    public String getAccessStatus(Context context, Item item) throws SQLException {
+        return helper.getAccessStatusFromItem(context, item, forever_date);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/access/status/DefaultAccessStatusHelper.java b/dspace-api/src/main/java/org/dspace/access/status/DefaultAccessStatusHelper.java
new file mode 100644
index 0000000000..a67fa67af3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/access/status/DefaultAccessStatusHelper.java
@@ -0,0 +1,159 @@
+/**
+ * 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/
+ */
+package org.dspace.access.status;
+
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.authorize.factory.AuthorizeServiceFactory;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.authorize.service.ResourcePolicyService;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.eperson.Group;
+
+/**
+ * Default plugin implementation of the access status helper.
+ * The getAccessStatusFromItem method provides a simple logic to
+ * calculate the access status of an item based on the policies of
+ * the primary or the first bitstream in the original bundle.
+ * Users can override this method for enhanced functionality.
+ */
+public class DefaultAccessStatusHelper implements AccessStatusHelper {
+    public static final String EMBARGO = "embargo";
+    public static final String METADATA_ONLY = "metadata.only";
+    public static final String OPEN_ACCESS = "open.access";
+    public static final String RESTRICTED = "restricted";
+    public static final String UNKNOWN = "unknown";
+
+    protected ItemService itemService =
+            ContentServiceFactory.getInstance().getItemService();
+    protected ResourcePolicyService resourcePolicyService =
+            AuthorizeServiceFactory.getInstance().getResourcePolicyService();
+    protected AuthorizeService authorizeService =
+            AuthorizeServiceFactory.getInstance().getAuthorizeService();
+
+    public DefaultAccessStatusHelper() {
+        super();
+    }
+
+    /**
+     * Look at the item's policies to determine an access status value.
+     * It is also considering a date threshold for embargos and restrictions.
+     *
+     * If the item is null, simply returns the "unknown" value.
+     *
+     * @param context     the DSpace context
+     * @param item        the item to embargo
+     * @param threshold   the embargo threshold date
+     * @return an access status value
+     */
+    @Override
+    public String getAccessStatusFromItem(Context context, Item item, Date threshold)
+            throws SQLException {
+        if (item == null) {
+            return UNKNOWN;
+        }
+        // Consider only the original bundles.
+        List<Bundle> bundles = item.getBundles(Constants.DEFAULT_BUNDLE_NAME);
+        // Check for primary bitstreams first.
+        Bitstream bitstream = bundles.stream()
+            .map(bundle -> bundle.getPrimaryBitstream())
+            .filter(Objects::nonNull)
+            .findFirst()
+            .orElse(null);
+        if (bitstream == null) {
+            // If there is no primary bitstream,
+            // take the first bitstream in the bundles.
+            bitstream = bundles.stream()
+                .map(bundle -> bundle.getBitstreams())
+                .flatMap(List::stream)
+                .findFirst()
+                .orElse(null);
+        }
+        return caculateAccessStatusForDso(context, bitstream, threshold);
+    }
+
+    /**
+     * Look at the DSpace object's policies to determine an access status value.
+     *
+     * If the object is null, returns the "metadata.only" value.
+     * If any policy attached to the object is valid for the anonymous group,
+     * returns the "open.access" value.
+     * Otherwise, if the policy start date is before the embargo threshold date,
+     * returns the "embargo" value.
+     * Every other cases return the "restricted" value.
+     *
+     * @param context     the DSpace context
+     * @param dso         the DSpace object
+     * @param threshold   the embargo threshold date
+     * @return an access status value
+     */
+    private String caculateAccessStatusForDso(Context context, DSpaceObject dso, Date threshold)
+            throws SQLException {
+        if (dso == null) {
+            return METADATA_ONLY;
+        }
+        // Only consider read policies.
+        List<ResourcePolicy> policies = authorizeService
+            .getPoliciesActionFilter(context, dso, Constants.READ);
+        int openAccessCount = 0;
+        int embargoCount = 0;
+        int restrictedCount = 0;
+        int unknownCount = 0;
+        // Looks at all read policies.
+        for (ResourcePolicy policy : policies) {
+            boolean isValid = resourcePolicyService.isDateValid(policy);
+            Group group = policy.getGroup();
+            // The group must not be null here. However,
+            // if it is, consider this as an unexpected case.
+            if (group == null) {
+                unknownCount++;
+            } else if (StringUtils.equals(group.getName(), Group.ANONYMOUS)) {
+                // Only calculate the status for the anonymous group.
+                if (isValid) {
+                    // If the policy is valid, the anonymous group have access
+                    // to the bitstream.
+                    openAccessCount++;
+                } else {
+                    Date startDate = policy.getStartDate();
+                    if (startDate != null && !startDate.before(threshold)) {
+                        // If the policy start date have a value and if this value
+                        // is equal or superior to the configured forever date, the
+                        // access status is also restricted.
+                        restrictedCount++;
+                    } else {
+                        // If the current date is not between the policy start date
+                        // and end date, the access status is embargo.
+                        embargoCount++;
+                    }
+                }
+            }
+        }
+        if (openAccessCount > 0) {
+            return OPEN_ACCESS;
+        }
+        if (embargoCount > 0 && restrictedCount == 0) {
+            return EMBARGO;
+        }
+        if (unknownCount > 0) {
+            return UNKNOWN;
+        }
+        return RESTRICTED;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/access/status/factory/AccessStatusServiceFactory.java b/dspace-api/src/main/java/org/dspace/access/status/factory/AccessStatusServiceFactory.java
new file mode 100644
index 0000000000..77d8f6b448
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/access/status/factory/AccessStatusServiceFactory.java
@@ -0,0 +1,25 @@
+/**
+ * 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/
+ */
+package org.dspace.access.status.factory;
+
+import org.dspace.access.status.service.AccessStatusService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the access status package,
+ * use AccessStatusServiceFactory.getInstance() to retrieve an implementation.
+ */
+public abstract class AccessStatusServiceFactory {
+
+    public abstract AccessStatusService getAccessStatusService();
+
+    public static AccessStatusServiceFactory getInstance() {
+        return DSpaceServicesFactory.getInstance().getServiceManager()
+                .getServiceByName("accessStatusServiceFactory", AccessStatusServiceFactory.class);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/access/status/factory/AccessStatusServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/access/status/factory/AccessStatusServiceFactoryImpl.java
new file mode 100644
index 0000000000..fe3848cb2b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/access/status/factory/AccessStatusServiceFactoryImpl.java
@@ -0,0 +1,26 @@
+/**
+ * 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/
+ */
+package org.dspace.access.status.factory;
+
+import org.dspace.access.status.service.AccessStatusService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Factory implementation to get services for the access status package,
+ * use AccessStatusServiceFactory.getInstance() to retrieve an implementation.
+ */
+public class AccessStatusServiceFactoryImpl extends AccessStatusServiceFactory {
+
+    @Autowired(required = true)
+    private AccessStatusService accessStatusService;
+
+    @Override
+    public AccessStatusService getAccessStatusService() {
+        return accessStatusService;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/access/status/package-info.java b/dspace-api/src/main/java/org/dspace/access/status/package-info.java
new file mode 100644
index 0000000000..2c0ed22cd4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/access/status/package-info.java
@@ -0,0 +1,30 @@
+/**
+ * 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/
+ */
+/**
+ * <p>
+ * Access status allows the users to view the bitstreams availability before
+ * browsing into the item itself.
+ * </p>
+ * <p>
+ * The access status is calculated through a pluggable class:
+ * {@link org.dspace.access.status.AccessStatusHelper}.
+ * The {@link org.dspace.access.status.AccessStatusServiceImpl}
+ * must be configured to specify this class, as well as a forever embargo date
+ * threshold year, month and day.
+ * </p>
+ * <p>
+ * See {@link org.dspace.access.status.DefaultAccessStatusHelper} for a simple calculation
+ * based on the primary or the first bitstream of the original bundle. You can
+ * supply your own class to implement more complex access statuses.
+ * </p>
+ * <p>
+ * For now, the access status is calculated when the item is shown in a list.
+ * </p>
+ */
+
+package org.dspace.access.status;
diff --git a/dspace-api/src/main/java/org/dspace/access/status/service/AccessStatusService.java b/dspace-api/src/main/java/org/dspace/access/status/service/AccessStatusService.java
new file mode 100644
index 0000000000..43de5e3c47
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/access/status/service/AccessStatusService.java
@@ -0,0 +1,46 @@
+/**
+ * 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/
+ */
+package org.dspace.access.status.service;
+
+import java.sql.SQLException;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Public interface to the access status subsystem.
+ * <p>
+ * Configuration properties: (with examples)
+ * {@code
+ * # values for the forever embargo date threshold
+ * # This threshold date is used in the default access status helper to dermine if an item is
+ * # restricted or embargoed based on the start date of the primary (or first) file policies.
+ * # In this case, if the policy start date is inferior to the threshold date, the status will
+ * # be embargo, else it will be restricted.
+ * # You might want to change this threshold based on your needs. For example: some databases
+ * # doesn't accept a date superior to 31 december 9999.
+ * access.status.embargo.forever.year = 10000
+ * access.status.embargo.forever.month = 1
+ * access.status.embargo.forever.day = 1
+ * # implementation of access status helper plugin - replace with local implementation if applicable
+ * # This default access status helper provides an item status based on the policies of the primary
+ * # bitstream (or first bitstream in the original bundles if no primary file is specified).
+ * plugin.single.org.dspace.access.status.AccessStatusHelper = org.dspace.access.status.DefaultAccessStatusHelper
+ * }
+ */
+public interface AccessStatusService {
+
+    /**
+     * Calculate the access status for an Item while considering the forever embargo date threshold.
+     *
+     * @param context the DSpace context
+     * @param item    the item
+     * @throws SQLException An exception that provides information on a database access error or other errors.
+     */
+    public String getAccessStatus(Context context, Item item) throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java b/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
index 80d69f3b66..81250e9c82 100644
--- a/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
+++ b/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
@@ -14,6 +14,7 @@ import java.util.Locale;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.core.Context;
@@ -54,14 +55,14 @@ public final class CreateAdministrator {
     protected GroupService groupService;
 
     /**
-     * For invoking via the command line.  If called with no command line arguments,
+     * For invoking via the command line. If called with no command line arguments,
      * it will negotiate with the user for the administrator details
      *
      * @param argv the command line arguments given
      * @throws Exception if error
      */
     public static void main(String[] argv)
-        throws Exception {
+            throws Exception {
         CommandLineParser parser = new DefaultParser();
         Options options = new Options();
 
@@ -69,19 +70,41 @@ public final class CreateAdministrator {
 
         options.addOption("e", "email", true, "administrator email address");
         options.addOption("f", "first", true, "administrator first name");
+        options.addOption("h", "help", false, "explain create-administrator options");
         options.addOption("l", "last", true, "administrator last name");
         options.addOption("c", "language", true, "administrator language");
         options.addOption("p", "password", true, "administrator password");
 
-        CommandLine line = parser.parse(options, argv);
+        CommandLine line = null;
+
+        try {
+
+            line = parser.parse(options, argv);
+
+        } catch (Exception e) {
+
+            System.out.println(e.getMessage() + "\nTry \"dspace create-administrator -h\" to print help information.");
+            System.exit(1);
+
+        }
 
         if (line.hasOption("e") && line.hasOption("f") && line.hasOption("l") &&
-            line.hasOption("c") && line.hasOption("p")) {
+                line.hasOption("c") && line.hasOption("p")) {
             ca.createAdministrator(line.getOptionValue("e"),
-                                   line.getOptionValue("f"), line.getOptionValue("l"),
-                                   line.getOptionValue("c"), line.getOptionValue("p"));
+                    line.getOptionValue("f"), line.getOptionValue("l"),
+                    line.getOptionValue("c"), line.getOptionValue("p"));
+        } else if (line.hasOption("h")) {
+            String header = "\nA command-line tool for creating an initial administrator for setting up a" +
+                    " DSpace site. Unless all the required parameters are passed it will" +
+                    " prompt for an e-mail address, last name, first name and password from" +
+                    " standard input.. An administrator group is then created and the data passed" +
+                    "  in used to create an e-person in that group.\n\n";
+            String footer = "\n";
+            HelpFormatter formatter = new HelpFormatter();
+            formatter.printHelp("dspace create-administrator", header, options, footer, true);
+            return;
         } else {
-            ca.negotiateAdministratorDetails();
+            ca.negotiateAdministratorDetails(line);
         }
     }
 
@@ -91,7 +114,7 @@ public final class CreateAdministrator {
      * @throws Exception if error
      */
     protected CreateAdministrator()
-        throws Exception {
+            throws Exception {
         context = new Context();
         groupService = EPersonServiceFactory.getInstance().getGroupService();
         ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
@@ -103,20 +126,20 @@ public final class CreateAdministrator {
      *
      * @throws Exception if error
      */
-    protected void negotiateAdministratorDetails()
-        throws Exception {
+    protected void negotiateAdministratorDetails(CommandLine line)
+            throws Exception {
         Console console = System.console();
 
         System.out.println("Creating an initial administrator account");
 
-        boolean dataOK = false;
-
-        String email = null;
-        String firstName = null;
-        String lastName = null;
-        char[] password1 = null;
-        char[] password2 = null;
+        String email = line.getOptionValue('e');
+        String firstName = line.getOptionValue('f');
+        String lastName = line.getOptionValue('l');
         String language = I18nUtil.getDefaultLocale().getLanguage();
+        ConfigurationService cfg = DSpaceServicesFactory.getInstance().getConfigurationService();
+        boolean flag = line.hasOption('p');
+        char[] password = null;
+        boolean dataOK = line.hasOption('f') && line.hasOption('e') && line.hasOption('l');
 
         while (!dataOK) {
             System.out.print("E-mail address: ");
@@ -147,8 +170,6 @@ public final class CreateAdministrator {
             if (lastName != null) {
                 lastName = lastName.trim();
             }
-
-            ConfigurationService cfg = DSpaceServicesFactory.getInstance().getConfigurationService();
             if (cfg.hasProperty("webui.supported.locales")) {
                 System.out.println("Select one of the following languages: "
                         + cfg.getProperty("webui.supported.locales"));
@@ -163,46 +184,59 @@ public final class CreateAdministrator {
                 }
             }
 
-            System.out.println("Password will not display on screen.");
-            System.out.print("Password: ");
+            System.out.print("Is the above data correct? (y or n): ");
             System.out.flush();
 
-            password1 = console.readPassword();
+            String s = console.readLine();
 
-            System.out.print("Again to confirm: ");
-            System.out.flush();
-
-            password2 = console.readPassword();
-
-            //TODO real password validation
-            if (password1.length > 1 && Arrays.equals(password1, password2)) {
-                // password OK
-                System.out.print("Is the above data correct? (y or n): ");
-                System.out.flush();
-
-                String s = console.readLine();
-
-                if (s != null) {
-                    s = s.trim();
-                    if (s.toLowerCase().startsWith("y")) {
-                        dataOK = true;
-                    }
+            if (s != null) {
+                s = s.trim();
+                if (s.toLowerCase().startsWith("y")) {
+                    dataOK = true;
                 }
-            } else {
-                System.out.println("Passwords don't match");
             }
+
+        }
+        if (!flag) {
+            password = getPassword(console);
+            if (password == null) {
+                return;
+            }
+        } else {
+            password = line.getOptionValue("p").toCharArray();
         }
-
         // if we make it to here, we are ready to create an administrator
-        createAdministrator(email, firstName, lastName, language, String.valueOf(password1));
+        createAdministrator(email, firstName, lastName, language, String.valueOf(password));
 
-        //Cleaning arrays that held password
-        Arrays.fill(password1, ' ');
-        Arrays.fill(password2, ' ');
+    }
+
+    private char[] getPassword(Console console) {
+        char[] password1 = null;
+        char[] password2 = null;
+        System.out.println("Password will not display on screen.");
+        System.out.print("Password: ");
+        System.out.flush();
+
+        password1 = console.readPassword();
+
+        System.out.print("Again to confirm: ");
+        System.out.flush();
+
+        password2 = console.readPassword();
+
+        // TODO real password validation
+        if (password1.length > 1 && Arrays.equals(password1, password2)) {
+            // password OK
+            Arrays.fill(password2, ' ');
+            return password1;
+        } else {
+            System.out.println("Passwords don't match");
+            return null;
+        }
     }
 
     /**
-     * Create the administrator with the given details.  If the user
+     * Create the administrator with the given details. If the user
      * already exists then they are simply upped to administrator status
      *
      * @param email    the email for the user
@@ -213,8 +247,8 @@ public final class CreateAdministrator {
      * @throws Exception if error
      */
     protected void createAdministrator(String email, String first, String last,
-                                       String language, String pw)
-        throws Exception {
+            String language, String pw)
+            throws Exception {
         // Of course we aren't an administrator yet so we need to
         // circumvent authorisation
         context.turnOffAuthorisationSystem();
diff --git a/dspace-api/src/main/java/org/dspace/administer/MetadataImporter.java b/dspace-api/src/main/java/org/dspace/administer/MetadataImporter.java
index 42461d7210..2677cb2050 100644
--- a/dspace-api/src/main/java/org/dspace/administer/MetadataImporter.java
+++ b/dspace-api/src/main/java/org/dspace/administer/MetadataImporter.java
@@ -11,13 +11,16 @@ import java.io.IOException;
 import java.sql.SQLException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.xpath.XPathAPI;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataSchema;
@@ -90,7 +93,7 @@ public class MetadataImporter {
     public static void main(String[] args)
         throws ParseException, SQLException, IOException, TransformerException,
         ParserConfigurationException, AuthorizeException, SAXException,
-        NonUniqueMetadataException, RegistryImportException {
+        NonUniqueMetadataException, RegistryImportException, XPathExpressionException {
 
         // create an options object and populate it
         CommandLineParser parser = new DefaultParser();
@@ -124,8 +127,8 @@ public class MetadataImporter {
      * @throws RegistryImportException      if import fails
      */
     public static void loadRegistry(String file, boolean forceUpdate)
-        throws SQLException, IOException, TransformerException, ParserConfigurationException,
-        AuthorizeException, SAXException, NonUniqueMetadataException, RegistryImportException {
+        throws SQLException, IOException, TransformerException, ParserConfigurationException, AuthorizeException,
+        SAXException, NonUniqueMetadataException, RegistryImportException, XPathExpressionException {
         Context context = null;
 
         try {
@@ -137,7 +140,9 @@ public class MetadataImporter {
             Document document = RegistryImporter.loadXML(file);
 
             // Get the nodes corresponding to types
-            NodeList schemaNodes = XPathAPI.selectNodeList(document, "/dspace-dc-types/dc-schema");
+            XPath xPath = XPathFactory.newInstance().newXPath();
+            NodeList schemaNodes = (NodeList) xPath.compile("/dspace-dc-types/dc-schema")
+                                                   .evaluate(document, XPathConstants.NODESET);
 
             // Add each one as a new format to the registry
             for (int i = 0; i < schemaNodes.getLength(); i++) {
@@ -146,7 +151,8 @@ public class MetadataImporter {
             }
 
             // Get the nodes corresponding to types
-            NodeList typeNodes = XPathAPI.selectNodeList(document, "/dspace-dc-types/dc-type");
+            NodeList typeNodes = (NodeList) xPath.compile("/dspace-dc-types/dc-type")
+                                                 .evaluate(document, XPathConstants.NODESET);
 
             // Add each one as a new format to the registry
             for (int i = 0; i < typeNodes.getLength(); i++) {
@@ -178,8 +184,8 @@ public class MetadataImporter {
      * @throws RegistryImportException    if import fails
      */
     private static void loadSchema(Context context, Node node, boolean updateExisting)
-        throws SQLException, IOException, TransformerException,
-        AuthorizeException, NonUniqueMetadataException, RegistryImportException {
+        throws SQLException, AuthorizeException, NonUniqueMetadataException, RegistryImportException,
+        XPathExpressionException {
         // Get the values
         String name = RegistryImporter.getElementData(node, "name");
         String namespace = RegistryImporter.getElementData(node, "namespace");
@@ -236,8 +242,8 @@ public class MetadataImporter {
      * @throws RegistryImportException    if import fails
      */
     private static void loadType(Context context, Node node)
-        throws SQLException, IOException, TransformerException,
-        AuthorizeException, NonUniqueMetadataException, RegistryImportException {
+        throws SQLException, IOException, AuthorizeException, NonUniqueMetadataException, RegistryImportException,
+        XPathExpressionException {
         // Get the values
         String schema = RegistryImporter.getElementData(node, "schema");
         String element = RegistryImporter.getElementData(node, "element");
diff --git a/dspace-api/src/main/java/org/dspace/administer/ProcessCleaner.java b/dspace-api/src/main/java/org/dspace/administer/ProcessCleaner.java
new file mode 100644
index 0000000000..ee6b8d08b0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/administer/ProcessCleaner.java
@@ -0,0 +1,140 @@
+/**
+ * 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/
+ */
+package org.dspace.administer;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang.time.DateUtils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.ProcessStatus;
+import org.dspace.core.Context;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.scripts.Process;
+import org.dspace.scripts.factory.ScriptServiceFactory;
+import org.dspace.scripts.service.ProcessService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
+
+/**
+ * Script to cleanup the old processes in the specified state.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class ProcessCleaner extends DSpaceRunnable<ProcessCleanerConfiguration<ProcessCleaner>> {
+
+    private ConfigurationService configurationService;
+
+    private ProcessService processService;
+
+
+    private boolean cleanCompleted = false;
+
+    private boolean cleanFailed = false;
+
+    private boolean cleanRunning = false;
+
+    private boolean help = false;
+
+    private Integer days;
+
+
+    @Override
+    public void setup() throws ParseException {
+
+        this.configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        this.processService = ScriptServiceFactory.getInstance().getProcessService();
+
+        this.help = commandLine.hasOption('h');
+        this.cleanFailed = commandLine.hasOption('f');
+        this.cleanRunning = commandLine.hasOption('r');
+        this.cleanCompleted = commandLine.hasOption('c') || (!cleanFailed && !cleanRunning);
+
+        this.days = configurationService.getIntProperty("process-cleaner.days", 14);
+
+        if (this.days <= 0) {
+            throw new IllegalStateException("The number of days must be a positive integer.");
+        }
+
+    }
+
+    @Override
+    public void internalRun() throws Exception {
+
+        if (help) {
+            printHelp();
+            return;
+        }
+
+        Context context = new Context();
+
+        try {
+            context.turnOffAuthorisationSystem();
+            performDeletion(context);
+        } finally {
+            context.restoreAuthSystemState();
+            context.complete();
+        }
+
+    }
+
+    /**
+     * Delete the processes based on the specified statuses and the configured days
+     * from their creation.
+     */
+    private void performDeletion(Context context) throws SQLException, IOException, AuthorizeException {
+
+        List<ProcessStatus> statuses = getProcessToDeleteStatuses();
+        Date creationDate = calculateCreationDate();
+
+        handler.logInfo("Searching for processes with status: " + statuses);
+        List<Process> processes = processService.findByStatusAndCreationTimeOlderThan(context, statuses, creationDate);
+        handler.logInfo("Found " + processes.size() + " processes to be deleted");
+        for (Process process : processes) {
+            processService.delete(context, process);
+        }
+
+        handler.logInfo("Process cleanup completed");
+
+    }
+
+    /**
+     * Returns the list of Process statuses do be deleted.
+     */
+    private List<ProcessStatus> getProcessToDeleteStatuses() {
+        List<ProcessStatus> statuses = new ArrayList<ProcessStatus>();
+        if (cleanCompleted) {
+            statuses.add(ProcessStatus.COMPLETED);
+        }
+        if (cleanFailed) {
+            statuses.add(ProcessStatus.FAILED);
+        }
+        if (cleanRunning) {
+            statuses.add(ProcessStatus.RUNNING);
+        }
+        return statuses;
+    }
+
+    private Date calculateCreationDate() {
+        return DateUtils.addDays(new Date(), -days);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public ProcessCleanerConfiguration<ProcessCleaner> getScriptConfiguration() {
+        return new DSpace().getServiceManager()
+            .getServiceByName("process-cleaner", ProcessCleanerConfiguration.class);
+    }
+
+}
diff --git a/dspace-services/src/main/java/org/dspace/services/caching/model/package-info.java b/dspace-api/src/main/java/org/dspace/administer/ProcessCleanerCli.java
similarity index 53%
rename from dspace-services/src/main/java/org/dspace/services/caching/model/package-info.java
rename to dspace-api/src/main/java/org/dspace/administer/ProcessCleanerCli.java
index 67e1ee1ffc..292c6c372e 100644
--- a/dspace-services/src/main/java/org/dspace/services/caching/model/package-info.java
+++ b/dspace-api/src/main/java/org/dspace/administer/ProcessCleanerCli.java
@@ -5,9 +5,14 @@
  *
  * http://www.dspace.org/license/
  */
+package org.dspace.administer;
 
 /**
- * Implementations of the Cache type, for various purposes.
+ * The {@link ProcessCleaner} for CLI.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
  */
+public class ProcessCleanerCli extends ProcessCleaner {
 
-package org.dspace.services.caching.model;
+}
diff --git a/dspace-api/src/main/java/org/dspace/administer/ProcessCleanerCliConfiguration.java b/dspace-api/src/main/java/org/dspace/administer/ProcessCleanerCliConfiguration.java
new file mode 100644
index 0000000000..043990156d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/administer/ProcessCleanerCliConfiguration.java
@@ -0,0 +1,18 @@
+/**
+ * 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/
+ */
+package org.dspace.administer;
+
+/**
+ * The {@link ProcessCleanerConfiguration} for CLI.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class ProcessCleanerCliConfiguration extends ProcessCleanerConfiguration<ProcessCleanerCli> {
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/administer/ProcessCleanerConfiguration.java b/dspace-api/src/main/java/org/dspace/administer/ProcessCleanerConfiguration.java
new file mode 100644
index 0000000000..8d189038d9
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/administer/ProcessCleanerConfiguration.java
@@ -0,0 +1,70 @@
+/**
+ * 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/
+ */
+package org.dspace.administer;
+
+import java.sql.SQLException;
+
+import org.apache.commons.cli.Options;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.core.Context;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * The {@link ScriptConfiguration} for the {@link ProcessCleaner} script.
+ */
+public class ProcessCleanerConfiguration<T extends ProcessCleaner> extends ScriptConfiguration<T> {
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    private Class<T> dspaceRunnableClass;
+
+    @Override
+    public boolean isAllowedToExecute(Context context) {
+        try {
+            return authorizeService.isAdmin(context);
+        } catch (SQLException e) {
+            throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
+        }
+    }
+
+    @Override
+    public Options getOptions() {
+        if (options == null) {
+
+            Options options = new Options();
+
+            options.addOption("h", "help", false, "help");
+
+            options.addOption("r", "running", false, "delete the process with RUNNING status");
+            options.getOption("r").setType(boolean.class);
+
+            options.addOption("f", "failed", false, "delete the process with FAILED status");
+            options.getOption("f").setType(boolean.class);
+
+            options.addOption("c", "completed", false,
+                "delete the process with COMPLETED status (default if no statuses are specified)");
+            options.getOption("c").setType(boolean.class);
+
+            super.options = options;
+        }
+        return options;
+    }
+
+    @Override
+    public Class<T> getDspaceRunnableClass() {
+        return dspaceRunnableClass;
+    }
+
+    @Override
+    public void setDspaceRunnableClass(Class<T> dspaceRunnableClass) {
+        this.dspaceRunnableClass = dspaceRunnableClass;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/administer/RegistryImporter.java b/dspace-api/src/main/java/org/dspace/administer/RegistryImporter.java
index 5b5f70412a..27a6534213 100644
--- a/dspace-api/src/main/java/org/dspace/administer/RegistryImporter.java
+++ b/dspace-api/src/main/java/org/dspace/administer/RegistryImporter.java
@@ -13,8 +13,11 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
-import org.apache.xpath.XPathAPI;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -72,9 +75,10 @@ public class RegistryImporter {
      * @throws TransformerException if error
      */
     public static String getElementData(Node parentElement, String childName)
-        throws TransformerException {
+        throws XPathExpressionException {
         // Grab the child node
-        Node childNode = XPathAPI.selectSingleNode(parentElement, childName);
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        Node childNode = (Node) xPath.compile(childName).evaluate(parentElement, XPathConstants.NODE);
 
         if (childNode == null) {
             // No child node, so no values
@@ -115,9 +119,10 @@ public class RegistryImporter {
      * @throws TransformerException if error
      */
     public static String[] getRepeatedElementData(Node parentElement,
-                                                  String childName) throws TransformerException {
+                                                  String childName) throws XPathExpressionException {
         // Grab the child node
-        NodeList childNodes = XPathAPI.selectNodeList(parentElement, childName);
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        NodeList childNodes = (NodeList) xPath.compile(childName).evaluate(parentElement, XPathConstants.NODESET);
 
         String[] data = new String[childNodes.getLength()];
 
diff --git a/dspace-api/src/main/java/org/dspace/administer/RegistryLoader.java b/dspace-api/src/main/java/org/dspace/administer/RegistryLoader.java
index 2b6a01b558..bbf320a0d5 100644
--- a/dspace-api/src/main/java/org/dspace/administer/RegistryLoader.java
+++ b/dspace-api/src/main/java/org/dspace/administer/RegistryLoader.java
@@ -16,9 +16,12 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.logging.log4j.Logger;
-import org.apache.xpath.XPathAPI;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.BitstreamFormat;
 import org.dspace.content.factory.ContentServiceFactory;
@@ -122,12 +125,13 @@ public class RegistryLoader {
      */
     public static void loadBitstreamFormats(Context context, String filename)
         throws SQLException, IOException, ParserConfigurationException,
-        SAXException, TransformerException, AuthorizeException {
+        SAXException, TransformerException, AuthorizeException, XPathExpressionException {
         Document document = loadXML(filename);
 
         // Get the nodes corresponding to formats
-        NodeList typeNodes = XPathAPI.selectNodeList(document,
-                                                     "dspace-bitstream-types/bitstream-type");
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        NodeList typeNodes = (NodeList) xPath.compile("dspace-bitstream-types/bitstream-type")
+                                             .evaluate(document, XPathConstants.NODESET);
 
         // Add each one as a new format to the registry
         for (int i = 0; i < typeNodes.getLength(); i++) {
@@ -151,8 +155,7 @@ public class RegistryLoader {
      * @throws AuthorizeException   if authorization error
      */
     private static void loadFormat(Context context, Node node)
-        throws SQLException, IOException, TransformerException,
-        AuthorizeException {
+        throws SQLException, AuthorizeException, XPathExpressionException {
         // Get the values
         String mimeType = getElementData(node, "mimetype");
         String shortDesc = getElementData(node, "short_description");
@@ -231,9 +234,10 @@ public class RegistryLoader {
      * @throws TransformerException if transformer error
      */
     private static String getElementData(Node parentElement, String childName)
-        throws TransformerException {
+        throws XPathExpressionException {
         // Grab the child node
-        Node childNode = XPathAPI.selectSingleNode(parentElement, childName);
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        Node childNode = (Node) xPath.compile(childName).evaluate(parentElement, XPathConstants.NODE);
 
         if (childNode == null) {
             // No child node, so no values
@@ -274,9 +278,10 @@ public class RegistryLoader {
      * @throws TransformerException if transformer error
      */
     private static String[] getRepeatedElementData(Node parentElement,
-                                                   String childName) throws TransformerException {
+                                                   String childName) throws XPathExpressionException {
         // Grab the child node
-        NodeList childNodes = XPathAPI.selectNodeList(parentElement, childName);
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        NodeList childNodes = (NodeList) xPath.compile(childName).evaluate(parentElement, XPathConstants.NODESET);
 
         String[] data = new String[childNodes.getLength()];
 
diff --git a/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java b/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java
index 89d9ffe5a8..13a1b3b5bb 100644
--- a/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java
+++ b/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java
@@ -30,6 +30,10 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -38,7 +42,7 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.xpath.XPathAPI;
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
@@ -52,9 +56,11 @@ import org.dspace.content.service.CommunityService;
 import org.dspace.core.Context;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
-import org.jdom.Element;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.dspace.handle.factory.HandleServiceFactory;
+import org.dspace.handle.service.HandleService;
+import org.jdom2.Element;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -76,6 +82,7 @@ import org.xml.sax.SAXException;
  *   </community>
  * </import_structure>
  * }</pre>
+ *
  * <p>
  * It can be arbitrarily deep, and supports all the metadata elements
  * that make up the community and collection metadata.  See the system
@@ -104,12 +111,14 @@ public class StructBuilder {
      */
     private static final Map<String, MetadataFieldName> communityMap = new HashMap<>();
 
-    protected static CommunityService communityService
+    protected static final CommunityService communityService
             = ContentServiceFactory.getInstance().getCommunityService();
-    protected static CollectionService collectionService
+    protected static final CollectionService collectionService
             = ContentServiceFactory.getInstance().getCollectionService();
-    protected static EPersonService ePersonService
+    protected static final EPersonService ePersonService
             = EPersonServiceFactory.getInstance().getEPersonService();
+    protected static final HandleService handleService
+            = HandleServiceFactory.getInstance().getHandleService();
 
     /**
      * Default constructor
@@ -135,16 +144,18 @@ public class StructBuilder {
      * @throws SQLException passed through.
      * @throws FileNotFoundException if input or output could not be opened.
      * @throws TransformerException if the input document is invalid.
+     * @throws XPathExpressionException passed through.
      */
     public static void main(String[] argv)
-            throws ParserConfigurationException, SQLException,
-            FileNotFoundException, IOException, TransformerException {
+        throws ParserConfigurationException, SQLException,
+        IOException, TransformerException, XPathExpressionException {
         // Define command line options.
         Options options = new Options();
 
         options.addOption("h", "help", false, "Print this help message.");
         options.addOption("?", "help");
         options.addOption("x", "export", false, "Export the current structure as XML.");
+        options.addOption("k", "keep-handles", false, "Apply Handles from input document.");
 
         options.addOption(Option.builder("e").longOpt("eperson")
                 .desc("User who is manipulating the repository's structure.")
@@ -206,6 +217,7 @@ public class StructBuilder {
         // Export? Import?
         if (line.hasOption('x')) { // export
             exportStructure(context, outputStream);
+            outputStream.close();
         } else { // Must be import
             String input = line.getOptionValue('f');
             if (null == input) {
@@ -220,7 +232,12 @@ public class StructBuilder {
                 inputStream = new FileInputStream(input);
             }
 
-            importStructure(context, inputStream, outputStream);
+            boolean keepHandles = options.hasOption("k");
+            importStructure(context, inputStream, outputStream, keepHandles);
+
+            inputStream.close();
+            outputStream.close();
+
             // save changes from import
             context.complete();
         }
@@ -233,14 +250,17 @@ public class StructBuilder {
      * @param context
      * @param input XML which describes the new communities and collections.
      * @param output input, annotated with the new objects' identifiers.
+     * @param keepHandles true if Handles should be set from input.
      * @throws IOException
      * @throws ParserConfigurationException
      * @throws SAXException
      * @throws TransformerException
      * @throws SQLException
      */
-    static void importStructure(Context context, InputStream input, OutputStream output)
-            throws IOException, ParserConfigurationException, SQLException, TransformerException {
+    static void importStructure(Context context, InputStream input,
+            OutputStream output, boolean keepHandles)
+            throws IOException, ParserConfigurationException, SQLException,
+            TransformerException, XPathExpressionException {
 
         // load the XML
         Document document = null;
@@ -258,15 +278,29 @@ public class StructBuilder {
         // is properly structured.
         try {
             validate(document);
-        } catch (TransformerException ex) {
+        } catch (XPathExpressionException ex) {
             System.err.format("The input document is invalid:  %s%n", ex.getMessage());
             System.exit(1);
         }
 
         // Check for 'identifier' attributes -- possibly output by this class.
-        NodeList identifierNodes = XPathAPI.selectNodeList(document, "//*[@identifier]");
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        NodeList identifierNodes = (NodeList) xPath.compile("//*[@identifier]")
+                                                   .evaluate(document, XPathConstants.NODESET);
         if (identifierNodes.getLength() > 0) {
-            System.err.println("The input document has 'identifier' attributes, which will be ignored.");
+            if (!keepHandles) {
+                System.err.println("The input document has 'identifier' attributes, which will be ignored.");
+            } else {
+                for (int i = 0; i < identifierNodes.getLength() ; i++) {
+                    String identifier = identifierNodes.item(i).getAttributes().item(0).getTextContent();
+                    if (handleService.resolveToURL(context, identifier) != null) {
+                        System.err.printf("The input document contains handle %s,"
+                                + " which is in use already. Aborting...%n",
+                                identifier);
+                        System.exit(1);
+                    }
+                }
+            }
         }
 
         // load the mappings into the member variable hashmaps
@@ -287,10 +321,11 @@ public class StructBuilder {
         Element[] elements = new Element[]{};
         try {
             // get the top level community list
-            NodeList first = XPathAPI.selectNodeList(document, "/import_structure/community");
+            NodeList first = (NodeList) xPath.compile("/import_structure/community")
+                                             .evaluate(document, XPathConstants.NODESET);
 
             // run the import starting with the top level communities
-            elements = handleCommunities(context, first, null);
+            elements = handleCommunities(context, first, null, keepHandles);
         } catch (TransformerException ex) {
             System.err.format("Input content not understood:  %s%n", ex.getMessage());
             System.exit(1);
@@ -307,7 +342,7 @@ public class StructBuilder {
         }
 
         // finally write the string into the output file.
-        final org.jdom.Document xmlOutput = new org.jdom.Document(root);
+        final org.jdom2.Document xmlOutput = new org.jdom2.Document(root);
         try {
             new XMLOutputter().output(xmlOutput, output);
         } catch (IOException e) {
@@ -411,7 +446,7 @@ public class StructBuilder {
         }
 
         // Now write the structure out.
-        org.jdom.Document xmlOutput = new org.jdom.Document(rootElement);
+        org.jdom2.Document xmlOutput = new org.jdom2.Document(rootElement);
         try {
             XMLOutputter outputter = new XMLOutputter(Format.getPrettyFormat());
             outputter.output(xmlOutput, output);
@@ -456,14 +491,16 @@ public class StructBuilder {
      * @throws TransformerException if transformer error
      */
     private static void validate(org.w3c.dom.Document document)
-        throws TransformerException {
+        throws XPathExpressionException {
         StringBuilder err = new StringBuilder();
         boolean trip = false;
 
         err.append("The following errors were encountered parsing the source XML.\n");
         err.append("No changes have been made to the DSpace instance.\n\n");
 
-        NodeList first = XPathAPI.selectNodeList(document, "/import_structure/community");
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        NodeList first = (NodeList) xPath.compile("/import_structure/community")
+                                         .evaluate(document, XPathConstants.NODESET);
         if (first.getLength() == 0) {
             err.append("-There are no top level communities in the source document.");
             System.out.println(err.toString());
@@ -493,14 +530,15 @@ public class StructBuilder {
      * no errors.
      */
     private static String validateCommunities(NodeList communities, int level)
-        throws TransformerException {
+        throws XPathExpressionException {
         StringBuilder err = new StringBuilder();
         boolean trip = false;
         String errs = null;
+        XPath xPath = XPathFactory.newInstance().newXPath();
 
         for (int i = 0; i < communities.getLength(); i++) {
             Node n = communities.item(i);
-            NodeList name = XPathAPI.selectNodeList(n, "name");
+            NodeList name = (NodeList) xPath.compile("name").evaluate(n, XPathConstants.NODESET);
             if (name.getLength() != 1) {
                 String pos = Integer.toString(i + 1);
                 err.append("-The level ").append(level)
@@ -510,7 +548,7 @@ public class StructBuilder {
             }
 
             // validate sub communities
-            NodeList subCommunities = XPathAPI.selectNodeList(n, "community");
+            NodeList subCommunities = (NodeList) xPath.compile("community").evaluate(n, XPathConstants.NODESET);
             String comErrs = validateCommunities(subCommunities, level + 1);
             if (comErrs != null) {
                 err.append(comErrs);
@@ -518,7 +556,7 @@ public class StructBuilder {
             }
 
             // validate collections
-            NodeList collections = XPathAPI.selectNodeList(n, "collection");
+            NodeList collections = (NodeList) xPath.compile("collection").evaluate(n, XPathConstants.NODESET);
             String colErrs = validateCollections(collections, level + 1);
             if (colErrs != null) {
                 err.append(colErrs);
@@ -542,14 +580,15 @@ public class StructBuilder {
      * @return the errors to be generated by the calling method, or null if none
      */
     private static String validateCollections(NodeList collections, int level)
-        throws TransformerException {
+        throws XPathExpressionException {
         StringBuilder err = new StringBuilder();
         boolean trip = false;
         String errs = null;
+        XPath xPath = XPathFactory.newInstance().newXPath();
 
         for (int i = 0; i < collections.getLength(); i++) {
             Node n = collections.item(i);
-            NodeList name = XPathAPI.selectNodeList(n, "name");
+            NodeList name = (NodeList) xPath.compile("name").evaluate(n, XPathConstants.NODESET);
             if (name.getLength() != 1) {
                 String pos = Integer.toString(i + 1);
                 err.append("-The level ").append(level)
@@ -609,22 +648,29 @@ public class StructBuilder {
      * @param context     the context of the request
      * @param communities a nodelist of communities to create along with their sub-structures
      * @param parent      the parent community of the nodelist of communities to create
+     * @param keepHandles use Handles from input.
      * @return an element array containing additional information regarding the
      * created communities (e.g. the handles they have been assigned)
      */
-    private static Element[] handleCommunities(Context context, NodeList communities, Community parent)
-        throws TransformerException, SQLException, AuthorizeException {
+    private static Element[] handleCommunities(Context context, NodeList communities,
+            Community parent, boolean keepHandles)
+        throws TransformerException, SQLException, AuthorizeException,
+            XPathExpressionException {
         Element[] elements = new Element[communities.getLength()];
+        XPath xPath = XPathFactory.newInstance().newXPath();
 
         for (int i = 0; i < communities.getLength(); i++) {
-            Community community;
-            Element element = new Element("community");
+            Node tn = communities.item(i);
+            Node identifier = tn.getAttributes().getNamedItem("identifier");
 
             // create the community or sub community
-            if (parent != null) {
+            Community community;
+            if (null == identifier
+                    || StringUtils.isBlank(identifier.getNodeValue())
+                    || !keepHandles) {
                 community = communityService.create(parent, context);
             } else {
-                community = communityService.create(null, context);
+                community = communityService.create(parent, context, identifier.getNodeValue());
             }
 
             // default the short description to be an empty string
@@ -632,9 +678,8 @@ public class StructBuilder {
                     MD_SHORT_DESCRIPTION, null, " ");
 
             // now update the metadata
-            Node tn = communities.item(i);
             for (Map.Entry<String, MetadataFieldName> entry : communityMap.entrySet()) {
-                NodeList nl = XPathAPI.selectNodeList(tn, entry.getKey());
+                NodeList nl = (NodeList) xPath.compile(entry.getKey()).evaluate(tn, XPathConstants.NODESET);
                 if (nl.getLength() == 1) {
                     communityService.setMetadataSingleValue(context, community,
                             entry.getValue(), null, getStringValue(nl.item(0)));
@@ -658,6 +703,7 @@ public class StructBuilder {
             // but it's here to keep it separate from the create process in
             // case
             // we want to move it or make it switchable later
+            Element element = new Element("community");
             element.setAttribute("identifier", community.getHandle());
 
             Element nameElement = new Element("name");
@@ -700,12 +746,16 @@ public class StructBuilder {
             }
 
             // handle sub communities
-            NodeList subCommunities = XPathAPI.selectNodeList(tn, "community");
-            Element[] subCommunityElements = handleCommunities(context, subCommunities, community);
+            NodeList subCommunities = (NodeList) xPath.compile("community")
+                    .evaluate(tn, XPathConstants.NODESET);
+            Element[] subCommunityElements = handleCommunities(context,
+                    subCommunities, community, keepHandles);
 
             // handle collections
-            NodeList collections = XPathAPI.selectNodeList(tn, "collection");
-            Element[] collectionElements = handleCollections(context, collections, community);
+            NodeList collections = (NodeList) xPath.compile("collection")
+                    .evaluate(tn, XPathConstants.NODESET);
+            Element[] collectionElements = handleCollections(context,
+                    collections, community, keepHandles);
 
             int j;
             for (j = 0; j < subCommunityElements.length; j++) {
@@ -730,22 +780,33 @@ public class StructBuilder {
      * @return an Element array containing additional information about the
      * created collections (e.g. the handle)
      */
-    private static Element[] handleCollections(Context context, NodeList collections, Community parent)
-        throws TransformerException, SQLException, AuthorizeException {
+    private static Element[] handleCollections(Context context,
+            NodeList collections, Community parent, boolean keepHandles)
+        throws SQLException, AuthorizeException, XPathExpressionException {
         Element[] elements = new Element[collections.getLength()];
+        XPath xPath = XPathFactory.newInstance().newXPath();
 
         for (int i = 0; i < collections.getLength(); i++) {
-            Element element = new Element("collection");
-            Collection collection = collectionService.create(context, parent);
+            Node tn = collections.item(i);
+            Node identifier = tn.getAttributes().getNamedItem("identifier");
+
+            // Create the Collection.
+            Collection collection;
+            if (null == identifier
+                    || StringUtils.isBlank(identifier.getNodeValue())
+                    || !keepHandles) {
+                collection = collectionService.create(context, parent);
+            } else {
+                collection = collectionService.create(context, parent, identifier.getNodeValue());
+            }
 
             // default the short description to the empty string
             collectionService.setMetadataSingleValue(context, collection,
                     MD_SHORT_DESCRIPTION, Item.ANY, " ");
 
             // import the rest of the metadata
-            Node tn = collections.item(i);
             for (Map.Entry<String, MetadataFieldName> entry : collectionMap.entrySet()) {
-                NodeList nl = XPathAPI.selectNodeList(tn, entry.getKey());
+                NodeList nl = (NodeList) xPath.compile(entry.getKey()).evaluate(tn, XPathConstants.NODESET);
                 if (nl.getLength() == 1) {
                     collectionService.setMetadataSingleValue(context, collection,
                             entry.getValue(), null, getStringValue(nl.item(0)));
@@ -754,6 +815,7 @@ public class StructBuilder {
 
             collectionService.update(context, collection);
 
+            Element element = new Element("collection");
             element.setAttribute("identifier", collection.getHandle());
 
             Element nameElement = new Element("name");
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataDeletionScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataDeletionScriptConfiguration.java
index b8d41318db..9ccd53944a 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataDeletionScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataDeletionScriptConfiguration.java
@@ -41,10 +41,8 @@ public class MetadataDeletionScriptConfiguration<T extends MetadataDeletion> ext
             Options options = new Options();
 
             options.addOption("m", "metadata", true, "metadata field name");
-            options.getOption("m").setType(String.class);
 
             options.addOption("l", "list", false, "lists the metadata fields that can be deleted");
-            options.getOption("l").setType(boolean.class);
 
             super.options = options;
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportScriptConfiguration.java
index 0c513c4667..31556afc8d 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportScriptConfiguration.java
@@ -54,12 +54,9 @@ public class MetadataExportScriptConfiguration<T extends MetadataExport> extends
             Options options = new Options();
 
             options.addOption("i", "id", true, "ID or handle of thing to export (item, collection, or community)");
-            options.getOption("i").setType(String.class);
             options.addOption("a", "all", false,
                               "include all metadata fields that are not normally changed (e.g. provenance)");
-            options.getOption("a").setType(boolean.class);
             options.addOption("h", "help", false, "help");
-            options.getOption("h").setType(boolean.class);
 
 
             super.options = options;
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearch.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearch.java
new file mode 100644
index 0000000000..027ad116a7
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearch.java
@@ -0,0 +1,170 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.bulkedit;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.cli.ParseException;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataDSpaceCsvExportServiceImpl;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.CommunityService;
+import org.dspace.content.service.MetadataDSpaceCsvExportService;
+import org.dspace.core.Context;
+import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.SearchService;
+import org.dspace.discovery.SearchUtils;
+import org.dspace.discovery.configuration.DiscoveryConfiguration;
+import org.dspace.discovery.configuration.DiscoveryConfigurationService;
+import org.dspace.discovery.indexobject.IndexableCollection;
+import org.dspace.discovery.indexobject.IndexableCommunity;
+import org.dspace.discovery.utils.DiscoverQueryBuilder;
+import org.dspace.discovery.utils.parameter.QueryBuilderSearchFilter;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.sort.SortOption;
+import org.dspace.utils.DSpace;
+
+/**
+ * Metadata exporter to allow the batch export of metadata from a discovery search into a file
+ *
+ */
+public class MetadataExportSearch extends DSpaceRunnable<MetadataExportSearchScriptConfiguration> {
+    private static final String EXPORT_CSV = "exportCSV";
+    private boolean help = false;
+    private String identifier;
+    private String discoveryConfigName;
+    private String[] filterQueryStrings;
+    private boolean hasScope = false;
+    private String query;
+
+    private SearchService searchService;
+    private MetadataDSpaceCsvExportService metadataDSpaceCsvExportService;
+    private EPersonService ePersonService;
+    private DiscoveryConfigurationService discoveryConfigurationService;
+    private CommunityService communityService;
+    private CollectionService collectionService;
+    private DiscoverQueryBuilder queryBuilder;
+
+    @Override
+    public MetadataExportSearchScriptConfiguration getScriptConfiguration() {
+        return new DSpace().getServiceManager()
+            .getServiceByName("metadata-export-search", MetadataExportSearchScriptConfiguration.class);
+    }
+
+    @Override
+    public void setup() throws ParseException {
+        searchService = SearchUtils.getSearchService();
+        metadataDSpaceCsvExportService = new DSpace().getServiceManager()
+                                                     .getServiceByName(
+                                                         MetadataDSpaceCsvExportServiceImpl.class.getCanonicalName(),
+                                                         MetadataDSpaceCsvExportService.class
+                                                     );
+        ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+        discoveryConfigurationService = SearchUtils.getConfigurationService();
+        communityService = ContentServiceFactory.getInstance().getCommunityService();
+        collectionService = ContentServiceFactory.getInstance().getCollectionService();
+        queryBuilder = SearchUtils.getQueryBuilder();
+
+        if (commandLine.hasOption('h')) {
+            help = true;
+            return;
+        }
+
+        if (commandLine.hasOption('q')) {
+            query = commandLine.getOptionValue('q');
+        }
+
+        if (commandLine.hasOption('s')) {
+            hasScope = true;
+            identifier = commandLine.getOptionValue('s');
+        }
+
+        if (commandLine.hasOption('c')) {
+            discoveryConfigName = commandLine.getOptionValue('c');
+        }
+
+        if (commandLine.hasOption('f')) {
+            filterQueryStrings = commandLine.getOptionValues('f');
+        }
+    }
+
+    @Override
+    public void internalRun() throws Exception {
+        if (help) {
+            loghelpinfo();
+            printHelp();
+            return;
+        }
+        handler.logDebug("starting search export");
+
+        IndexableObject dso = null;
+        Context context = new Context();
+        context.setCurrentUser(ePersonService.find(context, this.getEpersonIdentifier()));
+
+        if (hasScope) {
+            dso = resolveScope(context, identifier);
+        }
+
+        DiscoveryConfiguration discoveryConfiguration =
+            discoveryConfigurationService.getDiscoveryConfiguration(discoveryConfigName);
+
+        List<QueryBuilderSearchFilter> queryBuilderSearchFilters = new ArrayList<>();
+
+        handler.logDebug("processing filter queries");
+        if (filterQueryStrings != null) {
+            for (String filterQueryString: filterQueryStrings) {
+                String field = filterQueryString.split(",", 2)[0];
+                String operator = filterQueryString.split("(,|=)", 3)[1];
+                String value = filterQueryString.split("=", 2)[1];
+                QueryBuilderSearchFilter queryBuilderSearchFilter =
+                    new QueryBuilderSearchFilter(field, operator, value);
+                queryBuilderSearchFilters.add(queryBuilderSearchFilter);
+            }
+        }
+        handler.logDebug("building query");
+        DiscoverQuery discoverQuery =
+            queryBuilder.buildQuery(context, dso, discoveryConfiguration, query, queryBuilderSearchFilters,
+            "Item", 10, Long.getLong("0"), null, SortOption.DESCENDING);
+        handler.logDebug("creating iterator");
+
+        Iterator<Item> itemIterator = searchService.iteratorSearch(context, dso, discoverQuery);
+        handler.logDebug("creating dspacecsv");
+        DSpaceCSV dSpaceCSV = metadataDSpaceCsvExportService.export(context, itemIterator, true);
+        handler.logDebug("writing to file " + getFileNameOrExportFile());
+        handler.writeFilestream(context, getFileNameOrExportFile(), dSpaceCSV.getInputStream(), EXPORT_CSV);
+        context.restoreAuthSystemState();
+        context.complete();
+
+    }
+
+    protected void loghelpinfo() {
+        handler.logInfo("metadata-export");
+    }
+
+    protected String getFileNameOrExportFile() {
+        return "metadataExportSearch.csv";
+    }
+
+    public IndexableObject resolveScope(Context context, String id) throws SQLException {
+        UUID uuid = UUID.fromString(id);
+        IndexableObject scopeObj = new IndexableCommunity(communityService.find(context, uuid));
+        if (scopeObj.getIndexedObject() == null) {
+            scopeObj = new IndexableCollection(collectionService.find(context, uuid));
+        }
+        return scopeObj;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchCli.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchCli.java
new file mode 100644
index 0000000000..51ca77cbfb
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchCli.java
@@ -0,0 +1,20 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.bulkedit;
+
+/**
+ * The cli version of the {@link MetadataExportSearch} script
+ */
+public class MetadataExportSearchCli extends MetadataExportSearch {
+
+    @Override
+    protected String getFileNameOrExportFile() {
+        return commandLine.getOptionValue('n');
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchCliScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchCliScriptConfiguration.java
new file mode 100644
index 0000000000..c0343f545a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchCliScriptConfiguration.java
@@ -0,0 +1,26 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.bulkedit;
+
+import org.apache.commons.cli.Options;
+
+/**
+ * This is the CLI version of the {@link MetadataExportSearchScriptConfiguration} class that handles the
+ * configuration for the {@link MetadataExportSearchCli} script
+ */
+public class MetadataExportSearchCliScriptConfiguration
+    extends MetadataExportSearchScriptConfiguration<MetadataExportSearchCli> {
+
+    @Override
+    public Options getOptions() {
+        Options options = super.getOptions();
+        options.addOption("n", "filename", true, "the filename to export to");
+        return super.getOptions();
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchScriptConfiguration.java
new file mode 100644
index 0000000000..4e350562bc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportSearchScriptConfiguration.java
@@ -0,0 +1,62 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.bulkedit;
+
+import org.apache.commons.cli.Options;
+import org.dspace.core.Context;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+
+/**
+ * The {@link ScriptConfiguration} for the {@link MetadataExportSearch} script
+ */
+public class MetadataExportSearchScriptConfiguration<T extends MetadataExportSearch> extends ScriptConfiguration<T> {
+
+    private Class<T> dspaceRunnableclass;
+
+    @Override
+    public Class<T> getDspaceRunnableClass() {
+        return dspaceRunnableclass;
+    }
+
+    @Override
+    public void setDspaceRunnableClass(Class<T> dspaceRunnableClass) {
+        this.dspaceRunnableclass = dspaceRunnableClass;
+    }
+
+    @Override
+    public boolean isAllowedToExecute(Context context) {
+        return true;
+    }
+
+    @Override
+    public Options getOptions() {
+        if (options == null) {
+            Options options = new Options();
+            options.addOption("q", "query", true,
+                "The discovery search string to will be used to match records. Not URL encoded");
+            options.getOption("q").setType(String.class);
+            options.addOption("s", "scope", true,
+                "UUID of a specific DSpace container (site, community or collection) to which the search has to be " +
+                    "limited");
+            options.getOption("s").setType(String.class);
+            options.addOption("c", "configuration", true,
+                "The name of a Discovery configuration that should be used by this search");
+            options.getOption("c").setType(String.class);
+            options.addOption("f", "filter", true,
+                "Advanced search filter that has to be used to filter the result set, with syntax `<:filter-name>," +
+                    "<:filter-operator>=<:filter-value>`. Not URL encoded. For example `author," +
+                    "authority=5df05073-3be7-410d-8166-e254369e4166` or `title,contains=sample text`");
+            options.getOption("f").setType(String.class);
+            options.addOption("h", "help", false, "help");
+
+            super.options =  options;
+        }
+        return options;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
index 469245908a..4161bbb4d8 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
@@ -598,18 +598,19 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
                 changes.add(whatHasChanged);
             }
 
-            if (change) {
-                //only clear cache if changes have been made.
-                c.uncacheEntity(wsItem);
-                c.uncacheEntity(wfItem);
-                c.uncacheEntity(item);
+            if (change && (rowCount % configurationService.getIntProperty("bulkedit.change.commit.count", 100) == 0)) {
+                c.commit();
+                handler.logInfo(LogHelper.getHeader(c, "metadata_import_commit", "lineNumber=" + rowCount));
             }
             populateRefAndRowMap(line, item == null ? null : item.getID());
             // keep track of current rows processed
             rowCount++;
         }
+        if (change) {
+            c.commit();
+        }
 
-        c.setMode(originalMode);
+        c.setMode(Context.Mode.READ_ONLY);
 
 
         // Return the changes
@@ -925,11 +926,10 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
             rightItem = item;
         }
 
-        // Create the relationship
-        int leftPlace = relationshipService.findNextLeftPlaceByLeftItem(c, leftItem);
-        int rightPlace = relationshipService.findNextRightPlaceByRightItem(c, rightItem);
-        Relationship persistedRelationship = relationshipService.create(c, leftItem, rightItem,
-                                                                        foundRelationshipType, leftPlace, rightPlace);
+        // Create the relationship, appending to the end
+        Relationship persistedRelationship = relationshipService.create(
+            c, leftItem, rightItem, foundRelationshipType, -1, -1
+        );
         relationshipService.update(c, persistedRelationship);
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportCliScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportCliScriptConfiguration.java
index 038df616ca..7e1537fe9d 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportCliScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportCliScriptConfiguration.java
@@ -19,7 +19,6 @@ public class MetadataImportCliScriptConfiguration extends MetadataImportScriptCo
     public Options getOptions() {
         Options options = super.getOptions();
         options.addOption("e", "email", true, "email address or user id of user (required if adding new items)");
-        options.getOption("e").setType(String.class);
         options.getOption("e").setRequired(true);
         super.options = options;
         return options;
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportScriptConfiguration.java
index 07e6a9aec9..65994040ba 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportScriptConfiguration.java
@@ -59,20 +59,14 @@ public class MetadataImportScriptConfiguration<T extends MetadataImport> extends
             options.getOption("f").setRequired(true);
             options.addOption("s", "silent", false,
                               "silent operation - doesn't request confirmation of changes USE WITH CAUTION");
-            options.getOption("s").setType(boolean.class);
             options.addOption("w", "workflow", false, "workflow - when adding new items, use collection workflow");
-            options.getOption("w").setType(boolean.class);
             options.addOption("n", "notify", false,
                               "notify - when adding new items using a workflow, send notification emails");
-            options.getOption("n").setType(boolean.class);
             options.addOption("v", "validate-only", false,
                               "validate - just validate the csv, don't run the import");
-            options.getOption("v").setType(boolean.class);
             options.addOption("t", "template", false,
                               "template - when adding new items, use the collection template (if it exists)");
-            options.getOption("t").setType(boolean.class);
             options.addOption("h", "help", false, "help");
-            options.getOption("h").setType(boolean.class);
 
             super.options = options;
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/exception/ResourceAlreadyExistsException.java b/dspace-api/src/main/java/org/dspace/app/exception/ResourceAlreadyExistsException.java
new file mode 100644
index 0000000000..8291af87fc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/exception/ResourceAlreadyExistsException.java
@@ -0,0 +1,32 @@
+/**
+ * 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/
+ */
+package org.dspace.app.exception;
+
+/**
+ * This class provides an exception to be used when trying to save a resource
+ * that already exists.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class ResourceAlreadyExistsException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Create a ResourceAlreadyExistsException with a message and the already
+     * existing resource.
+     *
+     * @param message  the error message
+     */
+    public ResourceAlreadyExistsException(String message) {
+        super(message);
+    }
+
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/harvest/HarvestScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/harvest/HarvestScriptConfiguration.java
index 6290562143..982973e47c 100644
--- a/dspace-api/src/main/java/org/dspace/app/harvest/HarvestScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/app/harvest/HarvestScriptConfiguration.java
@@ -43,22 +43,14 @@ public class HarvestScriptConfiguration<T extends Harvest> extends ScriptConfigu
     public Options getOptions() {
         Options options = new Options();
         options.addOption("p", "purge", false, "delete all items in the collection");
-        options.getOption("p").setType(boolean.class);
         options.addOption("r", "run", false, "run the standard harvest procedure");
-        options.getOption("r").setType(boolean.class);
         options.addOption("g", "ping", false, "test the OAI server and set");
-        options.getOption("g").setType(boolean.class);
         options.addOption("s", "setup", false, "Set the collection up for harvesting");
-        options.getOption("s").setType(boolean.class);
         options.addOption("S", "start", false, "start the harvest loop");
-        options.getOption("S").setType(boolean.class);
         options.addOption("R", "reset", false, "reset harvest status on all collections");
-        options.getOption("R").setType(boolean.class);
         options.addOption("P", "purgeCollections", false, "purge all harvestable collections");
-        options.getOption("P").setType(boolean.class);
         options.addOption("o", "reimport", false, "reimport all items in the collection, " +
             "this is equivalent to -p -r, purging all items in a collection and reimporting them");
-        options.getOption("o").setType(boolean.class);
         options.addOption("c", "collection", true,
                           "harvesting collection (handle or id)");
         options.addOption("t", "type", true,
@@ -72,7 +64,6 @@ public class HarvestScriptConfiguration<T extends Harvest> extends ScriptConfigu
                                   "crosswalk in dspace.cfg");
 
         options.addOption("h", "help", false, "help");
-        options.getOption("h").setType(boolean.class);
 
         return options;
     }
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
new file mode 100644
index 0000000000..71fc088694
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
@@ -0,0 +1,264 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemexport;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.io.file.PathUtils;
+import org.dspace.app.itemexport.factory.ItemExportServiceFactory;
+import org.dspace.app.itemexport.service.ItemExportService;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.handle.factory.HandleServiceFactory;
+import org.dspace.handle.service.HandleService;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.utils.DSpace;
+
+/**
+ * Item exporter to create simple AIPs for DSpace content. Currently exports
+ * individual items, or entire collections. For instructions on use, see
+ * printUsage() method.
+ * <P>
+ * ItemExport creates the simple AIP package that the importer also uses. It
+ * consists of:
+ * <P>
+ * /exportdir/42/ (one directory per item) / dublin_core.xml - qualified dublin
+ * core in RDF schema / contents - text file, listing one file per line / file1
+ * - files contained in the item / file2 / ...
+ * <P>
+ * issues -doesn't handle special characters in metadata (needs to turn {@code &'s} into
+ * {@code &amp;}, etc.)
+ * <P>
+ * Modified by David Little, UCSD Libraries 12/21/04 to allow the registration
+ * of files (bitstreams) into DSpace.
+ *
+ * @author David Little
+ * @author Jay Paz
+ */
+public class ItemExport extends DSpaceRunnable<ItemExportScriptConfiguration> {
+
+    public static final String TEMP_DIR = "exportSAF";
+    public static final String ZIP_NAME = "exportSAFZip";
+    public static final String ZIP_FILENAME = "saf-export";
+    public static final String ZIP_EXT = "zip";
+
+    protected String typeString = null;
+    protected String destDirName = null;
+    protected String idString = null;
+    protected int seqStart = -1;
+    protected int type = -1;
+    protected Item item = null;
+    protected Collection collection = null;
+    protected boolean migrate = false;
+    protected boolean zip = false;
+    protected String zipFileName = "";
+    protected boolean excludeBitstreams = false;
+    protected boolean help = false;
+
+    protected static HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
+    protected static ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+    protected static CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
+    protected static final EPersonService epersonService =
+            EPersonServiceFactory.getInstance().getEPersonService();
+
+    @Override
+    public ItemExportScriptConfiguration getScriptConfiguration() {
+        return new DSpace().getServiceManager()
+                .getServiceByName("export", ItemExportScriptConfiguration.class);
+    }
+
+    @Override
+    public void setup() throws ParseException {
+        help = commandLine.hasOption('h');
+
+        if (commandLine.hasOption('t')) { // type
+            typeString = commandLine.getOptionValue('t');
+
+            if ("ITEM".equals(typeString)) {
+                type = Constants.ITEM;
+            } else if ("COLLECTION".equals(typeString)) {
+                type = Constants.COLLECTION;
+            }
+        }
+
+        if (commandLine.hasOption('i')) { // id
+            idString = commandLine.getOptionValue('i');
+        }
+
+        setNumber();
+
+        if (commandLine.hasOption('m')) { // number
+            migrate = true;
+        }
+
+        if (commandLine.hasOption('x')) {
+            excludeBitstreams = true;
+        }
+    }
+
+    @Override
+    public void internalRun() throws Exception {
+        if (help) {
+            printHelp();
+            return;
+        }
+
+        validate();
+
+        Context context = new Context();
+        context.turnOffAuthorisationSystem();
+
+        if (type == Constants.ITEM) {
+            // first, is myIDString a handle?
+            if (idString.indexOf('/') != -1) {
+                item = (Item) handleService.resolveToObject(context, idString);
+
+                if ((item == null) || (item.getType() != Constants.ITEM)) {
+                    item = null;
+                }
+            } else {
+                item = itemService.find(context, UUID.fromString(idString));
+            }
+
+            if (item == null) {
+                handler.logError("The item cannot be found: " + idString + " (run with -h flag for details)");
+                throw new UnsupportedOperationException("The item cannot be found: " + idString);
+            }
+        } else {
+            if (idString.indexOf('/') != -1) {
+                // has a / must be a handle
+                collection = (Collection) handleService.resolveToObject(context,
+                                                                          idString);
+
+                // ensure it's a collection
+                if ((collection == null)
+                    || (collection.getType() != Constants.COLLECTION)) {
+                    collection = null;
+                }
+            } else {
+                collection = collectionService.find(context, UUID.fromString(idString));
+            }
+
+            if (collection == null) {
+                handler.logError("The collection cannot be found: " + idString + " (run with -h flag for details)");
+                throw new UnsupportedOperationException("The collection cannot be found: " + idString);
+            }
+        }
+
+        ItemExportService itemExportService = ItemExportServiceFactory.getInstance()
+                .getItemExportService();
+        try {
+            itemExportService.setHandler(handler);
+            process(context, itemExportService);
+            context.complete();
+        } catch (Exception e) {
+            context.abort();
+            throw new Exception(e);
+        }
+    }
+
+    /**
+     * Validate the options
+     */
+    protected void validate() {
+        if (type == -1) {
+            handler.logError("The type must be either COLLECTION or ITEM (run with -h flag for details)");
+            throw new UnsupportedOperationException("The type must be either COLLECTION or ITEM");
+        }
+
+        if (idString == null) {
+            handler.logError("The ID must be set to either a database ID or a handle (run with -h flag for details)");
+            throw new UnsupportedOperationException("The ID must be set to either a database ID or a handle");
+        }
+    }
+
+    /**
+     * Process the export
+     * @param context
+     * @throws Exception
+     */
+    protected void process(Context context, ItemExportService itemExportService) throws Exception {
+        setEPerson(context);
+        setDestDirName(context, itemExportService);
+        setZip(context);
+
+        Iterator<Item> items;
+        if (item != null) {
+            List<Item> myItems = new ArrayList<>();
+            myItems.add(item);
+            items = myItems.iterator();
+        } else {
+            handler.logInfo("Exporting from collection: " + idString);
+            items = itemService.findByCollection(context, collection);
+        }
+        itemExportService.exportAsZip(context, items, destDirName, zipFileName,
+                seqStart, migrate, excludeBitstreams);
+
+        File zip = new File(destDirName + System.getProperty("file.separator") + zipFileName);
+        try (InputStream is = new FileInputStream(zip)) {
+            // write input stream on handler
+            handler.writeFilestream(context, ZIP_FILENAME + "." + ZIP_EXT, is, ZIP_NAME);
+        } finally {
+            PathUtils.deleteDirectory(Path.of(destDirName));
+        }
+    }
+
+    /**
+     * Set the destination directory option
+     */
+    protected void setDestDirName(Context context, ItemExportService itemExportService) throws Exception {
+        destDirName = itemExportService.getExportWorkDirectory() + File.separator + TEMP_DIR;
+    }
+
+    /**
+     * Set the zip option
+     */
+    protected void setZip(Context context) {
+        zip = true;
+        zipFileName = ZIP_FILENAME + "-" + context.getCurrentUser().getID() + "." + ZIP_EXT;
+    }
+
+    /**
+     * Set the number option
+     */
+    protected void setNumber() {
+        seqStart = 1;
+        if (commandLine.hasOption('n')) { // number
+            seqStart = Integer.parseInt(commandLine.getOptionValue('n'));
+        }
+    }
+
+    private void setEPerson(Context context) throws SQLException {
+        EPerson myEPerson = epersonService.find(context, this.getEpersonIdentifier());
+
+        // check eperson
+        if (myEPerson == null) {
+            handler.logError("EPerson cannot be found: " + this.getEpersonIdentifier());
+            throw new UnsupportedOperationException("EPerson cannot be found: " + this.getEpersonIdentifier());
+        }
+
+        context.setCurrentUser(myEPerson);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLI.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLI.java
new file mode 100644
index 0000000000..8e9af1e010
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLI.java
@@ -0,0 +1,96 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemexport;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.dspace.app.itemexport.service.ItemExportService;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * CLI variant for the {@link ItemExport} class.
+ * This was done to specify the specific behaviors for the CLI.
+ *
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemExportCLI extends ItemExport {
+
+    @Override
+    protected void validate() {
+        super.validate();
+
+        setDestDirName();
+
+        if (destDirName == null) {
+            handler.logError("The destination directory must be set (run with -h flag for details)");
+            throw new UnsupportedOperationException("The destination directory must be set");
+        }
+
+        if (seqStart == -1) {
+            handler.logError("The sequence start number must be set (run with -h flag for details)");
+            throw new UnsupportedOperationException("The sequence start number must be set");
+        }
+    }
+
+    @Override
+    protected void process(Context context, ItemExportService itemExportService) throws Exception {
+        setZip(context);
+
+        if (zip) {
+            Iterator<Item> items;
+            if (item != null) {
+                List<Item> myItems = new ArrayList<>();
+                myItems.add(item);
+                items = myItems.iterator();
+            } else {
+                handler.logInfo("Exporting from collection: " + idString);
+                items = itemService.findByCollection(context, collection);
+            }
+            itemExportService.exportAsZip(context, items, destDirName, zipFileName,
+                    seqStart, migrate, excludeBitstreams);
+        } else {
+            if (item != null) {
+                // it's only a single item
+                itemExportService
+                    .exportItem(context, Collections.singletonList(item).iterator(), destDirName,
+                            seqStart, migrate, excludeBitstreams);
+            } else {
+                handler.logInfo("Exporting from collection: " + idString);
+
+                // it's a collection, so do a bunch of items
+                Iterator<Item> i = itemService.findByCollection(context, collection);
+                itemExportService.exportItem(context, i, destDirName, seqStart, migrate, excludeBitstreams);
+            }
+        }
+    }
+
+    protected void setDestDirName() {
+        if (commandLine.hasOption('d')) { // dest
+            destDirName = commandLine.getOptionValue('d');
+        }
+    }
+
+    @Override
+    protected void setZip(Context context) {
+        if (commandLine.hasOption('z')) {
+            zip = true;
+            zipFileName = commandLine.getOptionValue('z');
+        }
+    }
+
+    @Override
+    protected void setNumber() {
+        if (commandLine.hasOption('n')) { // number
+            seqStart = Integer.parseInt(commandLine.getOptionValue('n'));
+        }
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLIScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLIScriptConfiguration.java
new file mode 100644
index 0000000000..ff79c7cfa7
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLIScriptConfiguration.java
@@ -0,0 +1,56 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemexport;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+
+/**
+ * The {@link ScriptConfiguration} for the {@link ItemExportCLI} script
+ * 
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemExportCLIScriptConfiguration extends ItemExportScriptConfiguration<ItemExportCLI> {
+
+    @Override
+    public Options getOptions() {
+        Options options = new Options();
+
+        options.addOption(Option.builder("t").longOpt("type")
+                .desc("type: COLLECTION or ITEM")
+                .hasArg().required().build());
+        options.addOption(Option.builder("i").longOpt("id")
+                .desc("ID or handle of thing to export")
+                .hasArg().required().build());
+        options.addOption(Option.builder("d").longOpt("dest")
+                .desc("destination where you want items to go")
+                .hasArg().required().build());
+        options.addOption(Option.builder("n").longOpt("number")
+                .desc("sequence number to begin exporting items with")
+                .hasArg().required().build());
+        options.addOption(Option.builder("z").longOpt("zip")
+                .desc("export as zip file (specify filename e.g. export.zip)")
+                .hasArg().required(false).build());
+        options.addOption(Option.builder("m").longOpt("migrate")
+                .desc("export for migration (remove handle and metadata that will be re-created in new system)")
+                .hasArg(false).required(false).build());
+
+        // as pointed out by Peter Dietz this provides similar functionality to export metadata
+        // but it is needed since it directly exports to Simple Archive Format (SAF)
+        options.addOption(Option.builder("x").longOpt("exclude-bitstreams")
+                .desc("do not export bitstreams")
+                .hasArg(false).required(false).build());
+
+        options.addOption(Option.builder("h").longOpt("help")
+                .desc("help")
+                .hasArg(false).required(false).build());
+
+        return options;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLITool.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLITool.java
deleted file mode 100644
index d6a69b5823..0000000000
--- a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportCLITool.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.app.itemexport;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.dspace.app.itemexport.factory.ItemExportServiceFactory;
-import org.dspace.app.itemexport.service.ItemExportService;
-import org.dspace.content.Collection;
-import org.dspace.content.Item;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Constants;
-import org.dspace.core.Context;
-import org.dspace.handle.factory.HandleServiceFactory;
-import org.dspace.handle.service.HandleService;
-
-/**
- * Item exporter to create simple AIPs for DSpace content. Currently exports
- * individual items, or entire collections. For instructions on use, see
- * printUsage() method.
- * <P>
- * ItemExport creates the simple AIP package that the importer also uses. It
- * consists of:
- * <P>
- * /exportdir/42/ (one directory per item) / dublin_core.xml - qualified dublin
- * core in RDF schema / contents - text file, listing one file per line / file1
- * - files contained in the item / file2 / ...
- * <P>
- * issues -doesn't handle special characters in metadata (needs to turn {@code &'s} into
- * {@code &amp;}, etc.)
- * <P>
- * Modified by David Little, UCSD Libraries 12/21/04 to allow the registration
- * of files (bitstreams) into DSpace.
- *
- * @author David Little
- * @author Jay Paz
- */
-public class ItemExportCLITool {
-
-    protected static ItemExportService itemExportService = ItemExportServiceFactory.getInstance()
-                                                                                   .getItemExportService();
-    protected static HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
-    protected static ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    protected static CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-
-    /**
-     * Default constructor
-     */
-    private ItemExportCLITool() { }
-
-    /*
-     *
-     */
-    public static void main(String[] argv) throws Exception {
-        // create an options object and populate it
-        CommandLineParser parser = new DefaultParser();
-
-        Options options = new Options();
-
-        options.addOption("t", "type", true, "type: COLLECTION or ITEM");
-        options.addOption("i", "id", true, "ID or handle of thing to export");
-        options.addOption("d", "dest", true,
-                          "destination where you want items to go");
-        options.addOption("m", "migrate", false,
-                          "export for migration (remove handle and metadata that will be re-created in new system)");
-        options.addOption("n", "number", true,
-                          "sequence number to begin exporting items with");
-        options.addOption("z", "zip", true, "export as zip file (specify filename e.g. export.zip)");
-        options.addOption("h", "help", false, "help");
-
-        // as pointed out by Peter Dietz this provides similar functionality to export metadata
-        // but it is needed since it directly exports to Simple Archive Format (SAF)
-        options.addOption("x", "exclude-bitstreams", false, "do not export bitstreams");
-
-        CommandLine line = parser.parse(options, argv);
-
-        String typeString = null;
-        String destDirName = null;
-        String myIDString = null;
-        int seqStart = -1;
-        int myType = -1;
-
-        Item myItem = null;
-        Collection mycollection = null;
-
-        if (line.hasOption('h')) {
-            HelpFormatter myhelp = new HelpFormatter();
-            myhelp.printHelp("ItemExport\n", options);
-            System.out
-                .println("\nfull collection: ItemExport -t COLLECTION -i ID -d dest -n number");
-            System.out
-                .println("singleitem:       ItemExport -t ITEM -i ID -d dest -n number");
-
-            System.exit(0);
-        }
-
-        if (line.hasOption('t')) { // type
-            typeString = line.getOptionValue('t');
-
-            if ("ITEM".equals(typeString)) {
-                myType = Constants.ITEM;
-            } else if ("COLLECTION".equals(typeString)) {
-                myType = Constants.COLLECTION;
-            }
-        }
-
-        if (line.hasOption('i')) { // id
-            myIDString = line.getOptionValue('i');
-        }
-
-        if (line.hasOption('d')) { // dest
-            destDirName = line.getOptionValue('d');
-        }
-
-        if (line.hasOption('n')) { // number
-            seqStart = Integer.parseInt(line.getOptionValue('n'));
-        }
-
-        boolean migrate = false;
-        if (line.hasOption('m')) { // number
-            migrate = true;
-        }
-
-        boolean zip = false;
-        String zipFileName = "";
-        if (line.hasOption('z')) {
-            zip = true;
-            zipFileName = line.getOptionValue('z');
-        }
-
-        boolean excludeBitstreams = false;
-        if (line.hasOption('x')) {
-            excludeBitstreams = true;
-        }
-
-        // now validate the args
-        if (myType == -1) {
-            System.out
-                .println("type must be either COLLECTION or ITEM (-h for help)");
-            System.exit(1);
-        }
-
-        if (destDirName == null) {
-            System.out
-                .println("destination directory must be set (-h for help)");
-            System.exit(1);
-        }
-
-        if (seqStart == -1) {
-            System.out
-                .println("sequence start number must be set (-h for help)");
-            System.exit(1);
-        }
-
-        if (myIDString == null) {
-            System.out
-                .println("ID must be set to either a database ID or a handle (-h for help)");
-            System.exit(1);
-        }
-
-        Context c = new Context(Context.Mode.READ_ONLY);
-        c.turnOffAuthorisationSystem();
-
-        if (myType == Constants.ITEM) {
-            // first, is myIDString a handle?
-            if (myIDString.indexOf('/') != -1) {
-                myItem = (Item) handleService.resolveToObject(c, myIDString);
-
-                if ((myItem == null) || (myItem.getType() != Constants.ITEM)) {
-                    myItem = null;
-                }
-            } else {
-                myItem = itemService.find(c, UUID.fromString(myIDString));
-            }
-
-            if (myItem == null) {
-                System.out
-                    .println("Error, item cannot be found: " + myIDString);
-            }
-        } else {
-            if (myIDString.indexOf('/') != -1) {
-                // has a / must be a handle
-                mycollection = (Collection) handleService.resolveToObject(c,
-                                                                          myIDString);
-
-                // ensure it's a collection
-                if ((mycollection == null)
-                    || (mycollection.getType() != Constants.COLLECTION)) {
-                    mycollection = null;
-                }
-            } else if (myIDString != null) {
-                mycollection = collectionService.find(c, UUID.fromString(myIDString));
-            }
-
-            if (mycollection == null) {
-                System.out.println("Error, collection cannot be found: "
-                                       + myIDString);
-                System.exit(1);
-            }
-        }
-
-        if (zip) {
-            Iterator<Item> items;
-            if (myItem != null) {
-                List<Item> myItems = new ArrayList<>();
-                myItems.add(myItem);
-                items = myItems.iterator();
-            } else {
-                System.out.println("Exporting from collection: " + myIDString);
-                items = itemService.findByCollection(c, mycollection);
-            }
-            itemExportService.exportAsZip(c, items, destDirName, zipFileName, seqStart, migrate, excludeBitstreams);
-        } else {
-            if (myItem != null) {
-                // it's only a single item
-                itemExportService
-                    .exportItem(c, Collections.singletonList(myItem).iterator(), destDirName, seqStart, migrate,
-                                excludeBitstreams);
-            } else {
-                System.out.println("Exporting from collection: " + myIDString);
-
-                // it's a collection, so do a bunch of items
-                Iterator<Item> i = itemService.findByCollection(c, mycollection);
-                itemExportService.exportItem(c, i, destDirName, seqStart, migrate, excludeBitstreams);
-            }
-        }
-
-        c.complete();
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportScriptConfiguration.java
new file mode 100644
index 0000000000..cf70120d27
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportScriptConfiguration.java
@@ -0,0 +1,79 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemexport;
+
+import java.sql.SQLException;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.core.Context;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * The {@link ScriptConfiguration} for the {@link ItemExport} script
+ * 
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemExportScriptConfiguration<T extends ItemExport> extends ScriptConfiguration<T> {
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    private Class<T> dspaceRunnableClass;
+
+    @Override
+    public Class<T> getDspaceRunnableClass() {
+        return dspaceRunnableClass;
+    }
+
+    @Override
+    public void setDspaceRunnableClass(Class<T> dspaceRunnableClass) {
+        this.dspaceRunnableClass = dspaceRunnableClass;
+    }
+
+    @Override
+    public boolean isAllowedToExecute(final Context context) {
+        try {
+            return authorizeService.isAdmin(context);
+        } catch (SQLException e) {
+            throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
+        }
+    }
+
+    @Override
+    public Options getOptions() {
+        Options options = new Options();
+
+        options.addOption(Option.builder("t").longOpt("type")
+                .desc("type: COLLECTION or ITEM")
+                .hasArg().required().build());
+        options.addOption(Option.builder("i").longOpt("id")
+                .desc("ID or handle of thing to export")
+                .hasArg().required().build());
+        options.addOption(Option.builder("n").longOpt("number")
+                .desc("sequence number to begin exporting items with")
+                .hasArg().required(false).build());
+        options.addOption(Option.builder("m").longOpt("migrate")
+                .desc("export for migration (remove handle and metadata that will be re-created in new system)")
+                .hasArg(false).required(false).build());
+
+        // as pointed out by Peter Dietz this provides similar functionality to export metadata
+        // but it is needed since it directly exports to Simple Archive Format (SAF)
+        options.addOption(Option.builder("x").longOpt("exclude-bitstreams")
+                .desc("do not export bitstreams")
+                .hasArg(false).required(false).build());
+
+        options.addOption(Option.builder("h").longOpt("help")
+                .desc("help")
+                .hasArg(false).required(false).build());
+
+        return options;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
index 6578e57de2..a884f9b075 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
@@ -57,6 +57,7 @@ import org.dspace.core.Utils;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.handle.service.HandleService;
+import org.dspace.scripts.handler.DSpaceRunnableHandler;
 import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -64,17 +65,21 @@ import org.springframework.beans.factory.annotation.Autowired;
  * Item exporter to create simple AIPs for DSpace content. Currently exports
  * individual items, or entire collections. For instructions on use, see
  * printUsage() method.
- * <P>
+ * <p>
  * ItemExport creates the simple AIP package that the importer also uses. It
  * consists of:
- * <P>
- * /exportdir/42/ (one directory per item) / dublin_core.xml - qualified dublin
- * core in RDF schema / contents - text file, listing one file per line / file1
- * - files contained in the item / file2 / ...
- * <P>
+ * <pre>{@code
+ * /exportdir/42/ (one directory per item)
+ *              / dublin_core.xml - qualified dublin core in RDF schema
+ *              / contents - text file, listing one file per line
+ *              / file1 - files contained in the item
+ *              / file2
+ *              / ...
+ * }</pre>
+ * <p>
  * issues -doesn't handle special characters in metadata (needs to turn {@code &'s} into
  * {@code &amp;}, etc.)
- * <P>
+ * <p>
  * Modified by David Little, UCSD Libraries 12/21/04 to allow the registration
  * of files (bitstreams) into DSpace.
  *
@@ -97,11 +102,12 @@ public class ItemExportServiceImpl implements ItemExportService {
     @Autowired(required = true)
     protected ConfigurationService configurationService;
 
-
     /**
      * log4j logger
      */
-    private final Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemExportServiceImpl.class);
+    private final Logger log = org.apache.logging.log4j.LogManager.getLogger();
+
+    private DSpaceRunnableHandler handler;
 
     protected ItemExportServiceImpl() {
 
@@ -126,7 +132,7 @@ public class ItemExportServiceImpl implements ItemExportService {
             }
         }
 
-        System.out.println("Beginning export");
+        logInfo("Beginning export");
 
         while (i.hasNext()) {
             if (SUBDIR_LIMIT > 0 && ++counter == SUBDIR_LIMIT) {
@@ -139,7 +145,7 @@ public class ItemExportServiceImpl implements ItemExportService {
                 }
             }
 
-            System.out.println("Exporting item to " + mySequenceNumber);
+            logInfo("Exporting item to " + mySequenceNumber);
             Item item = i.next();
             exportItem(c, item, fullPath, mySequenceNumber, migrate, excludeBitstreams);
             c.uncacheEntity(item);
@@ -155,7 +161,7 @@ public class ItemExportServiceImpl implements ItemExportService {
             // now create a subdirectory
             File itemDir = new File(destDir + "/" + seqStart);
 
-            System.out.println("Exporting Item " + myItem.getID() +
+            logInfo("Exporting Item " + myItem.getID() +
                                    (myItem.getHandle() != null ? ", handle " + myItem.getHandle() : "") +
                                    " to " + itemDir);
 
@@ -168,6 +174,7 @@ public class ItemExportServiceImpl implements ItemExportService {
                 // make it this far, now start exporting
                 writeMetadata(c, myItem, itemDir, migrate);
                 writeBitstreams(c, myItem, itemDir, excludeBitstreams);
+                writeCollections(myItem, itemDir);
                 if (!migrate) {
                     writeHandle(c, myItem, itemDir);
                 }
@@ -225,7 +232,7 @@ public class ItemExportServiceImpl implements ItemExportService {
 
         File outFile = new File(destDir, filename);
 
-        System.out.println("Attempting to create file " + outFile);
+        logInfo("Attempting to create file " + outFile);
 
         if (outFile.createNewFile()) {
             BufferedOutputStream out = new BufferedOutputStream(
@@ -343,6 +350,33 @@ public class ItemExportServiceImpl implements ItemExportService {
         }
     }
 
+    /**
+     * Create the 'collections' file.  List handles of all Collections which
+     * contain this Item.  The "owning" Collection is listed first.
+     *
+     * @param item list collections holding this Item.
+     * @param destDir write the file here.
+     * @throws IOException if the file cannot be created or written.
+     */
+    protected void writeCollections(Item item, File destDir)
+            throws IOException {
+        File outFile = new File(destDir, "collections");
+        if (outFile.createNewFile()) {
+            try (PrintWriter out = new PrintWriter(new FileWriter(outFile))) {
+                String ownerHandle = item.getOwningCollection().getHandle();
+                out.println(ownerHandle);
+                for (Collection collection : item.getCollections()) {
+                    String collectionHandle = collection.getHandle();
+                    if (!collectionHandle.equals(ownerHandle)) {
+                        out.println(collectionHandle);
+                    }
+                }
+            }
+        } else {
+            throw new IOException("Cannot create 'collections' in " + destDir);
+        }
+    }
+
     /**
      * Create both the bitstreams and the contents file. Any bitstreams that
      * were originally registered will be marked in the contents file as such.
@@ -399,7 +433,7 @@ public class ItemExportServiceImpl implements ItemExportService {
                             File fdirs = new File(destDir + File.separator
                                                       + dirs);
                             if (!fdirs.exists() && !fdirs.mkdirs()) {
-                                log.error("Unable to create destination directory");
+                                logError("Unable to create destination directory");
                             }
                         }
 
@@ -456,12 +490,12 @@ public class ItemExportServiceImpl implements ItemExportService {
 
         File wkDir = new File(workDir);
         if (!wkDir.exists() && !wkDir.mkdirs()) {
-            log.error("Unable to create working direcory");
+            logError("Unable to create working direcory");
         }
 
         File dnDir = new File(destDirName);
         if (!dnDir.exists() && !dnDir.mkdirs()) {
-            log.error("Unable to create destination directory");
+            logError("Unable to create destination directory");
         }
 
         // export the items using normal export method
@@ -630,11 +664,9 @@ public class ItemExportServiceImpl implements ItemExportService {
             Thread go = new Thread() {
                 @Override
                 public void run() {
-                    Context context = null;
+                    Context context = new Context();
                     Iterator<Item> iitems = null;
                     try {
-                        // create a new dspace context
-                        context = new Context();
                         // ignore auths
                         context.turnOffAuthorisationSystem();
 
@@ -646,7 +678,7 @@ public class ItemExportServiceImpl implements ItemExportService {
                         String downloadDir = getExportDownloadDirectory(eperson);
                         File dnDir = new File(downloadDir);
                         if (!dnDir.exists() && !dnDir.mkdirs()) {
-                            log.error("Unable to create download directory");
+                            logError("Unable to create download directory");
                         }
 
                         Iterator<String> iter = itemsMap.keySet().iterator();
@@ -665,7 +697,7 @@ public class ItemExportServiceImpl implements ItemExportService {
 
                             File wkDir = new File(workDir);
                             if (!wkDir.exists() && !wkDir.mkdirs()) {
-                                log.error("Unable to create working directory");
+                                logError("Unable to create working directory");
                             }
 
 
@@ -756,7 +788,8 @@ public class ItemExportServiceImpl implements ItemExportService {
             throw new Exception(
                 "A dspace.cfg entry for 'org.dspace.app.itemexport.work.dir' does not exist.");
         }
-        return exportDir;
+        // clean work dir path from duplicate separators
+        return StringUtils.replace(exportDir, File.separator + File.separator, File.separator);
     }
 
     @Override
@@ -884,7 +917,7 @@ public class ItemExportServiceImpl implements ItemExportService {
             for (File file : files) {
                 if (file.lastModified() < now.getTimeInMillis()) {
                     if (!file.delete()) {
-                        log.error("Unable to delete export file");
+                        logError("Unable to delete export file");
                     }
                 }
             }
@@ -908,7 +941,7 @@ public class ItemExportServiceImpl implements ItemExportService {
                 for (File file : files) {
                     if (file.lastModified() < now.getTimeInMillis()) {
                         if (!file.delete()) {
-                            log.error("Unable to delete old files");
+                            logError("Unable to delete old files");
                         }
                     }
                 }
@@ -916,7 +949,7 @@ public class ItemExportServiceImpl implements ItemExportService {
                 // If the directory is now empty then we delete it too.
                 if (dir.listFiles().length == 0) {
                     if (!dir.delete()) {
-                        log.error("Unable to delete directory");
+                        logError("Unable to delete directory");
                     }
                 }
             }
@@ -937,14 +970,14 @@ public class ItemExportServiceImpl implements ItemExportService {
 
             email.send();
         } catch (Exception e) {
-            log.warn(LogHelper.getHeader(context, "emailSuccessMessage", "cannot notify user of export"), e);
+            logWarn(LogHelper.getHeader(context, "emailSuccessMessage", "cannot notify user of export"), e);
         }
     }
 
     @Override
     public void emailErrorMessage(EPerson eperson, String error)
         throws MessagingException {
-        log.warn("An error occurred during item export, the user will be notified. " + error);
+        logWarn("An error occurred during item export, the user will be notified. " + error);
         try {
             Locale supportedLocale = I18nUtil.getEPersonLocale(eperson);
             Email email = Email.getEmail(I18nUtil.getEmailFilename(supportedLocale, "export_error"));
@@ -954,7 +987,7 @@ public class ItemExportServiceImpl implements ItemExportService {
 
             email.send();
         } catch (Exception e) {
-            log.warn("error during item export error notification", e);
+            logWarn("error during item export error notification", e);
         }
     }
 
@@ -969,7 +1002,7 @@ public class ItemExportServiceImpl implements ItemExportService {
             }
             File targetFile = new File(tempFileName);
             if (!targetFile.createNewFile()) {
-                log.warn("Target file already exists: " + targetFile.getName());
+                logWarn("Target file already exists: " + targetFile.getName());
             }
 
             FileOutputStream fos = new FileOutputStream(tempFileName);
@@ -985,7 +1018,7 @@ public class ItemExportServiceImpl implements ItemExportService {
 
             deleteDirectory(cpFile);
             if (!targetFile.renameTo(new File(target))) {
-                log.error("Unable to rename file");
+                logError("Unable to rename file");
             }
         } finally {
             if (cpZipOutputStream != null) {
@@ -1018,8 +1051,11 @@ public class ItemExportServiceImpl implements ItemExportService {
                     return;
                 }
                 String strAbsPath = cpFile.getPath();
-                String strZipEntryName = strAbsPath.substring(strSource
-                                                                  .length() + 1, strAbsPath.length());
+                int startIndex = strSource.length();
+                if (!StringUtils.endsWith(strSource, File.separator)) {
+                    startIndex++;
+                }
+                String strZipEntryName = strAbsPath.substring(startIndex, strAbsPath.length());
 
                 // byte[] b = new byte[ (int)(cpFile.length()) ];
 
@@ -1058,7 +1094,7 @@ public class ItemExportServiceImpl implements ItemExportService {
                     deleteDirectory(file);
                 } else {
                     if (!file.delete()) {
-                        log.error("Unable to delete file: " + file.getName());
+                        logError("Unable to delete file: " + file.getName());
                     }
                 }
             }
@@ -1067,4 +1103,64 @@ public class ItemExportServiceImpl implements ItemExportService {
         return (path.delete());
     }
 
+    @Override
+    public void setHandler(DSpaceRunnableHandler handler) {
+        this.handler = handler;
+    }
+
+    private void logInfo(String message) {
+        logInfo(message, null);
+    }
+
+    private void logInfo(String message, Exception e) {
+        if (handler != null) {
+            handler.logInfo(message);
+            return;
+        }
+
+        if (e != null) {
+            log.info(message, e);
+        } else {
+            log.info(message);
+        }
+    }
+
+    private void logWarn(String message) {
+        logWarn(message, null);
+    }
+
+    private void logWarn(String message, Exception e) {
+        if (handler != null) {
+            handler.logWarning(message);
+            return;
+        }
+
+        if (e != null) {
+            log.warn(message, e);
+        } else {
+            log.warn(message);
+        }
+    }
+
+    private void logError(String message) {
+        logError(message, null);
+    }
+
+    private void logError(String message, Exception e) {
+        if (handler != null) {
+            if (e != null) {
+                handler.logError(message, e);
+            } else {
+                handler.logError(message);
+            }
+            return;
+        }
+
+        if (e != null) {
+            log.error(message, e);
+        } else {
+            log.error(message);
+        }
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java b/dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java
index 7dedc9950b..6ec1027709 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java
@@ -17,6 +17,7 @@ import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.scripts.handler.DSpaceRunnableHandler;
 
 /**
  * Item exporter to create simple AIPs for DSpace content. Currently exports
@@ -267,4 +268,10 @@ public interface ItemExportService {
      */
     public void zip(String strSource, String target) throws Exception;
 
+    /**
+     * Set the DSpace Runnable Handler
+     * @param handler
+     */
+    public void setHandler(DSpaceRunnableHandler handler);
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
new file mode 100644
index 0000000000..6870b94eee
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
@@ -0,0 +1,378 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemimport;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.itemimport.factory.ItemImportServiceFactory;
+import org.dspace.app.itemimport.service.ItemImportService;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Collection;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.CollectionService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.handle.factory.HandleServiceFactory;
+import org.dspace.handle.service.HandleService;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.utils.DSpace;
+
+/**
+ * Import items into DSpace. The conventional use is upload files by copying
+ * them. DSpace writes the item's bitstreams into its assetstore. Metadata is
+ * also loaded to the DSpace database.
+ * <P>
+ * A second use assumes the bitstream files already exist in a storage
+ * resource accessible to DSpace. In this case the bitstreams are 'registered'.
+ * That is, the metadata is loaded to the DSpace database and DSpace is given
+ * the location of the file which is subsumed into DSpace.
+ * <P>
+ * The distinction is controlled by the format of lines in the 'contents' file.
+ * See comments in processContentsFile() below.
+ * <P>
+ * Modified by David Little, UCSD Libraries 12/21/04 to
+ * allow the registration of files (bitstreams) into DSpace.
+ */
+public class ItemImport extends DSpaceRunnable<ItemImportScriptConfiguration> {
+
+    public static String TEMP_DIR = "importSAF";
+    public static String MAPFILE_FILENAME = "mapfile";
+    public static String MAPFILE_BITSTREAM_TYPE = "importSAFMapfile";
+
+    protected boolean template = false;
+    protected String command = null;
+    protected String sourcedir = null;
+    protected String mapfile = null;
+    protected String eperson = null;
+    protected String[] collections = null;
+    protected boolean isTest = false;
+    protected boolean isExcludeContent = false;
+    protected boolean isResume = false;
+    protected boolean useWorkflow = false;
+    protected boolean useWorkflowSendEmail = false;
+    protected boolean isQuiet = false;
+    protected boolean commandLineCollections = false;
+    protected boolean zip = false;
+    protected String zipfilename = null;
+    protected boolean help = false;
+    protected File workDir = null;
+    private File workFile = null;
+
+    protected static final CollectionService collectionService =
+            ContentServiceFactory.getInstance().getCollectionService();
+    protected static final EPersonService epersonService =
+            EPersonServiceFactory.getInstance().getEPersonService();
+    protected static final HandleService handleService =
+            HandleServiceFactory.getInstance().getHandleService();
+
+    @Override
+    public ItemImportScriptConfiguration getScriptConfiguration() {
+        return new DSpace().getServiceManager()
+                .getServiceByName("import", ItemImportScriptConfiguration.class);
+    }
+
+    @Override
+    public void setup() throws ParseException {
+        help = commandLine.hasOption('h');
+
+        if (commandLine.hasOption('a')) {
+            command = "add";
+        }
+
+        if (commandLine.hasOption('r')) {
+            command = "replace";
+        }
+
+        if (commandLine.hasOption('d')) {
+            command = "delete";
+        }
+
+        if (commandLine.hasOption('w')) {
+            useWorkflow = true;
+            if (commandLine.hasOption('n')) {
+                useWorkflowSendEmail = true;
+            }
+        }
+
+        if (commandLine.hasOption('v')) {
+            isTest = true;
+            handler.logInfo("**Test Run** - not actually importing items.");
+        }
+
+        isExcludeContent = commandLine.hasOption('x');
+
+        if (commandLine.hasOption('p')) {
+            template = true;
+        }
+
+        if (commandLine.hasOption('c')) { // collections
+            collections = commandLine.getOptionValues('c');
+            commandLineCollections = true;
+        } else {
+            handler.logInfo("No collections given. Assuming 'collections' file inside item directory");
+        }
+
+        if (commandLine.hasOption('R')) {
+            isResume = true;
+            handler.logInfo("**Resume import** - attempting to import items not already imported");
+        }
+
+        if (commandLine.hasOption('q')) {
+            isQuiet = true;
+        }
+
+        setZip();
+    }
+
+    @Override
+    public void internalRun() throws Exception {
+        if (help) {
+            printHelp();
+            return;
+        }
+
+        Date startTime = new Date();
+        Context context = new Context(Context.Mode.BATCH_EDIT);
+
+        setMapFile();
+
+        validate(context);
+
+        setEPerson(context);
+
+        // check collection
+        List<Collection> mycollections = null;
+        // don't need to validate collections set if command is "delete"
+        // also if no collections are given in the command line
+        if (!"delete".equals(command) && commandLineCollections) {
+            handler.logInfo("Destination collections:");
+
+            mycollections = new ArrayList<>();
+
+            // validate each collection arg to see if it's a real collection
+            for (int i = 0; i < collections.length; i++) {
+                Collection collection = null;
+                if (collections[i] != null) {
+                    // is the ID a handle?
+                    if (collections[i].indexOf('/') != -1) {
+                        // string has a / so it must be a handle - try and resolve
+                        // it
+                        collection = ((Collection) handleService
+                            .resolveToObject(context, collections[i]));
+                    } else {
+                        // not a handle, try and treat it as an integer collection database ID
+                        collection = collectionService.find(context, UUID.fromString(collections[i]));
+                    }
+                }
+
+                // was the collection valid?
+                if (collection == null
+                        || collection.getType() != Constants.COLLECTION) {
+                    throw new IllegalArgumentException("Cannot resolve "
+                            + collections[i] + " to collection");
+                }
+
+                // add resolved collection to list
+                mycollections.add(collection);
+
+                // print progress info
+                handler.logInfo((i == 0 ? "Owning " : "") + "Collection: " + collection.getName());
+            }
+        }
+        // end validation
+
+        // start
+        ItemImportService itemImportService = ItemImportServiceFactory.getInstance()
+                .getItemImportService();
+        try {
+            itemImportService.setTest(isTest);
+            itemImportService.setExcludeContent(isExcludeContent);
+            itemImportService.setResume(isResume);
+            itemImportService.setUseWorkflow(useWorkflow);
+            itemImportService.setUseWorkflowSendEmail(useWorkflowSendEmail);
+            itemImportService.setQuiet(isQuiet);
+            itemImportService.setHandler(handler);
+
+            try {
+                context.turnOffAuthorisationSystem();
+
+                readZip(context, itemImportService);
+
+                process(context, itemImportService, mycollections);
+
+                // complete all transactions
+                context.complete();
+            } catch (Exception e) {
+                context.abort();
+                throw new Exception(
+                    "Error committing changes to database: " + e.getMessage() + ", aborting most recent changes", e);
+            }
+
+            if (isTest) {
+                handler.logInfo("***End of Test Run***");
+            }
+        } finally {
+            // clean work dir
+            if (zip) {
+                FileUtils.deleteDirectory(new File(sourcedir));
+                FileUtils.deleteDirectory(workDir);
+            }
+
+            Date endTime = new Date();
+            handler.logInfo("Started: " + startTime.getTime());
+            handler.logInfo("Ended: " + endTime.getTime());
+            handler.logInfo(
+                "Elapsed time: " + ((endTime.getTime() - startTime.getTime()) / 1000) + " secs (" + (endTime
+                    .getTime() - startTime.getTime()) + " msecs)");
+        }
+    }
+
+    /**
+     * Validate the options
+     * @param context
+     */
+    protected void validate(Context context) {
+        if (command == null) {
+            handler.logError("Must run with either add, replace, or remove (run with -h flag for details)");
+            throw new UnsupportedOperationException("Must run with either add, replace, or remove");
+        }
+
+        // can only resume for adds
+        if (isResume && !"add".equals(command)) {
+            handler.logError("Resume option only works with the --add command (run with -h flag for details)");
+            throw new UnsupportedOperationException("Resume option only works with the --add command");
+        }
+
+        if (isResume && StringUtils.isBlank(mapfile)) {
+            handler.logError("The mapfile does not exist. ");
+            throw new UnsupportedOperationException("The mapfile does not exist");
+        }
+    }
+
+    /**
+     * Process the import
+     * @param context
+     * @param itemImportService
+     * @param collections
+     * @throws Exception
+     */
+    protected void process(Context context, ItemImportService itemImportService,
+            List<Collection> collections) throws Exception {
+        readMapfile(context);
+
+        if ("add".equals(command)) {
+            itemImportService.addItems(context, collections, sourcedir, mapfile, template);
+        } else if ("replace".equals(command)) {
+            itemImportService.replaceItems(context, collections, sourcedir, mapfile, template);
+        } else if ("delete".equals(command)) {
+            itemImportService.deleteItems(context, mapfile);
+        }
+
+        // write input stream on handler
+        File mapFile = new File(mapfile);
+        try (InputStream mapfileInputStream = new FileInputStream(mapFile)) {
+            handler.writeFilestream(context, MAPFILE_FILENAME, mapfileInputStream, MAPFILE_BITSTREAM_TYPE);
+        } finally {
+            mapFile.delete();
+            workFile.delete();
+        }
+    }
+
+    /**
+     * Read the ZIP archive in SAF format
+     * @param context
+     * @param itemImportService
+     * @throws Exception
+     */
+    protected void readZip(Context context, ItemImportService itemImportService) throws Exception {
+        Optional<InputStream> optionalFileStream = handler.getFileStream(context, zipfilename);
+        if (optionalFileStream.isPresent()) {
+            workFile = new File(itemImportService.getTempWorkDir() + File.separator
+                    + zipfilename + "-" + context.getCurrentUser().getID());
+            FileUtils.copyInputStreamToFile(optionalFileStream.get(), workFile);
+            workDir = new File(itemImportService.getTempWorkDir() + File.separator + TEMP_DIR);
+            sourcedir = itemImportService.unzip(workFile, workDir.getAbsolutePath());
+        } else {
+            throw new IllegalArgumentException(
+                    "Error reading file, the file couldn't be found for filename: " + zipfilename);
+        }
+    }
+
+    /**
+     * Read the mapfile
+     * @param context
+     */
+    protected void readMapfile(Context context) {
+        if (isResume) {
+            try {
+                Optional<InputStream> optionalFileStream = handler.getFileStream(context, mapfile);
+                if (optionalFileStream.isPresent()) {
+                    File tempFile = File.createTempFile(mapfile, "temp");
+                    tempFile.deleteOnExit();
+                    FileUtils.copyInputStreamToFile(optionalFileStream.get(), tempFile);
+                    mapfile = tempFile.getAbsolutePath();
+                }
+            } catch (IOException | AuthorizeException e) {
+                throw new UnsupportedOperationException("The mapfile does not exist");
+            }
+        }
+    }
+
+    /**
+     * Set the mapfile option
+     * @throws IOException
+     */
+    protected void setMapFile() throws IOException {
+        if (isResume && commandLine.hasOption('m')) {
+            mapfile = commandLine.getOptionValue('m');
+        } else {
+            mapfile = Files.createTempFile(MAPFILE_FILENAME, "temp").toString();
+        }
+    }
+
+    /**
+     * Set the zip option
+     */
+    protected void setZip() {
+        zip = true;
+        zipfilename = commandLine.getOptionValue('z');
+    }
+
+    /**
+     * Set the eperson in the context
+     * @param context
+     * @throws SQLException
+     */
+    protected void setEPerson(Context context) throws SQLException {
+        EPerson myEPerson = epersonService.find(context, this.getEpersonIdentifier());
+
+        // check eperson
+        if (myEPerson == null) {
+            handler.logError("EPerson cannot be found: " + this.getEpersonIdentifier());
+            throw new UnsupportedOperationException("EPerson cannot be found: " + this.getEpersonIdentifier());
+        }
+
+        context.setCurrentUser(myEPerson);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLI.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLI.java
new file mode 100644
index 0000000000..35de7b443a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLI.java
@@ -0,0 +1,143 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemimport;
+
+import java.io.File;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.itemimport.service.ItemImportService;
+import org.dspace.content.Collection;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+
+/**
+ * CLI variant for the {@link ItemImport} class.
+ * This was done to specify the specific behaviors for the CLI.
+ *
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemImportCLI extends ItemImport {
+
+    @Override
+    protected void validate(Context context) {
+        // can only resume for adds
+        if (isResume && !"add".equals(command)) {
+            handler.logError("Resume option only works with the --add command (run with -h flag for details)");
+            throw new UnsupportedOperationException("Resume option only works with the --add command");
+        }
+
+        if (commandLine.hasOption('e')) {
+            eperson = commandLine.getOptionValue('e');
+        }
+
+        // check eperson identifier (email or id)
+        if (eperson == null) {
+            handler.logError("An eperson to do the importing must be specified (run with -h flag for details)");
+            throw new UnsupportedOperationException("An eperson to do the importing must be specified");
+        }
+
+        File myFile = null;
+        try {
+            myFile = new File(mapfile);
+        } catch (Exception e) {
+            throw new UnsupportedOperationException("The mapfile " + mapfile + " does not exist");
+        }
+
+        if (!isResume && "add".equals(command) && myFile.exists()) {
+            handler.logError("The mapfile " + mapfile + " already exists. "
+                    + "Either delete it or use --resume if attempting to resume an aborted import. "
+                    + "(run with -h flag for details)");
+            throw new UnsupportedOperationException("The mapfile " + mapfile + " already exists");
+        }
+
+        if (command == null) {
+            handler.logError("Must run with either add, replace, or remove (run with -h flag for details)");
+            throw new UnsupportedOperationException("Must run with either add, replace, or remove");
+        } else if ("add".equals(command) || "replace".equals(command)) {
+            if (sourcedir == null) {
+                handler.logError("A source directory containing items must be set (run with -h flag for details)");
+                throw new UnsupportedOperationException("A source directory containing items must be set");
+            }
+
+            if (mapfile == null) {
+                handler.logError(
+                        "A map file to hold importing results must be specified (run with -h flag for details)");
+                throw new UnsupportedOperationException("A map file to hold importing results must be specified");
+            }
+        } else if ("delete".equals(command)) {
+            if (mapfile == null) {
+                handler.logError("A map file must be specified (run with -h flag for details)");
+                throw new UnsupportedOperationException("A map file must be specified");
+            }
+        }
+    }
+
+    @Override
+    protected void process(Context context, ItemImportService itemImportService,
+            List<Collection> collections) throws Exception {
+        if ("add".equals(command)) {
+            itemImportService.addItems(context, collections, sourcedir, mapfile, template);
+        } else if ("replace".equals(command)) {
+            itemImportService.replaceItems(context, collections, sourcedir, mapfile, template);
+        } else if ("delete".equals(command)) {
+            itemImportService.deleteItems(context, mapfile);
+        }
+    }
+
+    @Override
+    protected void readZip(Context context, ItemImportService itemImportService) throws Exception {
+        // If this is a zip archive, unzip it first
+        if (zip) {
+            workDir = new File(itemImportService.getTempWorkDir() + File.separator + TEMP_DIR
+                    + File.separator + context.getCurrentUser().getID());
+            sourcedir = itemImportService.unzip(
+                    new File(sourcedir + File.separator + zipfilename), workDir.getAbsolutePath());
+        }
+    }
+
+    @Override
+    protected void setMapFile() {
+        if (commandLine.hasOption('m')) {
+            mapfile = commandLine.getOptionValue('m');
+        }
+    }
+
+    @Override
+    protected void setZip() {
+        if (commandLine.hasOption('s')) { // source
+            sourcedir = commandLine.getOptionValue('s');
+        }
+
+        if (commandLine.hasOption('z')) {
+            zip = true;
+            zipfilename = commandLine.getOptionValue('z');
+        }
+    }
+
+    @Override
+    protected void setEPerson(Context context) throws SQLException {
+        EPerson myEPerson = null;
+        if (StringUtils.contains(eperson, '@')) {
+            // @ sign, must be an email
+            myEPerson = epersonService.findByEmail(context, eperson);
+        } else {
+            myEPerson = epersonService.find(context, UUID.fromString(eperson));
+        }
+
+        // check eperson
+        if (myEPerson == null) {
+            handler.logError("EPerson cannot be found: " + eperson + " (run with -h flag for details)");
+            throw new UnsupportedOperationException("EPerson cannot be found: " + eperson);
+        }
+
+        context.setCurrentUser(myEPerson);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLIScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLIScriptConfiguration.java
new file mode 100644
index 0000000000..d265cbf4a1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLIScriptConfiguration.java
@@ -0,0 +1,77 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemimport;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+
+/**
+ * The {@link ScriptConfiguration} for the {@link ItemImportCLI} script
+ *
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemImportCLIScriptConfiguration extends ItemImportScriptConfiguration<ItemImportCLI> {
+
+    @Override
+    public Options getOptions() {
+        Options options = new Options();
+
+        options.addOption(Option.builder("a").longOpt("add")
+                .desc("add items to DSpace")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("r").longOpt("replace")
+                .desc("replace items in mapfile")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("d").longOpt("delete")
+                .desc("delete items listed in mapfile")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("s").longOpt("source")
+                .desc("source of items (directory)")
+                .hasArg().required(false).build());
+        options.addOption(Option.builder("z").longOpt("zip")
+                .desc("name of zip file")
+                .hasArg().required(false).build());
+        options.addOption(Option.builder("c").longOpt("collection")
+                .desc("destination collection(s) Handle or database ID")
+                .hasArg().required(false).build());
+        options.addOption(Option.builder("m").longOpt("mapfile")
+                .desc("mapfile items in mapfile")
+                .hasArg().required().build());
+        options.addOption(Option.builder("e").longOpt("eperson")
+                .desc("email of eperson doing importing")
+                .hasArg().required().build());
+        options.addOption(Option.builder("w").longOpt("workflow")
+                .desc("send submission through collection's workflow")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("n").longOpt("notify")
+                .desc("if sending submissions through the workflow, send notification emails")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("v").longOpt("validate")
+                .desc("test run - do not actually import items")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("x").longOpt("exclude-bitstreams")
+                .desc("do not load or expect content bitstreams")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("p").longOpt("template")
+                .desc("apply template")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("R").longOpt("resume")
+                .desc("resume a failed import (add only)")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("q").longOpt("quiet")
+                .desc("don't display metadata")
+                .hasArg(false).required(false).build());
+
+        options.addOption(Option.builder("h").longOpt("help")
+                .desc("help")
+                .hasArg(false).required(false).build());
+
+        return options;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLITool.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLITool.java
deleted file mode 100644
index afee478f9c..0000000000
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportCLITool.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.app.itemimport;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.dspace.app.itemimport.factory.ItemImportServiceFactory;
-import org.dspace.app.itemimport.service.ItemImportService;
-import org.dspace.content.Collection;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.core.Constants;
-import org.dspace.core.Context;
-import org.dspace.eperson.EPerson;
-import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.eperson.service.EPersonService;
-import org.dspace.handle.factory.HandleServiceFactory;
-import org.dspace.handle.service.HandleService;
-
-/**
- * Import items into DSpace. The conventional use is upload files by copying
- * them. DSpace writes the item's bitstreams into its assetstore. Metadata is
- * also loaded to the DSpace database.
- * <P>
- * A second use assumes the bitstream files already exist in a storage
- * resource accessible to DSpace. In this case the bitstreams are 'registered'.
- * That is, the metadata is loaded to the DSpace database and DSpace is given
- * the location of the file which is subsumed into DSpace.
- * <P>
- * The distinction is controlled by the format of lines in the 'contents' file.
- * See comments in processContentsFile() below.
- * <P>
- * Modified by David Little, UCSD Libraries 12/21/04 to
- * allow the registration of files (bitstreams) into DSpace.
- */
-public class ItemImportCLITool {
-
-    private static boolean template = false;
-
-    private static final CollectionService collectionService = ContentServiceFactory.getInstance()
-                                                                                    .getCollectionService();
-    private static final EPersonService epersonService = EPersonServiceFactory.getInstance().getEPersonService();
-    private static final HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
-
-    /**
-     * Default constructor
-     */
-    private ItemImportCLITool() { }
-
-    public static void main(String[] argv) throws Exception {
-        Date startTime = new Date();
-        int status = 0;
-
-        try {
-            // create an options object and populate it
-            CommandLineParser parser = new DefaultParser();
-
-            Options options = new Options();
-
-            options.addOption("a", "add", false, "add items to DSpace");
-            options.addOption("r", "replace", false, "replace items in mapfile");
-            options.addOption("d", "delete", false,
-                              "delete items listed in mapfile");
-            options.addOption("s", "source", true, "source of items (directory)");
-            options.addOption("z", "zip", true, "name of zip file");
-            options.addOption("c", "collection", true,
-                              "destination collection(s) Handle or database ID");
-            options.addOption("m", "mapfile", true, "mapfile items in mapfile");
-            options.addOption("e", "eperson", true,
-                              "email of eperson doing importing");
-            options.addOption("w", "workflow", false,
-                              "send submission through collection's workflow");
-            options.addOption("n", "notify", false,
-                              "if sending submissions through the workflow, send notification emails");
-            options.addOption("t", "test", false,
-                              "test run - do not actually import items");
-            options.addOption("p", "template", false, "apply template");
-            options.addOption("R", "resume", false,
-                              "resume a failed import (add only)");
-            options.addOption("q", "quiet", false, "don't display metadata");
-
-            options.addOption("h", "help", false, "help");
-
-            CommandLine line = parser.parse(options, argv);
-
-            String command = null; // add replace remove, etc
-            String sourcedir = null;
-            String mapfile = null;
-            String eperson = null; // db ID or email
-            String[] collections = null; // db ID or handles
-            boolean isTest = false;
-            boolean isResume = false;
-            boolean useWorkflow = false;
-            boolean useWorkflowSendEmail = false;
-            boolean isQuiet = false;
-
-            if (line.hasOption('h')) {
-                HelpFormatter myhelp = new HelpFormatter();
-                myhelp.printHelp("ItemImport\n", options);
-                System.out
-                    .println("\nadding items:    ItemImport -a -e eperson -c collection -s sourcedir -m mapfile");
-                System.out
-                    .println(
-                        "\nadding items from zip file:    ItemImport -a -e eperson -c collection -s sourcedir -z " +
-                            "filename.zip -m mapfile");
-                System.out
-                    .println("replacing items: ItemImport -r -e eperson -c collection -s sourcedir -m mapfile");
-                System.out
-                    .println("deleting items:  ItemImport -d -e eperson -m mapfile");
-                System.out
-                    .println(
-                        "If multiple collections are specified, the first collection will be the one that owns the " +
-                            "item.");
-
-                System.exit(0);
-            }
-
-            if (line.hasOption('a')) {
-                command = "add";
-            }
-
-            if (line.hasOption('r')) {
-                command = "replace";
-            }
-
-            if (line.hasOption('d')) {
-                command = "delete";
-            }
-
-            if (line.hasOption('w')) {
-                useWorkflow = true;
-                if (line.hasOption('n')) {
-                    useWorkflowSendEmail = true;
-                }
-            }
-
-            if (line.hasOption('t')) {
-                isTest = true;
-                System.out.println("**Test Run** - not actually importing items.");
-            }
-
-            if (line.hasOption('p')) {
-                template = true;
-            }
-
-            if (line.hasOption('s')) { // source
-                sourcedir = line.getOptionValue('s');
-            }
-
-            if (line.hasOption('m')) { // mapfile
-                mapfile = line.getOptionValue('m');
-            }
-
-            if (line.hasOption('e')) { // eperson
-                eperson = line.getOptionValue('e');
-            }
-
-            if (line.hasOption('c')) { // collections
-                collections = line.getOptionValues('c');
-            }
-
-            if (line.hasOption('R')) {
-                isResume = true;
-                System.out
-                    .println("**Resume import** - attempting to import items not already imported");
-            }
-
-            if (line.hasOption('q')) {
-                isQuiet = true;
-            }
-
-            boolean zip = false;
-            String zipfilename = "";
-            if (line.hasOption('z')) {
-                zip = true;
-                zipfilename = line.getOptionValue('z');
-            }
-
-            //By default assume collections will be given on the command line
-            boolean commandLineCollections = true;
-            // now validate
-            // must have a command set
-            if (command == null) {
-                System.out
-                    .println("Error - must run with either add, replace, or remove (run with -h flag for details)");
-                System.exit(1);
-            } else if ("add".equals(command) || "replace".equals(command)) {
-                if (sourcedir == null) {
-                    System.out
-                        .println("Error - a source directory containing items must be set");
-                    System.out.println(" (run with -h flag for details)");
-                    System.exit(1);
-                }
-
-                if (mapfile == null) {
-                    System.out
-                        .println("Error - a map file to hold importing results must be specified");
-                    System.out.println(" (run with -h flag for details)");
-                    System.exit(1);
-                }
-
-                if (eperson == null) {
-                    System.out
-                        .println("Error - an eperson to do the importing must be specified");
-                    System.out.println(" (run with -h flag for details)");
-                    System.exit(1);
-                }
-
-                if (collections == null) {
-                    System.out.println("No collections given. Assuming 'collections' file inside item directory");
-                    commandLineCollections = false;
-                }
-            } else if ("delete".equals(command)) {
-                if (eperson == null) {
-                    System.out
-                        .println("Error - an eperson to do the importing must be specified");
-                    System.exit(1);
-                }
-
-                if (mapfile == null) {
-                    System.out.println("Error - a map file must be specified");
-                    System.exit(1);
-                }
-            }
-
-            // can only resume for adds
-            if (isResume && !"add".equals(command)) {
-                System.out
-                    .println("Error - resume option only works with the --add command");
-                System.exit(1);
-            }
-
-            // do checks around mapfile - if mapfile exists and 'add' is selected,
-            // resume must be chosen
-            File myFile = new File(mapfile);
-
-            if (!isResume && "add".equals(command) && myFile.exists()) {
-                System.out.println("Error - the mapfile " + mapfile
-                                       + " already exists.");
-                System.out
-                    .println("Either delete it or use --resume if attempting to resume an aborted import.");
-                System.exit(1);
-            }
-
-            ItemImportService myloader = ItemImportServiceFactory.getInstance().getItemImportService();
-            myloader.setTest(isTest);
-            myloader.setResume(isResume);
-            myloader.setUseWorkflow(useWorkflow);
-            myloader.setUseWorkflowSendEmail(useWorkflowSendEmail);
-            myloader.setQuiet(isQuiet);
-
-            // create a context
-            Context c = new Context(Context.Mode.BATCH_EDIT);
-
-            // find the EPerson, assign to context
-            EPerson myEPerson = null;
-
-            if (eperson.indexOf('@') != -1) {
-                // @ sign, must be an email
-                myEPerson = epersonService.findByEmail(c, eperson);
-            } else {
-                myEPerson = epersonService.find(c, UUID.fromString(eperson));
-            }
-
-            if (myEPerson == null) {
-                System.out.println("Error, eperson cannot be found: " + eperson);
-                System.exit(1);
-            }
-
-            c.setCurrentUser(myEPerson);
-
-            // find collections
-            List<Collection> mycollections = null;
-
-            // don't need to validate collections set if command is "delete"
-            // also if no collections are given in the command line
-            if (!"delete".equals(command) && commandLineCollections) {
-                System.out.println("Destination collections:");
-
-                mycollections = new ArrayList<>();
-
-                // validate each collection arg to see if it's a real collection
-                for (int i = 0; i < collections.length; i++) {
-
-                    Collection resolved = null;
-
-                    if (collections[i] != null) {
-
-                        // is the ID a handle?
-                        if (collections[i].indexOf('/') != -1) {
-                            // string has a / so it must be a handle - try and resolve
-                            // it
-                            resolved = ((Collection) handleService
-                                .resolveToObject(c, collections[i]));
-
-                        } else {
-                            // not a handle, try and treat it as an integer collection database ID
-                            resolved = collectionService.find(c, UUID.fromString(collections[i]));
-
-                        }
-
-                    }
-
-                    // was the collection valid?
-                    if ((resolved == null)
-                            || (resolved.getType() != Constants.COLLECTION)) {
-                        throw new IllegalArgumentException("Cannot resolve "
-                                                               + collections[i] + " to collection");
-                    }
-
-                    // add resolved collection to list
-                    mycollections.add(resolved);
-
-                    // print progress info
-                    String owningPrefix = "";
-
-                    if (i == 0) {
-                        owningPrefix = "Owning ";
-                    }
-
-                    System.out.println(owningPrefix + " Collection: "
-                                           + resolved.getName());
-                }
-            } // end of validating collections
-
-            try {
-                // If this is a zip archive, unzip it first
-                if (zip) {
-                    sourcedir = myloader.unzip(sourcedir, zipfilename);
-                }
-
-
-                c.turnOffAuthorisationSystem();
-
-                if ("add".equals(command)) {
-                    myloader.addItems(c, mycollections, sourcedir, mapfile, template);
-                } else if ("replace".equals(command)) {
-                    myloader.replaceItems(c, mycollections, sourcedir, mapfile, template);
-                } else if ("delete".equals(command)) {
-                    myloader.deleteItems(c, mapfile);
-                }
-
-                // complete all transactions
-                c.complete();
-            } catch (Exception e) {
-                c.abort();
-                e.printStackTrace();
-                System.out.println(e);
-                status = 1;
-            }
-
-            // Delete the unzipped file
-            try {
-                if (zip) {
-                    System.gc();
-                    System.out.println(
-                        "Deleting temporary zip directory: " + myloader.getTempWorkDirFile().getAbsolutePath());
-                    myloader.cleanupZipTemp();
-                }
-            } catch (IOException ex) {
-                System.out.println("Unable to delete temporary zip archive location: " + myloader.getTempWorkDirFile()
-                                                                                                 .getAbsolutePath());
-            }
-
-
-            if (isTest) {
-                System.out.println("***End of Test Run***");
-            }
-        } finally {
-            Date endTime = new Date();
-            System.out.println("Started: " + startTime.getTime());
-            System.out.println("Ended: " + endTime.getTime());
-            System.out.println(
-                "Elapsed time: " + ((endTime.getTime() - startTime.getTime()) / 1000) + " secs (" + (endTime
-                    .getTime() - startTime.getTime()) + " msecs)");
-        }
-
-        System.exit(status);
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportScriptConfiguration.java
new file mode 100644
index 0000000000..a3149040c4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportScriptConfiguration.java
@@ -0,0 +1,103 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemimport;
+
+import java.io.InputStream;
+import java.sql.SQLException;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.core.Context;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * The {@link ScriptConfiguration} for the {@link ItemImport} script
+ *
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemImportScriptConfiguration<T extends ItemImport> extends ScriptConfiguration<T> {
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    private Class<T> dspaceRunnableClass;
+
+    @Override
+    public Class<T> getDspaceRunnableClass() {
+        return dspaceRunnableClass;
+    }
+
+    @Override
+    public void setDspaceRunnableClass(Class<T> dspaceRunnableClass) {
+        this.dspaceRunnableClass = dspaceRunnableClass;
+    }
+
+    @Override
+    public boolean isAllowedToExecute(final Context context) {
+        try {
+            return authorizeService.isAdmin(context);
+        } catch (SQLException e) {
+            throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
+        }
+    }
+
+    @Override
+    public Options getOptions() {
+        Options options = new Options();
+
+        options.addOption(Option.builder("a").longOpt("add")
+                .desc("add items to DSpace")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("r").longOpt("replace")
+                .desc("replace items in mapfile")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("d").longOpt("delete")
+                .desc("delete items listed in mapfile")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("z").longOpt("zip")
+                .desc("name of zip file")
+                .type(InputStream.class)
+                .hasArg().required().build());
+        options.addOption(Option.builder("c").longOpt("collection")
+                .desc("destination collection(s) Handle or database ID")
+                .hasArg().required(false).build());
+        options.addOption(Option.builder("m").longOpt("mapfile")
+                .desc("mapfile items in mapfile")
+                .type(InputStream.class)
+                .hasArg().required(false).build());
+        options.addOption(Option.builder("w").longOpt("workflow")
+                .desc("send submission through collection's workflow")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("n").longOpt("notify")
+                .desc("if sending submissions through the workflow, send notification emails")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("v").longOpt("validate")
+                .desc("test run - do not actually import items")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("x").longOpt("exclude-bitstreams")
+                .desc("do not load or expect content bitstreams")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("p").longOpt("template")
+                .desc("apply template")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("R").longOpt("resume")
+                .desc("resume a failed import (add only)")
+                .hasArg(false).required(false).build());
+        options.addOption(Option.builder("q").longOpt("quiet")
+                .desc("don't display metadata")
+                .hasArg(false).required(false).build());
+
+        options.addOption(Option.builder("h").longOpt("help")
+                .desc("help")
+                .hasArg(false).required(false).build());
+
+        return options;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
index 6a6a70d574..076cc8ebe2 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
@@ -51,6 +51,10 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.collections4.ComparatorUtils;
 import org.apache.commons.io.FileDeleteStrategy;
@@ -58,8 +62,8 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.xpath.XPathAPI;
 import org.dspace.app.itemimport.service.ItemImportService;
 import org.dspace.app.util.LocalSchemaFilenameFilter;
 import org.dspace.app.util.RelationshipUtils;
@@ -102,6 +106,7 @@ import org.dspace.eperson.Group;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.handle.service.HandleService;
+import org.dspace.scripts.handler.DSpaceRunnableHandler;
 import org.dspace.services.ConfigurationService;
 import org.dspace.workflow.WorkflowItem;
 import org.dspace.workflow.WorkflowService;
@@ -131,7 +136,9 @@ import org.xml.sax.SAXException;
  * allow the registration of files (bitstreams) into DSpace.
  */
 public class ItemImportServiceImpl implements ItemImportService, InitializingBean {
-    private final Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemImportServiceImpl.class);
+    private final Logger log = LogManager.getLogger();
+
+    private DSpaceRunnableHandler handler;
 
     @Autowired(required = true)
     protected AuthorizeService authorizeService;
@@ -175,6 +182,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
     protected String tempWorkDir;
 
     protected boolean isTest = false;
+    protected boolean isExcludeContent = false;
     protected boolean isResume = false;
     protected boolean useWorkflow = false;
     protected boolean useWorkflowSendEmail = false;
@@ -191,11 +199,13 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         if (!tempWorkDirFile.exists()) {
             boolean success = tempWorkDirFile.mkdir();
             if (success) {
-                log.info("Created org.dspace.app.batchitemimport.work.dir of: " + tempWorkDir);
+                logInfo("Created org.dspace.app.batchitemimport.work.dir of: " + tempWorkDir);
             } else {
-                log.error("Cannot create batch import directory! " + tempWorkDir);
+                logError("Cannot create batch import directory! " + tempWorkDir);
             }
         }
+        // clean work dir path from duplicate separators
+        tempWorkDir = StringUtils.replace(tempWorkDir, File.separator + File.separator, File.separator);
     }
 
     // File listing filter to look for metadata files
@@ -221,9 +231,9 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         try {
             addItems(c, mycollections, sourceDir, mapFile, template);
         } catch (Exception addException) {
-            log.error("AddItems encountered an error, will try to revert. Error: " + addException.getMessage());
+            logError("AddItems encountered an error, will try to revert. Error: " + addException.getMessage());
             deleteItems(c, mapFile);
-            log.info("Attempted to delete partial (errored) import");
+            logInfo("Attempted to delete partial (errored) import");
             throw addException;
         }
     }
@@ -241,10 +251,8 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
             itemFolderMap = new HashMap<>();
 
-            System.out.println("Adding items from directory: " + sourceDir);
-            log.debug("Adding items from directory: " + sourceDir);
-            System.out.println("Generating mapfile: " + mapFile);
-            log.debug("Generating mapfile: " + mapFile);
+            logDebug("Adding items from directory: " + sourceDir);
+            logDebug("Generating mapfile: " + mapFile);
 
             boolean directoryFileCollections = false;
             if (mycollections == null) {
@@ -261,16 +269,12 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                 // sneaky isResume == true means open file in append mode
                 outFile = new File(mapFile);
                 mapOut = new PrintWriter(new FileWriter(outFile, isResume));
-
-                if (mapOut == null) {
-                    throw new Exception("can't open mapfile: " + mapFile);
-                }
             }
 
             // open and process the source directory
             File d = new java.io.File(sourceDir);
 
-            if (d == null || !d.isDirectory()) {
+            if (!d.isDirectory()) {
                 throw new Exception("Error, cannot open source directory " + sourceDir);
             }
 
@@ -280,7 +284,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
             for (int i = 0; i < dircontents.length; i++) {
                 if (skipItems.containsKey(dircontents[i])) {
-                    System.out.println("Skipping import of " + dircontents[i]);
+                    logInfo("Skipping import of " + dircontents[i]);
 
                     //we still need the item in the map for relationship linking
                     String skippedHandle = skipItems.get(dircontents[i]);
@@ -294,13 +298,12 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                         try {
                             List<Collection> cols = processCollectionFile(c, path, "collections");
                             if (cols == null) {
-                                System.out
-                                    .println("No collections specified for item " + dircontents[i] + ". Skipping.");
+                                logError("No collections specified for item " + dircontents[i] + ". Skipping.");
                                 continue;
                             }
                             clist = cols;
                         } catch (IllegalArgumentException e) {
-                            System.out.println(e.getMessage() + " Skipping.");
+                            logError(e.getMessage() + " Skipping.");
                             continue;
                         }
                     } else {
@@ -312,7 +315,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     itemFolderMap.put(dircontents[i], item);
 
                     c.uncacheEntity(item);
-                    System.out.println(i + " " + dircontents[i]);
+                    logInfo(i + " " + dircontents[i]);
                 }
             }
 
@@ -354,7 +357,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     for (String itemIdentifier : identifierList) {
 
                         if (isTest) {
-                            System.out.println("\tAdding relationship (type: " + relationshipType +
+                            logInfo("\tAdding relationship (type: " + relationshipType +
                                 ") from " + folderName + " to " + itemIdentifier);
                             continue;
                         }
@@ -365,50 +368,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                             throw new Exception("Could not find item for " + itemIdentifier);
                         }
 
-                        //get entity type of entity and item
-                        String itemEntityType = getEntityType(item);
-                        String relatedEntityType = getEntityType(relationItem);
-
-                        //find matching relationship type
-                        List<RelationshipType> relTypes = relationshipTypeService.findByLeftwardOrRightwardTypeName(
-                            c, relationshipType);
-                        RelationshipType foundRelationshipType = RelationshipUtils.matchRelationshipType(
-                            relTypes, relatedEntityType, itemEntityType, relationshipType);
-
-                        if (foundRelationshipType == null) {
-                            throw new Exception("No Relationship type found for:\n" +
-                                "Target type: " + relatedEntityType + "\n" +
-                                "Origin referer type: " + itemEntityType + "\n" +
-                                "with typeName: " + relationshipType
-                            );
-                        }
-
-                        boolean left = false;
-                        if (foundRelationshipType.getLeftwardType().equalsIgnoreCase(relationshipType)) {
-                            left = true;
-                        }
-
-                        // Placeholder items for relation placing
-                        Item leftItem = null;
-                        Item rightItem = null;
-                        if (left) {
-                            leftItem = item;
-                            rightItem = relationItem;
-                        } else {
-                            leftItem = relationItem;
-                            rightItem = item;
-                        }
-
-                        // Create the relationship
-                        int leftPlace = relationshipService.findNextLeftPlaceByLeftItem(c, leftItem);
-                        int rightPlace = relationshipService.findNextRightPlaceByRightItem(c, rightItem);
-                        Relationship persistedRelationship = relationshipService.create(
-                            c, leftItem, rightItem, foundRelationshipType, leftPlace, rightPlace);
-                        // relationshipService.update(c, persistedRelationship);
-
-                        System.out.println("\tAdded relationship (type: " + relationshipType + ") from " +
-                            leftItem.getHandle() + " to " + rightItem.getHandle());
-
+                        addRelationship(c, item, relationItem, relationshipType);
                     }
 
                 }
@@ -419,25 +379,84 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
     }
 
+    /**
+     * Add relationship.
+     * @param c the context
+     * @param item the item
+     * @param relationItem the related item
+     * @param relationshipType the relation type name
+     * @throws SQLException
+     * @throws AuthorizeException
+     */
+    protected void addRelationship(Context c, Item item, Item relationItem, String relationshipType)
+            throws SQLException, AuthorizeException {
+        // get entity type of entity and item
+        String itemEntityType = getEntityType(item);
+        String relatedEntityType = getEntityType(relationItem);
+
+        // find matching relationship type
+        List<RelationshipType> relTypes = relationshipTypeService.findByLeftwardOrRightwardTypeName(
+            c, relationshipType);
+        RelationshipType foundRelationshipType = RelationshipUtils.matchRelationshipType(
+            relTypes, relatedEntityType, itemEntityType, relationshipType);
+
+        if (foundRelationshipType == null) {
+            throw new IllegalArgumentException("No Relationship type found for:\n" +
+                "Target type: " + relatedEntityType + "\n" +
+                "Origin referer type: " + itemEntityType + "\n" +
+                "with typeName: " + relationshipType
+            );
+        }
+
+        boolean left = false;
+        if (foundRelationshipType.getLeftwardType().equalsIgnoreCase(relationshipType)) {
+            left = true;
+        }
+
+        // placeholder items for relation placing
+        Item leftItem = null;
+        Item rightItem = null;
+        if (left) {
+            leftItem = item;
+            rightItem = relationItem;
+        } else {
+            leftItem = relationItem;
+            rightItem = item;
+        }
+
+        // Create the relationship, appending to the end
+        Relationship persistedRelationship = relationshipService.create(
+            c, leftItem, rightItem, foundRelationshipType, -1, -1
+        );
+        relationshipService.update(c, persistedRelationship);
+
+        logInfo("\tAdded relationship (type: " + relationshipType + ") from " +
+            leftItem.getHandle() + " to " + rightItem.getHandle());
+    }
+
     /**
      * Get the item's entity type from meta.
      * 
      * @param item
      * @return
      */
-    protected String getEntityType(Item item) throws Exception {
+    protected String getEntityType(Item item) {
         return itemService.getMetadata(item, "dspace", "entity", "type", Item.ANY).get(0).getValue();
     }
 
     /**
      * Read the relationship manifest file.
      * 
-     * Each line in the file contains a relationship type id and an item identifier in the following format:
-     * 
-     * relation.<relation_key> <handle|uuid|folderName:import_item_folder|schema.element[.qualifier]:value>
-     * 
-     * The input_item_folder should refer the folder name of another item in this import batch.
-     * 
+     * Each line in the file contains a relationship type id and an item
+     * identifier in the following format:
+     *
+     * <p>
+     * {@code relation.<relation_key> <handle|uuid|folderName:import_item_folder|schema.element[.qualifier]:value>}
+     *
+     * <p>
+     * The {@code input_item_folder} should refer the folder name of another
+     * item in this import batch.
+     *
      * @param path The main import folder path.
      * @param filename The name of the manifest file to check ('relationships')
      * @return Map of found relationships
@@ -450,7 +469,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
         if (file.exists()) {
 
-            System.out.println("\tProcessing relationships file: " + filename);
+            logInfo("\tProcessing relationships file: " + filename);
 
             BufferedReader br = null;
             try {
@@ -491,13 +510,13 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                 }
 
             } catch (FileNotFoundException e) {
-                System.out.println("\tNo relationships file found.");
+                logWarn("\tNo relationships file found.");
             } finally {
                 if (br != null) {
                     try {
                         br.close();
                     } catch (IOException e) {
-                        System.out.println("Non-critical problem releasing resources.");
+                        logError("Non-critical problem releasing resources.");
                     }
                 }
             }
@@ -541,25 +560,41 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
             }
 
-        } else if (itemIdentifier.indexOf('/') != -1) {
-            //resolve by handle
-            return (Item) handleService.resolveToObject(c, itemIdentifier);
-
-        } else {
-            //try to resolve by UUID
-            return itemService.findByIdOrLegacyId(c, itemIdentifier);
         }
 
-        return null;
+        // resolve item by handle or UUID
+        return resolveItem(c, itemIdentifier);
 
     }
 
+    /**
+     * Resolve an item identifier.
+     * 
+     * @param c Context
+     * @param itemIdentifier The identifier string found in the import file (handle or UUID)
+     * @return Item if found, or null.
+     * @throws SQLException
+     * @throws IllegalStateException
+     * @throws Exception
+     */
+    protected Item resolveItem(Context c, String itemIdentifier)
+            throws IllegalStateException, SQLException {
+        if (itemIdentifier.indexOf('/') != -1) {
+            // resolve by handle
+            return (Item) handleService.resolveToObject(c, itemIdentifier);
+        }
+
+        // resolve by UUID
+        return itemService.findByIdOrLegacyId(c, itemIdentifier);
+    }
+
     /**
      * Lookup an item by a (unique) meta value.
      * 
-     * @param metaKey
-     * @param metaValue
-     * @return Item
+     * @param c current DSpace session.
+     * @param metaKey name of the metadata field to match.
+     * @param metaValue value to be matched.
+     * @return the matching Item.
      * @throws Exception if single item not found.
      */
     protected Item findItemByMetaValue(Context c, String metaKey, String metaValue) throws Exception {
@@ -603,7 +638,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         // verify the source directory
         File d = new java.io.File(sourceDir);
 
-        if (d == null || !d.isDirectory()) {
+        if (!d.isDirectory()) {
             throw new Exception("Error, cannot open source directory "
                                     + sourceDir);
         }
@@ -621,7 +656,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
             Item oldItem = null;
 
             if (oldHandle.indexOf('/') != -1) {
-                System.out.println("\tReplacing:  " + oldHandle);
+                logInfo("\tReplacing:  " + oldHandle);
 
                 // add new item, locate old one
                 oldItem = (Item) handleService.resolveToObject(c, oldHandle);
@@ -642,10 +677,6 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
             File handleFile = new File(sourceDir + File.separatorChar + newItemName + File.separatorChar + "handle");
             PrintWriter handleOut = new PrintWriter(new FileWriter(handleFile, true));
 
-            if (handleOut == null) {
-                throw new Exception("can't open handle file: " + handleFile.getCanonicalPath());
-            }
-
             handleOut.println(oldHandle);
             handleOut.close();
 
@@ -658,7 +689,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
     @Override
     public void deleteItems(Context c, String mapFile) throws Exception {
-        System.out.println("Deleting items listed in mapfile: " + mapFile);
+        logInfo("Deleting items listed in mapfile: " + mapFile);
 
         // read in the mapfile
         Map<String, String> myhash = readMapFile(mapFile);
@@ -671,12 +702,12 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
             if (itemID.indexOf('/') != -1) {
                 String myhandle = itemID;
-                System.out.println("Deleting item " + myhandle);
+                logInfo("Deleting item " + myhandle);
                 deleteItem(c, myhandle);
             } else {
                 // it's an ID
                 Item myitem = itemService.findByIdOrLegacyId(c, itemID);
-                System.out.println("Deleting item " + itemID);
+                logInfo("Deleting item " + itemID);
                 deleteItem(c, myitem);
                 c.uncacheEntity(myitem);
             }
@@ -699,8 +730,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                            String itemname, PrintWriter mapOut, boolean template) throws Exception {
         String mapOutputString = null;
 
-        System.out.println("Adding item from directory " + itemname);
-        log.debug("adding item from directory " + itemname);
+        logDebug("adding item from directory " + itemname);
 
         // create workspace item
         Item myitem = null;
@@ -747,7 +777,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     installItemService.installItem(c, wi, myhandle);
                 } catch (Exception e) {
                     workspaceItemService.deleteAll(c, wi);
-                    log.error("Exception after install item, try to revert...", e);
+                    logError("Exception after install item, try to revert...", e);
                     throw e;
                 }
 
@@ -759,7 +789,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
             // set permissions if specified in contents file
             if (options.size() > 0) {
-                System.out.println("Processing options");
+                logInfo("Processing options");
                 processOptions(c, myitem, options);
             }
         }
@@ -810,7 +840,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         Item myitem = (Item) handleService.resolveToObject(c, myhandle);
 
         if (myitem == null) {
-            System.out.println("Error - cannot locate item - already deleted?");
+            logError("Error - cannot locate item - already deleted?");
         } else {
             deleteItem(c, myitem);
             c.uncacheEntity(myitem);
@@ -863,7 +893,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
     // Load all metadata schemas into the item.
     protected void loadMetadata(Context c, Item myitem, String path)
         throws SQLException, IOException, ParserConfigurationException,
-        SAXException, TransformerException, AuthorizeException {
+        SAXException, TransformerException, AuthorizeException, XPathExpressionException {
         // Load the dublin core metadata
         loadDublinCore(c, myitem, path + "dublin_core.xml");
 
@@ -877,14 +907,15 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
     protected void loadDublinCore(Context c, Item myitem, String filename)
         throws SQLException, IOException, ParserConfigurationException,
-        SAXException, TransformerException, AuthorizeException {
+        SAXException, TransformerException, AuthorizeException, XPathExpressionException {
         Document document = loadXML(filename);
 
         // Get the schema, for backward compatibility we will default to the
         // dublin core schema if the schema name is not available in the import
         // file
         String schema;
-        NodeList metadata = XPathAPI.selectNodeList(document, "/dublin_core");
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        NodeList metadata = (NodeList) xPath.compile("/dublin_core").evaluate(document, XPathConstants.NODESET);
         Node schemaAttr = metadata.item(0).getAttributes().getNamedItem(
             "schema");
         if (schemaAttr == null) {
@@ -894,11 +925,10 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         }
 
         // Get the nodes corresponding to formats
-        NodeList dcNodes = XPathAPI.selectNodeList(document,
-                                                   "/dublin_core/dcvalue");
+        NodeList dcNodes = (NodeList) xPath.compile("/dublin_core/dcvalue").evaluate(document, XPathConstants.NODESET);
 
         if (!isQuiet) {
-            System.out.println("\tLoading dublin core from " + filename);
+            logInfo("\tLoading dublin core from " + filename);
         }
 
         // Add each one as a new format to the registry
@@ -928,7 +958,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         }
 
         if (!isQuiet) {
-            System.out.println("\tSchema: " + schema + " Element: " + element + " Qualifier: " + qualifier
+            logInfo("\tSchema: " + schema + " Element: " + element + " Qualifier: " + qualifier
                                    + " Value: " + value);
         }
 
@@ -937,20 +967,28 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         }
         // only add metadata if it is no test and there is an actual value
         if (!isTest && !value.equals("")) {
-            itemService.addMetadata(c, i, schema, element, qualifier, language, value);
+            if (StringUtils.equals(schema, MetadataSchemaEnum.RELATION.getName())) {
+                Item relationItem = resolveItem(c, value);
+                if (relationItem == null) {
+                    throw new IllegalArgumentException("No item found with id=" + value);
+                }
+                addRelationship(c, i, relationItem, element);
+            } else {
+                itemService.addMetadata(c, i, schema, element, qualifier, language, value);
+            }
         } else {
             // If we're just test the import, let's check that the actual metadata field exists.
             MetadataSchema foundSchema = metadataSchemaService.find(c, schema);
 
             if (foundSchema == null) {
-                System.out.println("ERROR: schema '" + schema + "' was not found in the registry.");
+                logError("ERROR: schema '" + schema + "' was not found in the registry.");
                 return;
             }
 
             MetadataField foundField = metadataFieldService.findByElement(c, foundSchema, element, qualifier);
 
             if (foundField == null) {
-                System.out.println(
+                logError(
                     "ERROR: Metadata field: '" + schema + "." + element + "." + qualifier + "' was not found in the " +
                         "registry.");
                 return;
@@ -977,7 +1015,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         File file = new File(path + File.separatorChar + filename);
         ArrayList<Collection> collections = new ArrayList<>();
         List<Collection> result = null;
-        System.out.println("Processing collections file: " + filename);
+        logInfo("Processing collections file: " + filename);
 
         if (file.exists()) {
             BufferedReader br = null;
@@ -1004,13 +1042,13 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
                 result = collections;
             } catch (FileNotFoundException e) {
-                System.out.println("No collections file found.");
+                logWarn("No collections file found.");
             } finally {
                 if (br != null) {
                     try {
                         br.close();
                     } catch (IOException e) {
-                        System.out.println("Non-critical problem releasing resources.");
+                        logError("Non-critical problem releasing resources.");
                     }
                 }
             }
@@ -1032,7 +1070,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         File file = new File(path + File.separatorChar + filename);
         String result = null;
 
-        System.out.println("Processing handle file: " + filename);
+        logInfo("Processing handle file: " + filename);
         if (file.exists()) {
             BufferedReader is = null;
             try {
@@ -1041,14 +1079,14 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                 // result gets contents of file, or null
                 result = is.readLine();
 
-                System.out.println("read handle: '" + result + "'");
+                logInfo("read handle: '" + result + "'");
 
             } catch (FileNotFoundException e) {
                 // probably no handle file, just return null
-                System.out.println("It appears there is no handle file -- generating one");
+                logWarn("It appears there is no handle file -- generating one");
             } catch (IOException e) {
                 // probably no handle file, just return null
-                System.out.println("It appears there is no handle file -- generating one");
+                logWarn("It appears there is no handle file -- generating one");
             } finally {
                 if (is != null) {
                     try {
@@ -1060,7 +1098,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
             }
         } else {
             // probably no handle file, just return null
-            System.out.println("It appears there is no handle file -- generating one");
+            logWarn("It appears there is no handle file -- generating one");
         }
 
         return result;
@@ -1087,7 +1125,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         String line = "";
         List<String> options = new ArrayList<>();
 
-        System.out.println("\tProcessing contents file: " + contentsFile);
+        logInfo("\tProcessing contents file: " + contentsFile);
 
         if (contentsFile.exists()) {
             BufferedReader is = null;
@@ -1134,8 +1172,8 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                             }
                         } // while
                         if (iAssetstore == -1 || sFilePath == null) {
-                            System.out.println("\tERROR: invalid contents file line");
-                            System.out.println("\t\tSkipping line: "
+                            logError("\tERROR: invalid contents file line");
+                            logInfo("\t\tSkipping line: "
                                 + sRegistrationLine);
                             continue;
                         }
@@ -1159,7 +1197,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                         }
 
                         registerBitstream(c, i, iAssetstore, sFilePath, sBundle, sDescription);
-                        System.out.println("\tRegistering Bitstream: " + sFilePath
+                        logInfo("\tRegistering Bitstream: " + sFilePath
                             + "\tAssetstore: " + iAssetstore
                             + "\tBundle: " + sBundle
                             + "\tDescription: " + sDescription);
@@ -1171,7 +1209,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     if (bitstreamEndIndex == -1) {
                         // no extra info
                         processContentFileEntry(c, i, path, line, null, false);
-                        System.out.println("\tBitstream: " + line);
+                        logInfo("\tBitstream: " + line);
                     } else {
 
                         String bitstreamName = line.substring(0, bitstreamEndIndex);
@@ -1283,17 +1321,17 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                                 + bundleMarker.length(), bEndIndex).trim();
 
                             processContentFileEntry(c, i, path, bitstreamName, bundleName, primary);
-                            System.out.println("\tBitstream: " + bitstreamName +
+                            logInfo("\tBitstream: " + bitstreamName +
                                 "\tBundle: " + bundleName +
                                 primaryStr);
                         } else {
                             processContentFileEntry(c, i, path, bitstreamName, null, primary);
-                            System.out.println("\tBitstream: " + bitstreamName + primaryStr);
+                            logInfo("\tBitstream: " + bitstreamName + primaryStr);
                         }
 
                         if (permissionsExist || descriptionExists || labelExists || heightExists
                             || widthExists || tocExists) {
-                            System.out.println("Gathering options.");
+                            logInfo("Gathering options.");
                             String extraInfo = bitstreamName;
 
                             if (permissionsExist) {
@@ -1340,12 +1378,12 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
             String[] dirListing = dir.list();
             for (String fileName : dirListing) {
                 if (!"dublin_core.xml".equals(fileName) && !fileName.equals("handle") && !metadataFileFilter
-                    .accept(dir, fileName)) {
+                    .accept(dir, fileName) && !"collections".equals(fileName) && !"relationships".equals(fileName)) {
                     throw new FileNotFoundException("No contents file found");
                 }
             }
 
-            System.out.println("No contents file found - but only metadata files found. Assuming metadata only.");
+            logInfo("No contents file found - but only metadata files found. Assuming metadata only.");
         }
 
         return options;
@@ -1367,6 +1405,10 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
     protected void processContentFileEntry(Context c, Item i, String path,
                                            String fileName, String bundleName, boolean primary) throws SQLException,
         IOException, AuthorizeException {
+        if (isExcludeContent) {
+            return;
+        }
+
         String fullpath = path + File.separatorChar + fileName;
 
         // get an input stream
@@ -1507,9 +1549,9 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
      */
     protected void processOptions(Context c, Item myItem, List<String> options)
         throws SQLException, AuthorizeException {
-        System.out.println("Processing options.");
+        logInfo("Processing options.");
         for (String line : options) {
-            System.out.println("\tprocessing " + line);
+            logInfo("\tprocessing " + line);
 
             boolean permissionsExist = false;
             boolean descriptionExists = false;
@@ -1626,7 +1668,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                 try {
                     myGroup = groupService.findByName(c, groupName);
                 } catch (SQLException sqle) {
-                    System.out.println("SQL Exception finding group name: "
+                    logError("SQL Exception finding group name: "
                         + groupName);
                     // do nothing, will check for null group later
                 }
@@ -1667,42 +1709,41 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                               .trim();
             }
 
+            if (isTest) {
+                continue;
+            }
+
             Bitstream bs = null;
-            boolean notfound = true;
             boolean updateRequired = false;
 
-            if (!isTest) {
-                // find bitstream
-                List<Bitstream> bitstreams = itemService.getNonInternalBitstreams(c, myItem);
-                for (int j = 0; j < bitstreams.size() && notfound; j++) {
-                    if (bitstreams.get(j).getName().equals(bitstreamName)) {
-                        bs = bitstreams.get(j);
-                        notfound = false;
-                    }
+            // find bitstream
+            List<Bitstream> bitstreams = itemService.getNonInternalBitstreams(c, myItem);
+            for (Bitstream bitstream : bitstreams) {
+                if (bitstream.getName().equals(bitstreamName)) {
+                    bs = bitstream;
+                    break;
                 }
             }
 
-            if (notfound && !isTest) {
+            if (null == bs) {
                 // this should never happen
-                System.out.println("\tdefault permissions set for "
-                    + bitstreamName);
-            } else if (!isTest) {
+                logInfo("\tdefault permissions set for " + bitstreamName);
+            } else {
                 if (permissionsExist) {
                     if (myGroup == null) {
-                        System.out.println("\t" + groupName
+                        logInfo("\t" + groupName
                             + " not found, permissions set to default");
                     } else if (actionID == -1) {
-                        System.out
-                            .println("\tinvalid permissions flag, permissions set to default");
+                        logInfo("\tinvalid permissions flag, permissions set to default");
                     } else {
-                        System.out.println("\tSetting special permissions for "
+                        logInfo("\tSetting special permissions for "
                             + bitstreamName);
                         setPermission(c, myGroup, actionID, bs);
                     }
                 }
 
                 if (descriptionExists) {
-                    System.out.println("\tSetting description for "
+                    logInfo("\tSetting description for "
                         + bitstreamName);
                     bs.setDescription(c, thisDescription);
                     updateRequired = true;
@@ -1711,7 +1752,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                 if (labelExists) {
                     MetadataField metadataField = metadataFieldService
                         .findByElement(c, METADATA_IIIF_SCHEMA, METADATA_IIIF_LABEL_ELEMENT, null);
-                    System.out.println("\tSetting label to " + thisLabel + " in element "
+                    logInfo("\tSetting label to " + thisLabel + " in element "
                         + metadataField.getElement() + " on " + bitstreamName);
                     bitstreamService.addMetadata(c, bs, metadataField, null, thisLabel);
                     updateRequired = true;
@@ -1721,7 +1762,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     MetadataField metadataField = metadataFieldService
                         .findByElement(c, METADATA_IIIF_SCHEMA, METADATA_IIIF_IMAGE_ELEMENT,
                             METADATA_IIIF_HEIGHT_QUALIFIER);
-                    System.out.println("\tSetting height to " + thisHeight + " in element "
+                    logInfo("\tSetting height to " + thisHeight + " in element "
                         + metadataField.getElement() + " on " + bitstreamName);
                     bitstreamService.addMetadata(c, bs, metadataField, null, thisHeight);
                     updateRequired = true;
@@ -1730,7 +1771,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     MetadataField metadataField = metadataFieldService
                         .findByElement(c, METADATA_IIIF_SCHEMA, METADATA_IIIF_IMAGE_ELEMENT,
                             METADATA_IIIF_WIDTH_QUALIFIER);
-                    System.out.println("\tSetting width to " + thisWidth + " in element "
+                    logInfo("\tSetting width to " + thisWidth + " in element "
                         + metadataField.getElement() + " on " + bitstreamName);
                     bitstreamService.addMetadata(c, bs, metadataField, null, thisWidth);
                     updateRequired = true;
@@ -1738,7 +1779,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                 if (tocExists) {
                     MetadataField metadataField = metadataFieldService
                         .findByElement(c, METADATA_IIIF_SCHEMA, METADATA_IIIF_TOC_ELEMENT, null);
-                    System.out.println("\tSetting toc to " + thisToc + " in element "
+                    logInfo("\tSetting toc to " + thisToc + " in element "
                         + metadataField.getElement() + " on " + bitstreamName);
                     bitstreamService.addMetadata(c, bs, metadataField, null, thisToc);
                     updateRequired = true;
@@ -1777,9 +1818,9 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
             resourcePolicyService.update(c, rp);
         } else {
             if (actionID == Constants.READ) {
-                System.out.println("\t\tpermissions: READ for " + g.getName());
+                logInfo("\t\tpermissions: READ for " + g.getName());
             } else if (actionID == Constants.WRITE) {
-                System.out.println("\t\tpermissions: WRITE for " + g.getName());
+                logInfo("\t\tpermissions: WRITE for " + g.getName());
             }
         }
 
@@ -1860,7 +1901,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     deleteDirectory(files[i]);
                 } else {
                     if (!files[i].delete()) {
-                        log.error("Unable to delete file: " + files[i].getName());
+                        logError("Unable to delete file: " + files[i].getName());
                     }
                 }
             }
@@ -1880,7 +1921,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         // 2
         // does the zip file exist and can we write to the temp directory
         if (!zipfile.canRead()) {
-            log.error("Zip file '" + zipfile.getAbsolutePath() + "' does not exist, or is not readable.");
+            logError("Zip file '" + zipfile.getAbsolutePath() + "' does not exist, or is not readable.");
         }
 
         String destinationDir = destDir;
@@ -1890,13 +1931,13 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
         File tempdir = new File(destinationDir);
         if (!tempdir.isDirectory()) {
-            log.error("'" + configurationService.getProperty("org.dspace.app.itemexport.work.dir") +
-                          "' as defined by the key 'org.dspace.app.itemexport.work.dir' in dspace.cfg " +
+            logError("'" + configurationService.getProperty("org.dspace.app.batchitemimport.work.dir") +
+                          "' as defined by the key 'org.dspace.app.batchitemimport.work.dir' in dspace.cfg " +
                           "is not a valid directory");
         }
 
         if (!tempdir.exists() && !tempdir.mkdirs()) {
-            log.error("Unable to create temporary directory: " + tempdir.getAbsolutePath());
+            logError("Unable to create temporary directory: " + tempdir.getAbsolutePath());
         }
         String sourcedir = destinationDir + System.getProperty("file.separator") + zipfile.getName();
         String zipDir = destinationDir + System.getProperty("file.separator") + zipfile.getName() + System
@@ -1908,71 +1949,71 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         ZipFile zf = new ZipFile(zipfile);
         ZipEntry entry;
         Enumeration<? extends ZipEntry> entries = zf.entries();
-        while (entries.hasMoreElements()) {
-            entry = entries.nextElement();
-            if (entry.isDirectory()) {
-                if (!new File(zipDir + entry.getName()).mkdirs()) {
-                    log.error("Unable to create contents directory: " + zipDir + entry.getName());
-                }
-            } else {
-                String entryName = entry.getName();
-                File outFile = new File(zipDir + entryName);
-                // Verify that this file will be extracted into our zipDir (and not somewhere else!)
-                if (!outFile.toPath().normalize().startsWith(zipDir)) {
-                    throw new IOException("Bad zip entry: '" + entryName
-                                              + "' in file '" + zipfile.getAbsolutePath() + "'!"
-                                              + " Cannot process this file.");
-                } else {
-                    System.out.println("Extracting file: " + entryName);
-                    log.info("Extracting file: " + entryName);
-
-                    int index = entryName.lastIndexOf('/');
-                    if (index == -1) {
-                        // Was it created on Windows instead?
-                        index = entryName.lastIndexOf('\\');
+        try {
+            while (entries.hasMoreElements()) {
+                entry = entries.nextElement();
+                if (entry.isDirectory()) {
+                    if (!new File(zipDir + entry.getName()).mkdirs()) {
+                        logError("Unable to create contents directory: " + zipDir + entry.getName());
                     }
-                    if (index > 0) {
-                        File dir = new File(zipDir + entryName.substring(0, index));
-                        if (!dir.exists() && !dir.mkdirs()) {
-                            log.error("Unable to create directory: " + dir.getAbsolutePath());
+                } else {
+                    String entryName = entry.getName();
+                    File outFile = new File(zipDir + entryName);
+                    // Verify that this file will be extracted into our zipDir (and not somewhere else!)
+                    if (!outFile.toPath().normalize().startsWith(zipDir)) {
+                        throw new IOException("Bad zip entry: '" + entryName
+                                                  + "' in file '" + zipfile.getAbsolutePath() + "'!"
+                                                  + " Cannot process this file.");
+                    } else {
+                        logInfo("Extracting file: " + entryName);
+
+                        int index = entryName.lastIndexOf('/');
+                        if (index == -1) {
+                            // Was it created on Windows instead?
+                            index = entryName.lastIndexOf('\\');
                         }
+                        if (index > 0) {
+                            File dir = new File(zipDir + entryName.substring(0, index));
+                            if (!dir.exists() && !dir.mkdirs()) {
+                                logError("Unable to create directory: " + dir.getAbsolutePath());
+                            }
 
-                        //Entries could have too many directories, and we need to adjust the sourcedir
-                        // file1.zip (SimpleArchiveFormat / item1 / contents|dublin_core|...
-                        //            SimpleArchiveFormat / item2 / contents|dublin_core|...
-                        // or
-                        // file2.zip (item1 / contents|dublin_core|...
-                        //            item2 / contents|dublin_core|...
+                            //Entries could have too many directories, and we need to adjust the sourcedir
+                            // file1.zip (SimpleArchiveFormat / item1 / contents|dublin_core|...
+                            //            SimpleArchiveFormat / item2 / contents|dublin_core|...
+                            // or
+                            // file2.zip (item1 / contents|dublin_core|...
+                            //            item2 / contents|dublin_core|...
 
-                        //regex supports either windows or *nix file paths
-                        String[] entryChunks = entryName.split("/|\\\\");
-                        if (entryChunks.length > 2) {
-                            if (StringUtils.equals(sourceDirForZip, sourcedir)) {
-                                sourceDirForZip = sourcedir + "/" + entryChunks[0];
+                            //regex supports either windows or *nix file paths
+                            String[] entryChunks = entryName.split("/|\\\\");
+                            if (entryChunks.length > 2) {
+                                if (StringUtils.equals(sourceDirForZip, sourcedir)) {
+                                    sourceDirForZip = sourcedir + "/" + entryChunks[0];
+                                }
                             }
                         }
+                        byte[] buffer = new byte[1024];
+                        int len;
+                        InputStream in = zf.getInputStream(entry);
+                        BufferedOutputStream out = new BufferedOutputStream(
+                            new FileOutputStream(outFile));
+                        while ((len = in.read(buffer)) >= 0) {
+                            out.write(buffer, 0, len);
+                        }
+                        in.close();
+                        out.close();
                     }
-                    byte[] buffer = new byte[1024];
-                    int len;
-                    InputStream in = zf.getInputStream(entry);
-                    BufferedOutputStream out = new BufferedOutputStream(
-                        new FileOutputStream(outFile));
-                    while ((len = in.read(buffer)) >= 0) {
-                        out.write(buffer, 0, len);
-                    }
-                    in.close();
-                    out.close();
                 }
             }
+        } finally {
+            //Close zip file
+            zf.close();
         }
 
-        //Close zip file
-        zf.close();
-
         if (!StringUtils.equals(sourceDirForZip, sourcedir)) {
             sourcedir = sourceDirForZip;
-            System.out.println("Set sourceDir using path inside of Zip: " + sourcedir);
-            log.info("Set sourceDir using path inside of Zip: " + sourcedir);
+            logInfo("Set sourceDir using path inside of Zip: " + sourcedir);
         }
 
         return sourcedir;
@@ -2022,20 +2063,15 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         final String theFilePath = filepath;
         final String theInputType = inputType;
         final String theResumeDir = resumeDir;
-        final boolean useTemplateItem = template;
 
         Thread go = new Thread() {
             @Override
             public void run() {
-                Context context = null;
-
+                Context context = new Context();
                 String importDir = null;
                 EPerson eperson = null;
 
                 try {
-
-                    // create a new dspace context
-                    context = new Context();
                     eperson = ePersonService.find(context, oldEPerson.getID());
                     context.setCurrentUser(eperson);
                     context.turnOffAuthorisationSystem();
@@ -2046,7 +2082,8 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     if (theOtherCollections != null) {
                         for (String colID : theOtherCollections) {
                             UUID colId = UUID.fromString(colID);
-                            if (!theOwningCollection.getID().equals(colId)) {
+                            if (theOwningCollection != null
+                                    && !theOwningCollection.getID().equals(colId)) {
                                 Collection col = collectionService.find(context, colId);
                                 if (col != null) {
                                     collectionList.add(col);
@@ -2065,7 +2102,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                     if (!importDirFile.exists()) {
                         boolean success = importDirFile.mkdirs();
                         if (!success) {
-                            log.info("Cannot create batch import directory!");
+                            logInfo("Cannot create batch import directory!");
                             throw new Exception("Cannot create batch import directory!");
                         }
                     }
@@ -2197,14 +2234,14 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
             email.send();
         } catch (Exception e) {
-            log.warn(LogHelper.getHeader(context, "emailSuccessMessage", "cannot notify user of import"), e);
+            logError(LogHelper.getHeader(context, "emailSuccessMessage", "cannot notify user of import"), e);
         }
     }
 
     @Override
     public void emailErrorMessage(EPerson eperson, String error)
         throws MessagingException {
-        log.warn("An error occurred during item import, the user will be notified. " + error);
+        logError("An error occurred during item import, the user will be notified. " + error);
         try {
             Locale supportedLocale = I18nUtil.getEPersonLocale(eperson);
             Email email = Email.getEmail(I18nUtil.getEmailFilename(supportedLocale, "bte_batch_import_error"));
@@ -2214,7 +2251,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
             email.send();
         } catch (Exception e) {
-            log.warn("error during item import error notification", e);
+            logError("error during item import error notification", e);
         }
     }
 
@@ -2292,18 +2329,17 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                                           + tempDirFile.getAbsolutePath()
                                           + " could not be created.");
             } else {
-                log.debug("Created directory " + tempDirFile.getAbsolutePath());
+                logDebug("Created directory " + tempDirFile.getAbsolutePath());
             }
         } else {
-            log.debug("Work directory exists:  " + tempDirFile.getAbsolutePath());
+            logDebug("Work directory exists:  " + tempDirFile.getAbsolutePath());
         }
         return tempDirFile;
     }
 
     @Override
     public void cleanupZipTemp() {
-        System.out.println("Deleting temporary zip directory: " + tempWorkDir);
-        log.debug("Deleting temporary zip directory: " + tempWorkDir);
+        logDebug("Deleting temporary zip directory: " + tempWorkDir);
         deleteDirectory(new File(tempWorkDir));
     }
 
@@ -2312,6 +2348,11 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         this.isTest = isTest;
     }
 
+    @Override
+    public void setExcludeContent(boolean isExcludeContent) {
+        this.isExcludeContent = isExcludeContent;
+    }
+
     @Override
     public void setResume(boolean isResume) {
         this.isResume = isResume;
@@ -2332,4 +2373,81 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         this.isQuiet = isQuiet;
     }
 
+    @Override
+    public void setHandler(DSpaceRunnableHandler handler) {
+        this.handler = handler;
+    }
+
+    private void logInfo(String message) {
+        logInfo(message, null);
+    }
+
+    private void logInfo(String message, Exception e) {
+        if (handler != null) {
+            handler.logInfo(message);
+            return;
+        }
+
+        if (e != null) {
+            log.info(message, e);
+        } else {
+            log.info(message);
+        }
+    }
+
+    private void logDebug(String message) {
+        logDebug(message, null);
+    }
+
+    private void logDebug(String message, Exception e) {
+        if (handler != null) {
+            handler.logDebug(message);
+            return;
+        }
+
+        if (e != null) {
+            log.debug(message, e);
+        } else {
+            log.debug(message);
+        }
+    }
+
+    private void logWarn(String message) {
+        logWarn(message, null);
+    }
+
+    private void logWarn(String message, Exception e) {
+        if (handler != null) {
+            handler.logWarning(message);
+            return;
+        }
+
+        if (e != null) {
+            log.warn(message, e);
+        } else {
+            log.warn(message);
+        }
+    }
+
+    private void logError(String message) {
+        logError(message, null);
+    }
+
+    private void logError(String message, Exception e) {
+        if (handler != null) {
+            if (e != null) {
+                handler.logError(message, e);
+            } else {
+                handler.logError(message);
+            }
+            return;
+        }
+
+        if (e != null) {
+            log.error(message, e);
+        } else {
+            log.error(message);
+        }
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java b/dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java
index 2d648e2416..e99ece31b9 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java
@@ -16,6 +16,7 @@ import org.dspace.app.itemimport.BatchUpload;
 import org.dspace.content.Collection;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.scripts.handler.DSpaceRunnableHandler;
 
 /**
  * Import items into DSpace. The conventional use is upload files by copying
@@ -210,6 +211,13 @@ public interface ItemImportService {
      */
     public void setTest(boolean isTest);
 
+    /**
+     * Set exclude-content flag.
+     *
+     * @param isExcludeContent true or false
+     */
+    public void setExcludeContent(boolean isExcludeContent);
+
     /**
      * Set resume flag
      *
@@ -235,4 +243,10 @@ public interface ItemImportService {
      * @param isQuiet true or false
      */
     public void setQuiet(boolean isQuiet);
+
+    /**
+     * Set the DSpace Runnable Handler
+     * @param handler
+     */
+    public void setHandler(DSpaceRunnableHandler handler);
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/itemupdate/AddBitstreamsAction.java b/dspace-api/src/main/java/org/dspace/app/itemupdate/AddBitstreamsAction.java
index e9693fb3d1..644745304a 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemupdate/AddBitstreamsAction.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemupdate/AddBitstreamsAction.java
@@ -77,7 +77,7 @@ public class AddBitstreamsAction extends UpdateBitstreamsAction {
         ItemUpdate.pr("Contents bitstream count: " + contents.size());
 
         String[] files = dir.list(ItemUpdate.fileFilter);
-        List<String> fileList = new ArrayList<String>();
+        List<String> fileList = new ArrayList<>();
         for (String filename : files) {
             fileList.add(filename);
             ItemUpdate.pr("file: " + filename);
@@ -134,9 +134,6 @@ public class AddBitstreamsAction extends UpdateBitstreamsAction {
         ItemUpdate.pr("contents entry for bitstream: " + ce.toString());
         File f = new File(dir, ce.filename);
 
-        // get an input stream
-        BufferedInputStream bis = new BufferedInputStream(new FileInputStream(f));
-
         Bitstream bs = null;
         String newBundleName = ce.bundlename;
 
@@ -173,7 +170,9 @@ public class AddBitstreamsAction extends UpdateBitstreamsAction {
                 targetBundle = bundles.iterator().next();
             }
 
-            bs = bitstreamService.create(context, targetBundle, bis);
+            try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(f));) {
+                bs = bitstreamService.create(context, targetBundle, bis);
+            }
             bs.setName(context, ce.filename);
 
             // Identify the format
diff --git a/dspace-api/src/main/java/org/dspace/app/itemupdate/ItemUpdate.java b/dspace-api/src/main/java/org/dspace/app/itemupdate/ItemUpdate.java
index b6aa875f29..a3fe0b2321 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemupdate/ItemUpdate.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemupdate/ItemUpdate.java
@@ -39,29 +39,34 @@ import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
 
 /**
- * Provides some batch editing capabilities for items in DSpace:
- * Metadata fields - Add, Delete
- * Bitstreams - Add, Delete
+ * Provides some batch editing capabilities for items in DSpace.
+ * <ul>
+ *   <li>Metadata fields - Add, Delete</li>
+ *   <li>Bitstreams - Add, Delete</li>
+ * </ul>
  *
- * The design has been for compatibility with ItemImporter
+ * <p>
+ * The design has been for compatibility with
+ * {@link org.dspace.app.itemimport.service.ItemImportService}
  * in the use of the DSpace archive format which is used to
  * specify changes on a per item basis.  The directory names
  * to correspond to each item are arbitrary and will only be
  * used for logging purposes.  The reference to the item is
- * from a required dc.identifier with the item handle to be
- * included in the dublin_core.xml (or similar metadata) file.
+ * from a required {@code dc.identifier} with the item handle to be
+ * included in the {@code dublin_core.xml} (or similar metadata) file.
  *
- * Any combination of these actions is permitted in a single run of this class
+ * <p>
+ * Any combination of these actions is permitted in a single run of this class.
  * The order of actions is important when used in combination.
- * It is the responsibility of the calling class (here, ItemUpdate)
- * to register UpdateAction classes in the order to which they are
+ * It is the responsibility of the calling class (here, {@code ItemUpdate})
+ * to register {@link UpdateAction} classes in the order which they are
  * to be performed.
  *
- *
- * It is unfortunate that so much code needs to be borrowed
- * from ItemImport as it is not reusable in private methods, etc.
- * Some of this has been placed into the MetadataUtilities class
- * for possible reuse elsewhere.
+ * <p>
+ * It is unfortunate that so much code needs to be borrowed from
+ * {@link org.dspace.app.itemimport.service.ItemImportService} as it is not
+ * reusable in private methods, etc.  Some of this has been placed into the
+ * {@link MetadataUtilities} class for possible reuse elsewhere.
  *
  * @author W. Hays based on a conceptual design by R. Rodgers
  */
@@ -73,7 +78,7 @@ public class ItemUpdate {
     public static final String DELETE_CONTENTS_FILE = "delete_contents";
 
     public static String HANDLE_PREFIX = null;
-    public static final Map<String, String> filterAliases = new HashMap<String, String>();
+    public static final Map<String, String> filterAliases = new HashMap<>();
 
     public static boolean verbose = false;
 
@@ -375,7 +380,7 @@ public class ItemUpdate {
         // open and process the source directory
         File sourceDir = new File(sourceDirPath);
 
-        if ((sourceDir == null) || !sourceDir.exists() || !sourceDir.isDirectory()) {
+        if (!sourceDir.exists() || !sourceDir.isDirectory()) {
             pr("Error, cannot open archive source directory " + sourceDirPath);
             throw new Exception("error with archive source directory " + sourceDirPath);
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/itemupdate/MetadataUtilities.java b/dspace-api/src/main/java/org/dspace/app/itemupdate/MetadataUtilities.java
index 5c2138a590..910eb434d1 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemupdate/MetadataUtilities.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemupdate/MetadataUtilities.java
@@ -27,10 +27,12 @@ import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.xpath.XPathAPI;
-import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataSchema;
@@ -170,24 +172,21 @@ public class MetadataUtilities {
      * @param docBuilder DocumentBuilder
      * @param is         - InputStream of dublin_core.xml
      * @return list of DtoMetadata representing the metadata fields relating to an Item
-     * @throws SQLException                 if database error
      * @throws IOException                  if IO error
      * @throws ParserConfigurationException if parser config error
      * @throws SAXException                 if XML error
-     * @throws TransformerException         if transformer error
-     * @throws AuthorizeException           if authorization error
      */
     public static List<DtoMetadata> loadDublinCore(DocumentBuilder docBuilder, InputStream is)
-        throws SQLException, IOException, ParserConfigurationException,
-        SAXException, TransformerException, AuthorizeException {
+        throws IOException, XPathExpressionException, SAXException {
         Document document = docBuilder.parse(is);
 
         List<DtoMetadata> dtomList = new ArrayList<DtoMetadata>();
 
         // Get the schema, for backward compatibility we will default to the
         // dublin core schema if the schema name is not available in the import file
-        String schema = null;
-        NodeList metadata = XPathAPI.selectNodeList(document, "/dublin_core");
+        String schema;
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        NodeList metadata = (NodeList) xPath.compile("/dublin_core").evaluate(document, XPathConstants.NODESET);
         Node schemaAttr = metadata.item(0).getAttributes().getNamedItem("schema");
         if (schemaAttr == null) {
             schema = MetadataSchemaEnum.DC.getName();
@@ -196,7 +195,7 @@ public class MetadataUtilities {
         }
 
         // Get the nodes corresponding to formats
-        NodeList dcNodes = XPathAPI.selectNodeList(document, "/dublin_core/dcvalue");
+        NodeList dcNodes = (NodeList) xPath.compile("/dublin_core/dcvalue").evaluate(document, XPathConstants.NODESET);
 
         for (int i = 0; i < dcNodes.getLength(); i++) {
             Node n = dcNodes.item(i);
diff --git a/dspace-api/src/main/java/org/dspace/app/launcher/CommandRunner.java b/dspace-api/src/main/java/org/dspace/app/launcher/CommandRunner.java
index ce33b6655b..06c2ddb483 100644
--- a/dspace-api/src/main/java/org/dspace/app/launcher/CommandRunner.java
+++ b/dspace-api/src/main/java/org/dspace/app/launcher/CommandRunner.java
@@ -16,7 +16,7 @@ import java.io.StreamTokenizer;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jdom.Document;
+import org.jdom2.Document;
 
 /**
  * @author mwood
diff --git a/dspace-api/src/main/java/org/dspace/app/launcher/ScriptLauncher.java b/dspace-api/src/main/java/org/dspace/app/launcher/ScriptLauncher.java
index d445f9bbf3..fcb2098bd0 100644
--- a/dspace-api/src/main/java/org/dspace/app/launcher/ScriptLauncher.java
+++ b/dspace-api/src/main/java/org/dspace/app/launcher/ScriptLauncher.java
@@ -29,9 +29,9 @@ import org.dspace.scripts.service.ScriptService;
 import org.dspace.servicemanager.DSpaceKernelImpl;
 import org.dspace.servicemanager.DSpaceKernelInit;
 import org.dspace.services.RequestService;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * A DSpace script launcher.
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java
index 2d963dd3da..9e28edad45 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java
@@ -21,10 +21,10 @@ import java.awt.image.BufferedImage;
  */
 
 public class Brand {
-    private int brandWidth;
-    private int brandHeight;
-    private Font font;
-    private int xOffset;
+    private final int brandWidth;
+    private final int brandHeight;
+    private final Font font;
+    private final int xOffset;
 
     /**
      * Constructor to set up footer image attributes.
@@ -92,7 +92,7 @@ public class Brand {
      * do the text placements and preparatory work for the brand image generation
      *
      * @param brandImage a BufferedImage object where the image is created
-     * @param identifier and Identifier object describing what text is to be placed in what
+     * @param brandText  an Identifier object describing what text is to be placed in what
      *                   position within the brand
      */
     private void drawImage(BufferedImage brandImage,
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandText.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandText.java
index ae77f6048b..9110740643 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandText.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandText.java
@@ -39,7 +39,7 @@ class BrandText {
      * its location within a rectangular area.
      *
      * @param location one of the class location constants e.g. <code>Identifier.BL</code>
-     * @param the      text associated with the location
+     * @param text     text associated with the location
      */
     public BrandText(String location, String text) {
         this.location = location;
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/ExcelFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/ExcelFilter.java
deleted file mode 100644
index c17d168c04..0000000000
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/ExcelFilter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.app.mediafilter;
-
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.logging.log4j.Logger;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.hssf.extractor.ExcelExtractor;
-import org.apache.poi.xssf.extractor.XSSFExcelExtractor;
-import org.dspace.content.Item;
-
-/*
- * ExcelFilter
- *
- * Entries you must add to dspace.cfg:
- *
- * filter.plugins = blah, \
- *     Excel Text Extractor
- *
- * plugin.named.org.dspace.app.mediafilter.FormatFilter = \
- *     blah = blah, \
- *     org.dspace.app.mediafilter.ExcelFilter = Excel Text Extractor
- *
- * #Configure each filter's input Formats
- * filter.org.dspace.app.mediafilter.ExcelFilter.inputFormats = Microsoft Excel, Microsoft Excel XML
- *
- */
-public class ExcelFilter extends MediaFilter {
-
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(ExcelFilter.class);
-
-    public String getFilteredName(String oldFilename) {
-        return oldFilename + ".txt";
-    }
-
-    /**
-     * @return String bundle name
-     */
-    public String getBundleName() {
-        return "TEXT";
-    }
-
-    /**
-     * @return String bitstream format
-     */
-    public String getFormatString() {
-        return "Text";
-    }
-
-    /**
-     * @return String description
-     */
-    public String getDescription() {
-        return "Extracted text";
-    }
-
-    /**
-     * @param item    item
-     * @param source  source input stream
-     * @param verbose verbose mode
-     * @return InputStream the resulting input stream
-     * @throws Exception if error
-     */
-    @Override
-    public InputStream getDestinationStream(Item item, InputStream source, boolean verbose)
-        throws Exception {
-        String extractedText = null;
-
-        try {
-            POITextExtractor theExtractor = ExtractorFactory.createExtractor(source);
-            if (theExtractor instanceof ExcelExtractor) {
-                // for xls file
-                extractedText = (theExtractor).getText();
-            } else if (theExtractor instanceof XSSFExcelExtractor) {
-                // for xlsx file
-                extractedText = (theExtractor).getText();
-            }
-        } catch (Exception e) {
-            log.error("Error filtering bitstream: " + e.getMessage(), e);
-            throw e;
-        }
-
-        if (extractedText != null) {
-            // generate an input stream with the extracted text
-            return IOUtils.toInputStream(extractedText, StandardCharsets.UTF_8);
-        }
-
-        return null;
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/HTMLFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/HTMLFilter.java
deleted file mode 100644
index 5e10f2841d..0000000000
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/HTMLFilter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.app.mediafilter;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import javax.swing.text.Document;
-import javax.swing.text.html.HTMLEditorKit;
-
-import org.dspace.content.Item;
-
-/*
- *
- * to do: helpful error messages - can't find mediafilter.cfg - can't
- * instantiate filter - bitstream format doesn't exist
- *
- */
-public class HTMLFilter extends MediaFilter {
-
-    @Override
-    public String getFilteredName(String oldFilename) {
-        return oldFilename + ".txt";
-    }
-
-    /**
-     * @return String bundle name
-     */
-    @Override
-    public String getBundleName() {
-        return "TEXT";
-    }
-
-    /**
-     * @return String bitstream format
-     */
-    @Override
-    public String getFormatString() {
-        return "Text";
-    }
-
-    /**
-     * @return String description
-     */
-    @Override
-    public String getDescription() {
-        return "Extracted text";
-    }
-
-    /**
-     * @param currentItem item
-     * @param source      source input stream
-     * @param verbose     verbose mode
-     * @return InputStream the resulting input stream
-     * @throws Exception if error
-     */
-    @Override
-    public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
-        throws Exception {
-        // try and read the document - set to ignore character set directive,
-        // assuming that the input stream is already set properly (I hope)
-        HTMLEditorKit kit = new HTMLEditorKit();
-        Document doc = kit.createDefaultDocument();
-
-        doc.putProperty("IgnoreCharsetDirective", Boolean.TRUE);
-
-        kit.read(source, doc, 0);
-
-        String extractedText = doc.getText(0, doc.getLength());
-
-        // generate an input stream with the extracted text
-        byte[] textBytes = extractedText.getBytes(StandardCharsets.UTF_8);
-        ByteArrayInputStream bais = new ByteArrayInputStream(textBytes);
-
-        return bais;
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
index a79fd42d59..d16243e3e3 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
@@ -14,6 +14,9 @@ import java.io.InputStream;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Item;
@@ -119,6 +122,39 @@ public abstract class ImageMagickThumbnailFilter extends MediaFilter {
         f2.deleteOnExit();
         ConvertCmd cmd = new ConvertCmd();
         IMOperation op = new IMOperation();
+
+        // Optionally override ImageMagick's default density of 72 DPI to use a
+        // "supersample" when creating the PDF thumbnail. Note that I prefer to
+        // use the getProperty() method here instead of getIntPropert() because
+        // the latter always returns an integer (0 in the case it's not set). I
+        // would prefer to keep ImageMagick's default to itself rather than for
+        // us to set one. Also note that the density option *must* come before
+        // we open the input file.
+        String density = configurationService.getProperty(PRE + ".density");
+        if (density != null) {
+            op.density(Integer.valueOf(density));
+        }
+
+        // Check the PDF's MediaBox and CropBox to see if they are the same.
+        // If not, then tell ImageMagick to use the CropBox when generating
+        // the thumbnail because the CropBox is generally used to define the
+        // area displayed when a user opens the PDF on a screen, whereas the
+        // MediaBox is used for print. Not all PDFs set these correctly, so
+        // we can use ImageMagick's default behavior unless we see an explit
+        // CropBox. Note: we don't need to do anything special to detect if
+        // the CropBox is missing or empty because pdfbox will set it to the
+        // same size as the MediaBox if it doesn't exist. Also note that we
+        // only need to check the first page, since that's what we use for
+        // generating the thumbnail (PDDocument uses a zero-based index).
+        PDPage pdfPage = PDDocument.load(f).getPage(0);
+        PDRectangle pdfPageMediaBox = pdfPage.getMediaBox();
+        PDRectangle pdfPageCropBox = pdfPage.getCropBox();
+
+        // This option must come *before* we open the input file.
+        if (pdfPageCropBox != pdfPageMediaBox) {
+            op.define("pdf:use-cropbox=true");
+        }
+
         String s = "[" + page + "]";
         op.addImage(f.getAbsolutePath() + s);
         if (configurationService.getBooleanProperty(PRE + ".flatten", true)) {
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java
index 49ee23b924..26347c56ee 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java
@@ -50,15 +50,11 @@ public class MediaFilterScriptConfiguration<T extends MediaFilterScript> extends
     public Options getOptions() {
         Options options = new Options();
         options.addOption("v", "verbose", false, "print all extracted text and other details to STDOUT");
-        options.getOption("v").setType(boolean.class);
         options.addOption("q", "quiet", false, "do not print anything except in the event of errors.");
-        options.getOption("q").setType(boolean.class);
         options.addOption("f", "force", false, "force all bitstreams to be processed");
-        options.getOption("f").setType(boolean.class);
         options.addOption("i", "identifier", true, "ONLY process bitstreams belonging to identifier");
         options.addOption("m", "maximum", true, "process no more than maximum items");
         options.addOption("h", "help", false, "help");
-        options.getOption("h").setType(boolean.class);
 
         Option pluginOption = Option.builder("p")
                                     .longOpt("plugins")
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/PDFFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/PDFFilter.java
deleted file mode 100644
index c90d7c5a6e..0000000000
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/PDFFilter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.app.mediafilter;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.dspace.content.Item;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
-
-/*
- *
- * to do: helpful error messages - can't find mediafilter.cfg - can't
- * instantiate filter - bitstream format doesn't exist
- *
- */
-public class PDFFilter extends MediaFilter {
-
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(PDFFilter.class);
-
-    @Override
-    public String getFilteredName(String oldFilename) {
-        return oldFilename + ".txt";
-    }
-
-    /**
-     * @return String bundle name
-     */
-    @Override
-    public String getBundleName() {
-        return "TEXT";
-    }
-
-    /**
-     * @return String bitstreamformat
-     */
-    @Override
-    public String getFormatString() {
-        return "Text";
-    }
-
-    /**
-     * @return String description
-     */
-    @Override
-    public String getDescription() {
-        return "Extracted text";
-    }
-
-    /**
-     * @param currentItem item
-     * @param source      source input stream
-     * @param verbose     verbose mode
-     * @return InputStream the resulting input stream
-     * @throws Exception if error
-     */
-    @Override
-    public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
-        throws Exception {
-        ConfigurationService configurationService
-                = DSpaceServicesFactory.getInstance().getConfigurationService();
-        try {
-            boolean useTemporaryFile = configurationService.getBooleanProperty("pdffilter.largepdfs", false);
-
-            // get input stream from bitstream
-            // pass to filter, get string back
-            PDFTextStripper pts = new PDFTextStripper();
-            pts.setSortByPosition(true);
-            PDDocument pdfDoc = null;
-            Writer writer = null;
-            File tempTextFile = null;
-            ByteArrayOutputStream byteStream = null;
-
-            if (useTemporaryFile) {
-                tempTextFile = File.createTempFile("dspacepdfextract" + source.hashCode(), ".txt");
-                tempTextFile.deleteOnExit();
-                writer = new OutputStreamWriter(new FileOutputStream(tempTextFile));
-            } else {
-                byteStream = new ByteArrayOutputStream();
-                writer = new OutputStreamWriter(byteStream);
-            }
-
-            try {
-                pdfDoc = PDDocument.load(source);
-                pts.writeText(pdfDoc, writer);
-            } catch (InvalidPasswordException ex) {
-                log.error("PDF is encrypted. Cannot extract text (item: {})",
-                    () -> currentItem.getHandle());
-                return null;
-            } finally {
-                try {
-                    if (pdfDoc != null) {
-                        pdfDoc.close();
-                    }
-                } catch (Exception e) {
-                    log.error("Error closing PDF file: " + e.getMessage(), e);
-                }
-
-                try {
-                    writer.close();
-                } catch (Exception e) {
-                    log.error("Error closing temporary extract file: " + e.getMessage(), e);
-                }
-            }
-
-            if (useTemporaryFile) {
-                return new FileInputStream(tempTextFile);
-            } else {
-                byte[] bytes = byteStream.toByteArray();
-                return new ByteArrayInputStream(bytes);
-            }
-        } catch (OutOfMemoryError oome) {
-            log.error("Error parsing PDF document " + oome.getMessage(), oome);
-            if (!configurationService.getBooleanProperty("pdffilter.skiponmemoryexception", false)) {
-                throw oome;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/PoiWordFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/PoiWordFilter.java
deleted file mode 100644
index 8c198c4477..0000000000
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/PoiWordFilter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.app.mediafilter;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.xmlbeans.XmlException;
-import org.dspace.content.Item;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Extract flat text from Microsoft Word documents (.doc, .docx).
- */
-public class PoiWordFilter
-    extends MediaFilter {
-    private static final Logger LOG = LoggerFactory.getLogger(PoiWordFilter.class);
-
-    @Override
-    public String getFilteredName(String oldFilename) {
-        return oldFilename + ".txt";
-    }
-
-    @Override
-    public String getBundleName() {
-        return "TEXT";
-    }
-
-    @Override
-    public String getFormatString() {
-        return "Text";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Extracted text";
-    }
-
-    @Override
-    public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
-        throws Exception {
-        String text;
-        try {
-            // get input stream from bitstream, pass to filter, get string back
-            POITextExtractor extractor = ExtractorFactory.createExtractor(source);
-            text = extractor.getText();
-        } catch (IOException | OpenXML4JException | XmlException e) {
-            System.err.format("Invalid File Format:  %s%n", e.getMessage());
-            LOG.error("Unable to parse the bitstream:  ", e);
-            throw e;
-        }
-
-        // if verbose flag is set, print out extracted text to STDOUT
-        if (verbose) {
-            System.out.println(text);
-        }
-
-        // return the extracted text as a stream.
-        return new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8));
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/PowerPointFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/PowerPointFilter.java
deleted file mode 100644
index 86b7096f68..0000000000
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/PowerPointFilter.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.app.mediafilter;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.poi.POITextExtractor;
-import org.apache.poi.extractor.ExtractorFactory;
-import org.apache.poi.hslf.extractor.PowerPointExtractor;
-import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
-import org.dspace.content.Item;
-
-/*
- * TODO: Allow user to configure extraction of only text or only notes
- *
- */
-public class PowerPointFilter extends MediaFilter {
-
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(PowerPointFilter.class);
-
-    @Override
-    public String getFilteredName(String oldFilename) {
-        return oldFilename + ".txt";
-    }
-
-    /**
-     * @return String bundle name
-     */
-    @Override
-    public String getBundleName() {
-        return "TEXT";
-    }
-
-    /**
-     * @return String bitstream format
-     *
-     * TODO: Check that this is correct
-     */
-    @Override
-    public String getFormatString() {
-        return "Text";
-    }
-
-    /**
-     * @return String description
-     */
-    @Override
-    public String getDescription() {
-        return "Extracted text";
-    }
-
-    /**
-     * @param currentItem item
-     * @param source      source input stream
-     * @param verbose     verbose mode
-     * @return InputStream the resulting input stream
-     * @throws Exception if error
-     */
-    @Override
-    public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
-        throws Exception {
-
-        try {
-
-            String extractedText = null;
-            new ExtractorFactory();
-            POITextExtractor pptExtractor = ExtractorFactory
-                .createExtractor(source);
-
-            // PowerPoint XML files and legacy format PowerPoint files
-            // require different classes and APIs for text extraction
-
-            // If this is a PowerPoint XML file, extract accordingly
-            if (pptExtractor instanceof XSLFPowerPointExtractor) {
-
-                // The true method arguments indicate that text from
-                // the slides and the notes is desired
-                extractedText = ((XSLFPowerPointExtractor) pptExtractor)
-                    .getText(true, true);
-            } else if (pptExtractor instanceof PowerPointExtractor) { // Legacy PowerPoint files
-
-                extractedText = ((PowerPointExtractor) pptExtractor).getText()
-                    + " " + ((PowerPointExtractor) pptExtractor).getNotes();
-
-            }
-            if (extractedText != null) {
-                // if verbose flag is set, print out extracted text
-                // to STDOUT
-                if (verbose) {
-                    System.out.println(extractedText);
-                }
-
-                // generate an input stream with the extracted text
-                byte[] textBytes = extractedText.getBytes();
-                ByteArrayInputStream bais = new ByteArrayInputStream(textBytes);
-
-                return bais;
-            }
-        } catch (Exception e) {
-            log.error("Error filtering bitstream: " + e.getMessage(), e);
-            throw e;
-        }
-
-        return null;
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/TikaTextExtractionFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/TikaTextExtractionFilter.java
new file mode 100644
index 0000000000..e83bf706ed
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/TikaTextExtractionFilter.java
@@ -0,0 +1,183 @@
+/**
+ * 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/
+ */
+package org.dspace.app.mediafilter;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.tika.Tika;
+import org.apache.tika.exception.TikaException;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.sax.BodyContentHandler;
+import org.apache.tika.sax.ContentHandlerDecorator;
+import org.dspace.content.Item;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.xml.sax.SAXException;
+
+/**
+ * Text Extraction media filter which uses Apache Tika to extract text from a large number of file formats (including
+ * all Microsoft formats, PDF, HTML, Text, etc).  For a more complete list of file formats supported by Tika see the
+ * Tika documentation: https://tika.apache.org/2.3.0/formats.html
+ */
+public class TikaTextExtractionFilter
+    extends MediaFilter {
+    private final static Logger log = LogManager.getLogger();
+
+    @Override
+    public String getFilteredName(String oldFilename) {
+        return oldFilename + ".txt";
+    }
+
+    @Override
+    public String getBundleName() {
+        return "TEXT";
+    }
+
+    @Override
+    public String getFormatString() {
+        return "Text";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Extracted text";
+    }
+
+    @Override
+    public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
+        throws Exception {
+        ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        boolean useTemporaryFile = configurationService.getBooleanProperty("textextractor.use-temp-file", false);
+
+        if (useTemporaryFile) {
+            // Extract text out of source file using a temp file, returning results as InputStream
+            return extractUsingTempFile(source, verbose);
+        }
+
+        // Not using temporary file. We'll use Tika's default in-memory parsing.
+        // Get maximum characters to extract. Default is 100,000 chars, which is also Tika's default setting.
+        String extractedText;
+        int maxChars = configurationService.getIntProperty("textextractor.max-chars", 100000);
+        try {
+            // Use Tika to extract text from input. Tika will automatically detect the file type.
+            Tika tika = new Tika();
+            tika.setMaxStringLength(maxChars); // Tell Tika the maximum number of characters to extract
+            extractedText = tika.parseToString(source);
+        } catch (IOException e) {
+            System.err.format("Unable to extract text from bitstream in Item %s%n", currentItem.getID().toString());
+            e.printStackTrace();
+            log.error("Unable to extract text from bitstream in Item {}", currentItem.getID().toString(), e);
+            throw e;
+        } catch (OutOfMemoryError oe) {
+            System.err.format("OutOfMemoryError occurred when extracting text from bitstream in Item %s. " +
+                "You may wish to enable 'textextractor.use-temp-file'.%n", currentItem.getID().toString());
+            oe.printStackTrace();
+            log.error("OutOfMemoryError occurred when extracting text from bitstream in Item {}. " +
+                          "You may wish to enable 'textextractor.use-temp-file'.", currentItem.getID().toString(), oe);
+            throw oe;
+        }
+
+        if (StringUtils.isNotEmpty(extractedText)) {
+            // if verbose flag is set, print out extracted text to STDOUT
+            if (verbose) {
+                System.out.println("(Verbose mode) Extracted text:");
+                System.out.println(extractedText);
+            }
+
+            // return the extracted text as a UTF-8 stream.
+            return new ByteArrayInputStream(extractedText.getBytes(StandardCharsets.UTF_8));
+        }
+        return null;
+    }
+
+    /**
+     * Extracts the text out of a given source InputStream, using a temporary file. This decreases the amount of memory
+     * necessary for text extraction, but can be slower as it requires writing extracted text to a temporary file.
+     * @param source source InputStream
+     * @param verbose verbose mode enabled/disabled
+     * @return InputStream for temporary file containing extracted text
+     * @throws IOException
+     * @throws SAXException
+     * @throws TikaException
+     */
+    private InputStream extractUsingTempFile(InputStream source, boolean verbose)
+        throws IOException, TikaException, SAXException {
+        File tempExtractedTextFile = File.createTempFile("dspacetextextract" + source.hashCode(), ".txt");
+
+        if (verbose) {
+            System.out.println("(Verbose mode) Extracted text was written to temporary file at " +
+                                   tempExtractedTextFile.getAbsolutePath());
+        } else {
+            tempExtractedTextFile.deleteOnExit();
+        }
+
+        // Open temp file for writing
+        try (FileWriter writer = new FileWriter(tempExtractedTextFile, StandardCharsets.UTF_8)) {
+            // Initialize a custom ContentHandlerDecorator which is a BodyContentHandler.
+            // This mimics the behavior of Tika().parseToString(), which only extracts text from the body of the file.
+            // This custom Handler writes any extracted text to the temp file.
+            ContentHandlerDecorator handler = new BodyContentHandler(new ContentHandlerDecorator() {
+                /**
+                 * Write all extracted characters directly to the temp file.
+                 */
+                @Override
+                public void characters(char[] ch, int start, int length) throws SAXException {
+                    try {
+                        writer.append(new String(ch), start, length);
+                    } catch (IOException e) {
+                        String errorMsg = String.format("Could not append to temporary file at %s " +
+                                                            "when performing text extraction",
+                                                        tempExtractedTextFile.getAbsolutePath());
+                        log.error(errorMsg, e);
+                        throw new SAXException(errorMsg, e);
+                    }
+                }
+
+                /**
+                 * Write all ignorable whitespace directly to the temp file.
+                 * This mimics the behaviour of Tika().parseToString() which extracts ignorableWhitespace characters
+                 * (like blank lines, indentations, etc.), so that we get the same extracted text either way.
+                 */
+                @Override
+                public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
+                    try {
+                        writer.append(new String(ch), start, length);
+                    } catch (IOException e) {
+                        String errorMsg = String.format("Could not append to temporary file at %s " +
+                                                            "when performing text extraction",
+                                                        tempExtractedTextFile.getAbsolutePath());
+                        log.error(errorMsg, e);
+                        throw new SAXException(errorMsg, e);
+                    }
+                }
+            });
+
+            AutoDetectParser parser = new AutoDetectParser();
+            Metadata metadata = new Metadata();
+            // parse our source InputStream using the above custom handler
+            parser.parse(source, handler, metadata);
+        }
+
+        // At this point, all extracted text is written to our temp file. So, return a FileInputStream for that file
+        return new FileInputStream(tempExtractedTextFile);
+    }
+
+
+
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/packager/Packager.java b/dspace-api/src/main/java/org/dspace/app/packager/Packager.java
index 0e985bd244..21d1562686 100644
--- a/dspace-api/src/main/java/org/dspace/app/packager/Packager.java
+++ b/dspace-api/src/main/java/org/dspace/app/packager/Packager.java
@@ -631,7 +631,7 @@ public class Packager {
             //otherwise, just disseminate a single object to a single package file
             dip.disseminate(context, dso, pkgParams, pkgFile);
 
-            if (pkgFile != null && pkgFile.exists()) {
+            if (pkgFile.exists()) {
                 System.out.println("\nCREATED package file: " + pkgFile.getCanonicalPath());
             }
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/CollectionAdministratorsRequestItemStrategy.java b/dspace-api/src/main/java/org/dspace/app/requestitem/CollectionAdministratorsRequestItemStrategy.java
new file mode 100644
index 0000000000..135406069a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/CollectionAdministratorsRequestItemStrategy.java
@@ -0,0 +1,46 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.requestitem;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.springframework.lang.NonNull;
+
+/**
+ * Derive request recipients from groups of the Collection which owns an Item.
+ * The list will include all members of the administrators group.  If the
+ * resulting list is empty, delegates to {@link RequestItemHelpdeskStrategy}.
+ *
+ * @author Mark H. Wood <mwood@iupui.edu>
+ */
+public class CollectionAdministratorsRequestItemStrategy
+        extends RequestItemHelpdeskStrategy {
+    @Override
+    @NonNull
+    public List<RequestItemAuthor> getRequestItemAuthor(Context context,
+            Item item)
+            throws SQLException {
+        List<RequestItemAuthor> recipients = new ArrayList<>();
+        Collection collection = item.getOwningCollection();
+        for (EPerson admin : collection.getAdministrators().getMembers()) {
+            recipients.add(new RequestItemAuthor(admin));
+        }
+        if (recipients.isEmpty()) {
+            return super.getRequestItemAuthor(context, item);
+        } else {
+            return recipients;
+        }
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/CombiningRequestItemStrategy.java b/dspace-api/src/main/java/org/dspace/app/requestitem/CombiningRequestItemStrategy.java
new file mode 100644
index 0000000000..8292c1a728
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/CombiningRequestItemStrategy.java
@@ -0,0 +1,61 @@
+/**
+ * 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/
+ */
+package org.dspace.app.requestitem;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.springframework.lang.NonNull;
+import org.springframework.util.Assert;
+
+/**
+ * Assemble a list of recipients from the results of other strategies.
+ * The list of strategy classes is injected as the constructor argument
+ * {@code strategies}.
+ * If the strategy list is not configured, returns an empty List.
+ *
+ * @author Mark H. Wood <mwood@iupui.edu>
+ */
+public class CombiningRequestItemStrategy
+        implements RequestItemAuthorExtractor {
+    /** The strategies to combine. */
+    private final List<RequestItemAuthorExtractor> strategies;
+
+    /**
+     * Initialize a combination of strategies.
+     * @param strategies the author extraction strategies to combine.
+     */
+    public CombiningRequestItemStrategy(@NonNull List<RequestItemAuthorExtractor> strategies) {
+        Assert.notNull(strategies, "Strategy list may not be null");
+        this.strategies = strategies;
+    }
+
+    /**
+     * Do not call.
+     * @throws IllegalArgumentException always
+     */
+    private CombiningRequestItemStrategy() {
+        throw new IllegalArgumentException();
+    }
+
+    @Override
+    @NonNull
+    public List<RequestItemAuthor> getRequestItemAuthor(Context context, Item item)
+            throws SQLException {
+        List<RequestItemAuthor> recipients = new ArrayList<>();
+
+        for (RequestItemAuthorExtractor strategy : strategies) {
+            recipients.addAll(strategy.getRequestItemAuthor(context, item));
+        }
+
+        return recipients;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java
index 9e675e97a7..cdefd1298c 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java
@@ -27,7 +27,7 @@ import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
 
 /**
- * Object representing an Item Request
+ * Object representing an Item Request.
  */
 @Entity
 @Table(name = "requestitem")
@@ -94,6 +94,9 @@ public class RequestItem implements ReloadableEntity<Integer> {
         this.allfiles = allfiles;
     }
 
+    /**
+     * @return {@code true} if all of the Item's files are requested.
+     */
     public boolean isAllfiles() {
         return allfiles;
     }
@@ -102,6 +105,9 @@ public class RequestItem implements ReloadableEntity<Integer> {
         this.reqMessage = reqMessage;
     }
 
+    /**
+     * @return a message from the requester.
+     */
     public String getReqMessage() {
         return reqMessage;
     }
@@ -110,6 +116,9 @@ public class RequestItem implements ReloadableEntity<Integer> {
         this.reqName = reqName;
     }
 
+    /**
+     * @return Human-readable name of the user requesting access.
+     */
     public String getReqName() {
         return reqName;
     }
@@ -118,6 +127,9 @@ public class RequestItem implements ReloadableEntity<Integer> {
         this.reqEmail = reqEmail;
     }
 
+    /**
+     * @return address of the user requesting access.
+     */
     public String getReqEmail() {
         return reqEmail;
     }
@@ -126,6 +138,9 @@ public class RequestItem implements ReloadableEntity<Integer> {
         this.token = token;
     }
 
+    /**
+     * @return a unique request identifier which can be emailed.
+     */
     public String getToken() {
         return token;
     }
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemAuthor.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemAuthor.java
index 49e26fe00b..a189e4a5ef 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemAuthor.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemAuthor.java
@@ -11,20 +11,31 @@ import org.dspace.eperson.EPerson;
 
 /**
  * Simple DTO to transfer data about the corresponding author for the Request
- * Copy feature
+ * Copy feature.
  *
  * @author Andrea Bollini
  */
 public class RequestItemAuthor {
-    private String fullName;
-    private String email;
+    private final String fullName;
+    private final String email;
 
+    /**
+     * Construct an author record from given data.
+     *
+     * @param fullName the author's full name.
+     * @param email the author's email address.
+     */
     public RequestItemAuthor(String fullName, String email) {
         super();
         this.fullName = fullName;
         this.email = email;
     }
 
+    /**
+     * Construct an author from an EPerson's metadata.
+     *
+     * @param ePerson the EPerson.
+     */
     public RequestItemAuthor(EPerson ePerson) {
         super();
         this.fullName = ePerson.getFullName();
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemAuthorExtractor.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemAuthorExtractor.java
index 9b66030e90..bc97bc64bf 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemAuthorExtractor.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemAuthorExtractor.java
@@ -8,26 +8,28 @@
 package org.dspace.app.requestitem;
 
 import java.sql.SQLException;
+import java.util.List;
 
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.springframework.lang.NonNull;
 
 /**
- * Interface to abstract the strategy for select the author to contact for
- * request copy
+ * Interface to abstract the strategy for selecting the author to contact for
+ * request copy.
  *
  * @author Andrea Bollini
  */
 public interface RequestItemAuthorExtractor {
-
     /**
-     * Retrieve the auhtor to contact for a request copy of the give item.
+     * Retrieve the author to contact for requesting a copy of the given item.
      *
      * @param context DSpace context object
      * @param item item to request
-     * @return An object containing name an email address to send the request to
-     *         or null if no valid email address was found.
+     * @return Names and email addresses to send the request to.
      * @throws SQLException if database error
      */
-    public RequestItemAuthor getRequestItemAuthor(Context context, Item item) throws SQLException;
+    @NonNull
+    public List<RequestItemAuthor> getRequestItemAuthor(Context context, Item item)
+        throws SQLException;
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
index d72e42eac1..435fa0f9cc 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
@@ -72,28 +72,48 @@ public class RequestItemEmailNotifier {
     static public void sendRequest(Context context, RequestItem ri, String responseLink)
             throws IOException, SQLException {
         // Who is making this request?
-        RequestItemAuthor author = requestItemAuthorExtractor
+        List<RequestItemAuthor> authors = requestItemAuthorExtractor
                 .getRequestItemAuthor(context, ri.getItem());
-        String authorEmail = author.getEmail();
-        String authorName = author.getFullName();
 
         // Build an email to the approver.
         Email email = Email.getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(),
                 "request_item.author"));
-        email.addRecipient(authorEmail);
+        for (RequestItemAuthor author : authors) {
+            email.addRecipient(author.getEmail());
+        }
         email.setReplyTo(ri.getReqEmail()); // Requester's address
+
         email.addArgument(ri.getReqName()); // {0} Requester's name
+
         email.addArgument(ri.getReqEmail()); // {1} Requester's address
+
         email.addArgument(ri.isAllfiles() // {2} All bitstreams or just one?
             ? I18nUtil.getMessage("itemRequest.all") : ri.getBitstream().getName());
-        email.addArgument(handleService.getCanonicalForm(ri.getItem().getHandle()));
+
+        email.addArgument(handleService.getCanonicalForm(ri.getItem().getHandle())); // {3}
+
         email.addArgument(ri.getItem().getName()); // {4} requested item's title
+
         email.addArgument(ri.getReqMessage()); // {5} message from requester
+
         email.addArgument(responseLink); // {6} Link back to DSpace for action
-        email.addArgument(authorName); // {7} corresponding author name
-        email.addArgument(authorEmail); // {8} corresponding author email
-        email.addArgument(configurationService.getProperty("dspace.name"));
-        email.addArgument(configurationService.getProperty("mail.helpdesk"));
+
+        StringBuilder names = new StringBuilder();
+        StringBuilder addresses = new StringBuilder();
+        for (RequestItemAuthor author : authors) {
+            if (names.length() > 0) {
+                names.append("; ");
+                addresses.append("; ");
+            }
+            names.append(author.getFullName());
+            addresses.append(author.getEmail());
+        }
+        email.addArgument(names.toString()); // {7} corresponding author name
+        email.addArgument(addresses.toString()); // {8} corresponding author email
+
+        email.addArgument(configurationService.getProperty("dspace.name")); // {9}
+
+        email.addArgument(configurationService.getProperty("mail.helpdesk")); // {10}
 
         // Send the email.
         try {
@@ -134,9 +154,9 @@ public class RequestItemEmailNotifier {
         email.setContent("body", message);
         email.setSubject(subject);
         email.addRecipient(ri.getReqEmail());
-        if (ri.isAccept_request()) {
-            // Attach bitstreams.
-            try {
+        // Attach bitstreams.
+        try {
+            if (ri.isAccept_request()) {
                 if (ri.isAllfiles()) {
                     Item item = ri.getItem();
                     List<Bundle> bundles = item.getBundles("ORIGINAL");
@@ -159,11 +179,19 @@ public class RequestItemEmailNotifier {
                             bitstream.getFormat(context).getMIMEType());
                 }
                 email.send();
-            } catch (MessagingException | IOException | SQLException | AuthorizeException e) {
-                LOG.warn(LogHelper.getHeader(context,
-                        "error_mailing_requestItem", e.getMessage()));
-                throw new IOException("Reply not sent:  " + e.getMessage());
+            } else {
+                boolean sendRejectEmail = configurationService
+                    .getBooleanProperty("request.item.reject.email", true);
+                // Not all sites want the "refusal" to be sent back to the requester via
+                // email. However, by default, the rejection email is sent back.
+                if (sendRejectEmail) {
+                    email.send();
+                }
             }
+        } catch (MessagingException | IOException | SQLException | AuthorizeException e) {
+            LOG.warn(LogHelper.getHeader(context,
+                    "error_mailing_requestItem", e.getMessage()));
+            throw new IOException("Reply not sent:  " + e.getMessage());
         }
         LOG.info(LogHelper.getHeader(context,
                 "sent_attach_requestItem", "token={}"), ri.getToken());
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategy.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategy.java
index 7b63d3ea8d..f440ba380a 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategy.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategy.java
@@ -8,6 +8,8 @@
 package org.dspace.app.requestitem;
 
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.Item;
@@ -16,11 +18,11 @@ import org.dspace.core.I18nUtil;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNull;
 
 /**
- * RequestItem strategy to allow DSpace support team's helpdesk to receive requestItem request
+ * RequestItem strategy to allow DSpace support team's helpdesk to receive requestItem request.
  * With this enabled, then the Item author/submitter doesn't receive the request, but the helpdesk instead does.
  *
  * Failover to the RequestItemSubmitterStrategy, which means the submitter would get the request if there is no
@@ -33,19 +35,24 @@ public class RequestItemHelpdeskStrategy extends RequestItemSubmitterStrategy {
     @Autowired(required = true)
     protected EPersonService ePersonService;
 
+    @Autowired(required = true)
+    private ConfigurationService configuration;
+
     public RequestItemHelpdeskStrategy() {
     }
 
     @Override
-    public RequestItemAuthor getRequestItemAuthor(Context context, Item item) throws SQLException {
-        ConfigurationService configurationService
-                = DSpaceServicesFactory.getInstance().getConfigurationService();
-        boolean helpdeskOverridesSubmitter = configurationService
+    @NonNull
+    public List<RequestItemAuthor> getRequestItemAuthor(Context context, Item item)
+            throws SQLException {
+        boolean helpdeskOverridesSubmitter = configuration
             .getBooleanProperty("request.item.helpdesk.override", false);
-        String helpDeskEmail = configurationService.getProperty("mail.helpdesk");
+        String helpDeskEmail = configuration.getProperty("mail.helpdesk");
 
         if (helpdeskOverridesSubmitter && StringUtils.isNotBlank(helpDeskEmail)) {
-            return getHelpDeskPerson(context, helpDeskEmail);
+            List<RequestItemAuthor> authors = new ArrayList<>(1);
+            authors.add(getHelpDeskPerson(context, helpDeskEmail));
+            return authors;
         } else {
             //Fallback to default logic (author of Item) if helpdesk isn't fully enabled or setup
             return super.getRequestItemAuthor(context, item);
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemMetadataStrategy.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemMetadataStrategy.java
index 9838e58697..4372ab9b09 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemMetadataStrategy.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemMetadataStrategy.java
@@ -8,6 +8,8 @@
 package org.dspace.app.requestitem;
 
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -16,12 +18,13 @@ import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.core.I18nUtil;
-import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNull;
 
 /**
  * Try to look to an item metadata for the corresponding author name and email.
- * Failover to the RequestItemSubmitterStrategy
+ * Failover to the RequestItemSubmitterStrategy.
  *
  * @author Andrea Bollini
  */
@@ -30,6 +33,9 @@ public class RequestItemMetadataStrategy extends RequestItemSubmitterStrategy {
     protected String emailMetadata;
     protected String fullNameMetadata;
 
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
+
     @Autowired(required = true)
     protected ItemService itemService;
 
@@ -37,59 +43,72 @@ public class RequestItemMetadataStrategy extends RequestItemSubmitterStrategy {
     }
 
     @Override
-    public RequestItemAuthor getRequestItemAuthor(Context context, Item item)
+    @NonNull
+    public List<RequestItemAuthor> getRequestItemAuthor(Context context, Item item)
         throws SQLException {
-        RequestItemAuthor author = null;
+        List<RequestItemAuthor> authors;
         if (emailMetadata != null) {
             List<MetadataValue> vals = itemService.getMetadataByMetadataString(item, emailMetadata);
-            if (vals.size() > 0) {
-                String email = vals.iterator().next().getValue();
-                String fullname = null;
-                if (fullNameMetadata != null) {
-                    List<MetadataValue> nameVals = itemService.getMetadataByMetadataString(item, fullNameMetadata);
-                    if (nameVals.size() > 0) {
-                        fullname = nameVals.iterator().next().getValue();
+            List<MetadataValue> nameVals;
+            if (null != fullNameMetadata) {
+                nameVals = itemService.getMetadataByMetadataString(item, fullNameMetadata);
+            } else {
+                nameVals = Collections.EMPTY_LIST;
+            }
+            boolean useNames = vals.size() == nameVals.size();
+            if (!vals.isEmpty()) {
+                authors = new ArrayList<>(vals.size());
+                for (int authorIndex = 0; authorIndex < vals.size(); authorIndex++) {
+                    String email = vals.get(authorIndex).getValue();
+                    String fullname = null;
+                    if (useNames) {
+                        fullname = nameVals.get(authorIndex).getValue();
                     }
+
+                    if (StringUtils.isBlank(fullname)) {
+                        fullname = I18nUtil.getMessage(
+                                "org.dspace.app.requestitem.RequestItemMetadataStrategy.unnamed",
+                                context);
+                    }
+                    RequestItemAuthor author = new RequestItemAuthor(
+                            fullname, email);
+                    authors.add(author);
                 }
-                if (StringUtils.isBlank(fullname)) {
-                    fullname = I18nUtil
-                            .getMessage(
-                                    "org.dspace.app.requestitem.RequestItemMetadataStrategy.unnamed",
-                                    context);
-                }
-                author = new RequestItemAuthor(fullname, email);
-                return author;
+                return authors;
+            } else {
+                return Collections.EMPTY_LIST;
             }
         } else {
             // Uses the basic strategy to look for the original submitter
-            author = super.getRequestItemAuthor(context, item);
-            // Is the author or his email  null, so get the help desk or admin name and email
-            if (null == author || null == author.getEmail()) {
-                String email = null;
-                String name = null;
+            authors = super.getRequestItemAuthor(context, item);
+
+            // Remove from the list authors that do not have email addresses.
+            for (RequestItemAuthor author : authors) {
+                if (null == author.getEmail()) {
+                    authors.remove(author);
+                }
+            }
+
+            if (authors.isEmpty()) { // No author email addresses!  Fall back
                 //First get help desk name and email
-                email = DSpaceServicesFactory.getInstance()
-                        .getConfigurationService().getProperty("mail.helpdesk");
-                name = DSpaceServicesFactory.getInstance()
-                                            .getConfigurationService().getProperty("mail.helpdesk.name");
+                String email = configurationService.getProperty("mail.helpdesk");
+                String name = configurationService.getProperty("mail.helpdesk.name");
                 // If help desk mail is null get the mail and name of admin
                 if (email == null) {
-                    email = DSpaceServicesFactory.getInstance()
-                            .getConfigurationService().getProperty("mail.admin");
-                    name = DSpaceServicesFactory.getInstance()
-                            .getConfigurationService().getProperty("mail.admin.name");
+                    email = configurationService.getProperty("mail.admin");
+                    name = configurationService.getProperty("mail.admin.name");
                 }
-                author = new RequestItemAuthor(name, email);
+                authors.add(new RequestItemAuthor(name, email));
             }
+            return authors;
         }
-        return author;
     }
 
-    public void setEmailMetadata(String emailMetadata) {
+    public void setEmailMetadata(@NonNull String emailMetadata) {
         this.emailMetadata = emailMetadata;
     }
 
-    public void setFullNameMetadata(String fullNameMetadata) {
+    public void setFullNameMetadata(@NonNull String fullNameMetadata) {
         this.fullNameMetadata = fullNameMetadata;
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemSubmitterStrategy.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemSubmitterStrategy.java
index 2708c24ba9..dcc1a3e80e 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemSubmitterStrategy.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemSubmitterStrategy.java
@@ -8,10 +8,13 @@
 package org.dspace.app.requestitem;
 
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.springframework.lang.NonNull;
 
 /**
  * Basic strategy that looks to the original submitter.
@@ -24,21 +27,23 @@ public class RequestItemSubmitterStrategy implements RequestItemAuthorExtractor
     }
 
     /**
-     * Returns the submitter of an Item as RequestItemAuthor or null if the
-     * Submitter is deleted.
+     * Returns the submitter of an Item as RequestItemAuthor or an empty List if
+     * the Submitter is deleted.
      *
-     * @return The submitter of the item or null if the submitter is deleted
+     * @return The submitter of the item or empty List if the submitter is deleted
      * @throws SQLException if database error
      */
     @Override
-    public RequestItemAuthor getRequestItemAuthor(Context context, Item item)
+    @NonNull
+    public List<RequestItemAuthor> getRequestItemAuthor(Context context, Item item)
         throws SQLException {
         EPerson submitter = item.getSubmitter();
-        RequestItemAuthor author = null;
+        List<RequestItemAuthor> authors = new ArrayList<>(1);
         if (null != submitter) {
-            author = new RequestItemAuthor(
-                    submitter.getFullName(), submitter.getEmail());
+            RequestItemAuthor author = new RequestItemAuthor(
+                submitter.getFullName(), submitter.getEmail());
+            authors.add(author);
         }
-        return author;
+        return authors;
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java b/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
index 87198fe172..ead725e842 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
@@ -31,6 +31,7 @@ import org.dspace.app.sherpa.v2.SHERPAResponse;
 import org.dspace.app.sherpa.v2.SHERPAUtils;
 import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 
 /**
  * SHERPAService is responsible for making the HTTP call to the SHERPA v2 API
@@ -43,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author Kim Shepherd
  */
 public class SHERPAService {
+
     private CloseableHttpClient client = null;
 
     private int maxNumberOfTries;
@@ -91,6 +93,7 @@ public class SHERPAService {
      * @param query ISSN string to pass in an "issn equals" API query
      * @return      SHERPAResponse containing an error or journal policies
      */
+    @Cacheable(key = "#query", cacheNames = "sherpa.searchByJournalISSN")
     public SHERPAResponse searchByJournalISSN(String query) {
         return performRequest("publication", "issn", "equals", query, 0, 1);
     }
@@ -413,4 +416,5 @@ public class SHERPAService {
     public void setTimeout(int timeout) {
         this.timeout = timeout;
     }
-}
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheEvictService.java b/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheEvictService.java
new file mode 100644
index 0000000000..94ecfb5e21
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheEvictService.java
@@ -0,0 +1,71 @@
+/**
+ * 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/
+ */
+package org.dspace.app.sherpa.cache;
+
+import java.util.Objects;
+import java.util.Set;
+
+import org.dspace.app.sherpa.submit.SHERPASubmitService;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.springframework.cache.CacheManager;
+
+/**
+ * This service is responsible to deal with the SherpaService cache.
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class SherpaCacheEvictService {
+
+    // The cache that is managed by this service.
+    static final String CACHE_NAME = "sherpa.searchByJournalISSN";
+
+    private CacheManager cacheManager;
+
+    private SHERPASubmitService sherpaSubmitService;
+
+    /**
+     * Remove immediately from the cache all the response that are related to a specific item
+     * extracting the ISSNs from the item
+     * 
+     * @param context The DSpace context
+     * @param item    an Item
+     */
+    public void evictCacheValues(Context context, Item item) {
+        Set<String> ISSNs = sherpaSubmitService.getISSNs(context, item);
+        for (String issn : ISSNs) {
+            Objects.requireNonNull(cacheManager.getCache(CACHE_NAME)).evictIfPresent(issn);
+        }
+    }
+
+    /**
+     * Invalidate immediately the Sherpa cache
+     */
+    public void evictAllCacheValues() {
+        Objects.requireNonNull(cacheManager.getCache(CACHE_NAME)).invalidate();
+    }
+
+    /**
+     * Set the reference to the cacheManager
+     * 
+     * @param cacheManager
+     */
+    public void setCacheManager(CacheManager cacheManager) {
+        this.cacheManager = cacheManager;
+    }
+
+    /**
+     * Set the reference to the SherpaSubmitService
+     * 
+     * @param sherpaSubmitService
+     */
+    public void setSherpaSubmitService(SHERPASubmitService sherpaSubmitService) {
+        this.sherpaSubmitService = sherpaSubmitService;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheLogger.java b/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheLogger.java
new file mode 100644
index 0000000000..e84fb7775a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheLogger.java
@@ -0,0 +1,34 @@
+/**
+ * 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/
+ */
+package org.dspace.app.sherpa.cache;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.ehcache.event.CacheEvent;
+import org.ehcache.event.CacheEventListener;
+
+/**
+ * This is a EHCache listner responsible for logging sherpa cache events. It is
+ * bound to the sherpa cache via the dspace/config/ehcache.xml file. We need a
+ * dedicated Logger for each cache as the CacheEvent doesn't include details
+ * about where the event occur
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ *
+ */
+public class SherpaCacheLogger implements CacheEventListener<Object, Object> {
+
+    private static final Logger log = LogManager.getLogger(SherpaCacheLogger.class);
+
+    @Override
+    public void onEvent(CacheEvent<?, ?> cacheEvent) {
+        log.debug("Sherpa Cache Event Type: {} | Key: {} ",
+            cacheEvent.getType(), cacheEvent.getKey());
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/submit/SHERPASubmitService.java b/dspace-api/src/main/java/org/dspace/app/sherpa/submit/SHERPASubmitService.java
index f34e2b6d57..b795c8a2b2 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/submit/SHERPASubmitService.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/submit/SHERPASubmitService.java
@@ -9,7 +9,6 @@ package org.dspace.app.sherpa.submit;
 
 import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
@@ -63,19 +62,19 @@ public class SHERPASubmitService {
      * issnItemExtractor(s) in the SHERPA spring configuration.
      * The ISSNs are not validated with a regular expression or other rules - any values
      * extracted will be included in API queries.
+     * Return the first not empty response from Sherpa
      * @see "dspace-dspace-addon-sherpa-configuration-services.xml"
      * @param context   DSpace context
      * @param item      DSpace item containing ISSNs to be checked
      * @return          SHERPA v2 API response (policy data)
      */
-    public List<SHERPAResponse> searchRelatedJournals(Context context, Item item) {
+    public SHERPAResponse searchRelatedJournals(Context context, Item item) {
         Set<String> issns = getISSNs(context, item);
         if (issns == null || issns.size() == 0) {
             return null;
         } else {
             // SHERPA v2 API no longer supports "OR'd" ISSN search, perform individual searches instead
             Iterator<String> issnIterator = issns.iterator();
-            List<SHERPAResponse> responses = new LinkedList<>();
             while (issnIterator.hasNext()) {
                 String issn = issnIterator.next();
                 SHERPAResponse response = sherpaService.searchByJournalISSN(issn);
@@ -83,14 +82,13 @@ public class SHERPASubmitService {
                     // Continue with loop
                     log.warn("Failed to look up SHERPA ROMeO result for ISSN: " + issn
                         + ": " + response.getMessage());
+                    return response;
+                } else if (!response.getJournals().isEmpty()) {
+                    // return this response, if it is not empty
+                    return response;
                 }
-                // Store this response, even if it has an error (useful for UI reporting)
-                responses.add(response);
             }
-            if (responses.isEmpty()) {
-                responses.add(new SHERPAResponse("SHERPA ROMeO lookup failed"));
-            }
-            return responses;
+            return new SHERPAResponse();
         }
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAEmbargo.java b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAEmbargo.java
new file mode 100644
index 0000000000..c6a0bb7942
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAEmbargo.java
@@ -0,0 +1,45 @@
+/**
+ * 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/
+ */
+package org.dspace.app.sherpa.v2;
+
+import java.io.Serializable;
+
+/**
+ * Model class for the Embargo of SHERPAv2 API (JSON)
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class SHERPAEmbargo implements Serializable {
+
+    private static final long serialVersionUID = 6140668058547523656L;
+
+    private int amount;
+    private String units;
+
+    public SHERPAEmbargo(int amount, String units) {
+        this.amount = amount;
+        this.units = units;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAJournal.java b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAJournal.java
index b668dbd927..8728eb1a79 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAJournal.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAJournal.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.app.sherpa.v2;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -21,7 +22,7 @@ import java.util.List;
  *
  * @author Kim Shepherd
  */
-public class SHERPAJournal {
+public class SHERPAJournal implements Serializable {
 
     private List<String> titles;
     private String url;
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPermittedVersion.java b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPermittedVersion.java
index 3a810c8e9e..85d5f8960a 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPermittedVersion.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPermittedVersion.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.app.sherpa.v2;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -28,7 +29,9 @@ import java.util.List;
  *
  * @see SHERPAPublisherPolicy
  */
-public class SHERPAPermittedVersion {
+public class SHERPAPermittedVersion implements Serializable {
+
+    private static final long serialVersionUID = 4992181606327727442L;
 
     // Version (submitted, accepted, published)
     private String articleVersion;
@@ -47,11 +50,6 @@ public class SHERPAPermittedVersion {
     // Embargo
     private SHERPAEmbargo embargo;
 
-    protected static class SHERPAEmbargo {
-        String units;
-        int amount;
-    }
-
     public String getArticleVersion() {
         return articleVersion;
     }
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPublisher.java b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPublisher.java
index 0097ec2fb3..ee1491ed8b 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPublisher.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPublisher.java
@@ -7,6 +7,8 @@
  */
 package org.dspace.app.sherpa.v2;
 
+import java.io.Serializable;
+
 /**
  * Plain java representation of a SHERPA Publisher object, based on SHERPA API v2 responses.
  *
@@ -18,7 +20,7 @@ package org.dspace.app.sherpa.v2;
  * @see SHERPAJournal
  * @see SHERPAPublisherResponse
  */
-public class SHERPAPublisher {
+public class SHERPAPublisher implements Serializable {
     private String name = null;
     private String relationshipType;
     private String country;
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPublisherPolicy.java b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPublisherPolicy.java
index 2a04564e28..3e76c5cd37 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPublisherPolicy.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAPublisherPolicy.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.app.sherpa.v2;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -22,7 +23,7 @@ import java.util.Map;
  * @see SHERPAJournal
  * @see SHERPAPermittedVersion
  */
-public class SHERPAPublisherPolicy {
+public class SHERPAPublisherPolicy implements Serializable {
 
     private int id;
     private boolean openAccessPermitted;
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAResponse.java b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAResponse.java
index a40814bafe..83dd1e0d3c 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAResponse.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPAResponse.java
@@ -10,12 +10,15 @@ package org.dspace.app.sherpa.v2;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
@@ -33,7 +36,10 @@ import org.json.JSONTokener;
  * @author Kim Shepherd
  *
  */
-public class SHERPAResponse {
+public class SHERPAResponse implements Serializable {
+
+    private static final long serialVersionUID = 2732963970169240597L;
+
     // Is this response to be treated as an error?
     private boolean error;
 
@@ -52,6 +58,9 @@ public class SHERPAResponse {
     // SHERPA URI (the human page version of this API response)
     private String uri;
 
+    @JsonIgnore
+    private Date retrievalTime = new Date();
+
     // Format enum - currently only JSON is supported
     public enum SHERPAFormat {
         JSON, XML
@@ -71,6 +80,11 @@ public class SHERPAResponse {
         }
     }
 
+    /**
+     * Create an empty SHERPAResponse representation
+     */
+    public SHERPAResponse() {}
+
     /**
      * Parse the SHERPA v2 API JSON and construct Romeo policy data for display
      * This method does not return a value, but rather populates the metadata and journals objects
@@ -479,6 +493,12 @@ public class SHERPAResponse {
         }
         permittedVersion.setLicenses(sherpaLicenses);
 
+        if (permitted.has("embargo")) {
+            JSONObject embargo = permitted.getJSONObject("embargo");
+            SHERPAEmbargo SHERPAEmbargo = new SHERPAEmbargo(embargo.getInt("amount"), embargo.getString("units"));
+            permittedVersion.setEmbargo(SHERPAEmbargo);
+        }
+
         return permittedVersion;
     }
 
@@ -542,4 +562,8 @@ public class SHERPAResponse {
     public SHERPASystemMetadata getMetadata() {
         return metadata;
     }
+
+    public Date getRetrievalTime() {
+        return retrievalTime;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPASystemMetadata.java b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPASystemMetadata.java
index 2a807940bb..65b07c1811 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPASystemMetadata.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/v2/SHERPASystemMetadata.java
@@ -7,6 +7,8 @@
  */
 package org.dspace.app.sherpa.v2;
 
+import java.io.Serializable;
+
 /**
  * Plain java representation of a SHERPA System Metadata object, based on SHERPA API v2 responses.
  *
@@ -18,7 +20,7 @@ package org.dspace.app.sherpa.v2;
  *
  * @author Kim Shepherd
  */
-public class SHERPASystemMetadata {
+public class SHERPASystemMetadata implements Serializable {
 
     private int id;
     private String uri;
diff --git a/dspace-api/src/main/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncCli.java b/dspace-api/src/main/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncCli.java
new file mode 100644
index 0000000000..f901c9ca56
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncCli.java
@@ -0,0 +1,175 @@
+/**
+ * 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/
+ */
+package org.dspace.app.solrdatabaseresync;
+
+import static org.dspace.discovery.indexobject.ItemIndexFactoryImpl.STATUS_FIELD;
+import static org.dspace.discovery.indexobject.ItemIndexFactoryImpl.STATUS_FIELD_PREDB;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.commons.cli.ParseException;
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.dspace.core.Context;
+import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.IndexingService;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.discovery.SearchUtils;
+import org.dspace.discovery.SolrSearchCore;
+import org.dspace.discovery.indexobject.IndexableItem;
+import org.dspace.discovery.indexobject.factory.IndexObjectFactoryFactory;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.util.SolrUtils;
+import org.dspace.utils.DSpace;
+
+/**
+ * {@link DSpaceRunnable} implementation to update solr items with "predb" status to either:
+ * - Delete them from solr if they're not present in the database
+ * - Remove their status if they're present in the database
+ */
+public class SolrDatabaseResyncCli extends DSpaceRunnable<SolrDatabaseResyncCliScriptConfiguration> {
+    /* Log4j logger */
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SolrDatabaseResyncCli.class);
+
+    public static final String TIME_UNTIL_REINDEX_PROPERTY = "solr-database-resync.time-until-reindex";
+
+    private IndexingService indexingService;
+    private SolrSearchCore solrSearchCore;
+    private IndexObjectFactoryFactory indexObjectServiceFactory;
+    private ConfigurationService configurationService;
+
+    private int timeUntilReindex = 0;
+    private String maxTime;
+
+    @Override
+    public SolrDatabaseResyncCliScriptConfiguration getScriptConfiguration() {
+        return new DSpace().getServiceManager()
+                .getServiceByName("solr-database-resync", SolrDatabaseResyncCliScriptConfiguration.class);
+    }
+
+    public static void runScheduled() throws Exception {
+        SolrDatabaseResyncCli script = new SolrDatabaseResyncCli();
+        script.setup();
+        script.internalRun();
+    }
+
+    @Override
+    public void setup() throws ParseException {
+        indexingService = DSpaceServicesFactory.getInstance().getServiceManager()
+                            .getServiceByName(IndexingService.class.getName(), IndexingService.class);
+        solrSearchCore = DSpaceServicesFactory.getInstance().getServiceManager()
+                            .getServicesByType(SolrSearchCore.class).get(0);
+        indexObjectServiceFactory = IndexObjectFactoryFactory.getInstance();
+        configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    }
+
+    @Override
+    public void internalRun() throws Exception {
+        logInfoAndOut("Starting Item resync of Solr and Database...");
+
+        timeUntilReindex = getTimeUntilReindex();
+        maxTime = getMaxTime();
+
+        Context context = new Context();
+
+        try {
+            context.turnOffAuthorisationSystem();
+            performStatusUpdate(context);
+        } finally {
+            context.restoreAuthSystemState();
+            context.complete();
+        }
+    }
+
+    private void performStatusUpdate(Context context) throws SearchServiceException, SolrServerException, IOException {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setQuery(STATUS_FIELD + ":" + STATUS_FIELD_PREDB);
+        solrQuery.addFilterQuery(SearchUtils.RESOURCE_TYPE_FIELD + ":" + IndexableItem.TYPE);
+        String dateRangeFilter = SearchUtils.LAST_INDEXED_FIELD + ":[* TO " + maxTime + "]";
+        logDebugAndOut("Date range filter used; " + dateRangeFilter);
+        solrQuery.addFilterQuery(dateRangeFilter);
+        solrQuery.addField(SearchUtils.RESOURCE_ID_FIELD);
+        solrQuery.addField(SearchUtils.RESOURCE_UNIQUE_ID);
+        QueryResponse response = solrSearchCore.getSolr().query(solrQuery, solrSearchCore.REQUEST_METHOD);
+
+        if (response != null) {
+            logInfoAndOut(response.getResults().size() + " items found to process");
+
+            for (SolrDocument doc : response.getResults()) {
+                String uuid = (String) doc.getFirstValue(SearchUtils.RESOURCE_ID_FIELD);
+                String uniqueId = (String) doc.getFirstValue(SearchUtils.RESOURCE_UNIQUE_ID);
+                logDebugAndOut("Processing item with UUID: " + uuid);
+
+                Optional<IndexableObject> indexableObject = Optional.empty();
+                try {
+                    indexableObject = indexObjectServiceFactory
+                            .getIndexableObjectFactory(uniqueId).findIndexableObject(context, uuid);
+                } catch (SQLException e) {
+                    log.warn("An exception occurred when attempting to retrieve item with UUID \"" + uuid +
+                            "\" from the database, removing related solr document", e);
+                }
+
+                try {
+                    if (indexableObject.isPresent()) {
+                        logDebugAndOut("Item exists in DB, updating solr document");
+                        updateItem(context, indexableObject.get());
+                    } else {
+                        logDebugAndOut("Item doesn't exist in DB, removing solr document");
+                        removeItem(context, uniqueId);
+                    }
+                } catch (SQLException | IOException e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
+        }
+
+        indexingService.commit();
+    }
+
+    private void updateItem(Context context, IndexableObject indexableObject) throws SolrServerException, IOException {
+        Map<String,Object> fieldModifier = new HashMap<>(1);
+        fieldModifier.put("remove", STATUS_FIELD_PREDB);
+        indexingService.atomicUpdate(context, indexableObject.getUniqueIndexID(), STATUS_FIELD, fieldModifier);
+    }
+
+    private void removeItem(Context context, String uniqueId) throws IOException, SQLException {
+        indexingService.unIndexContent(context, uniqueId);
+    }
+
+    private String getMaxTime() {
+        Calendar cal = Calendar.getInstance();
+        if (timeUntilReindex > 0) {
+            cal.add(Calendar.MILLISECOND, -timeUntilReindex);
+        }
+        return SolrUtils.getDateFormatter().format(cal.getTime());
+    }
+
+    private int getTimeUntilReindex() {
+        return configurationService.getIntProperty(TIME_UNTIL_REINDEX_PROPERTY, 0);
+    }
+
+    private void logInfoAndOut(String message) {
+        log.info(message);
+        System.out.println(message);
+    }
+
+    private void logDebugAndOut(String message) {
+        log.debug(message);
+        System.out.println(message);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncCliScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncCliScriptConfiguration.java
new file mode 100644
index 0000000000..b238ccf061
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncCliScriptConfiguration.java
@@ -0,0 +1,42 @@
+/**
+ * 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/
+ */
+package org.dspace.app.solrdatabaseresync;
+
+import org.apache.commons.cli.Options;
+import org.dspace.core.Context;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+
+/**
+ * The {@link ScriptConfiguration} for the {@link SolrDatabaseResyncCli} script.
+ */
+public class SolrDatabaseResyncCliScriptConfiguration extends ScriptConfiguration<SolrDatabaseResyncCli> {
+    private Class<SolrDatabaseResyncCli> dspaceRunnableClass;
+
+    @Override
+    public Class<SolrDatabaseResyncCli> getDspaceRunnableClass() {
+        return dspaceRunnableClass;
+    }
+
+    @Override
+    public void setDspaceRunnableClass(Class<SolrDatabaseResyncCli> dspaceRunnableClass) {
+        this.dspaceRunnableClass = dspaceRunnableClass;
+    }
+
+    @Override
+    public boolean isAllowedToExecute(Context context) {
+        return true;
+    }
+
+    @Override
+    public Options getOptions() {
+        if (options == null) {
+            options = new Options();
+        }
+        return options;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java b/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
index 264fb1b317..2e4ed69b26 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
@@ -29,6 +29,10 @@ import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
@@ -44,6 +48,7 @@ import org.dspace.services.factory.DSpaceServicesFactory;
  * files.  Most input can be configured; use the -help flag for a full list
  * of usage information.
  *
+ * <p>
  * The output of this file is plain text and forms an "aggregation" file which
  * can then be used for display purposes using the related ReportGenerator
  * class.
@@ -167,7 +172,7 @@ public class LogAnalyser {
     /**
      * the average number of views per item
      */
-    private static int views = 0;
+    private static long views = 0;
 
     ///////////////////////
     // regular expressions
@@ -236,12 +241,12 @@ public class LogAnalyser {
     /**
      * pattern to match commented out lines from the config file
      */
-    private static final Pattern comment = Pattern.compile("^#");
+    private static final Pattern COMMENT = Pattern.compile("^#");
 
     /**
      * pattern to match genuine lines from the config file
      */
-    private static final Pattern real = Pattern.compile("^(.+)=(.+)");
+    private static final Pattern REAL = Pattern.compile("^(.+)=(.+)");
 
     /**
      * pattern to match all search types
@@ -337,44 +342,73 @@ public class LogAnalyser {
         Date myEndDate = null;
         boolean myLookUp = false;
 
-        // read in our command line options
-        for (int i = 0; i < argv.length; i++) {
-            if (argv[i].equals("-log")) {
-                myLogDir = argv[i + 1];
-            }
+        // Define command line options.
+        Options options = new Options();
+        Option option;
 
-            if (argv[i].equals("-file")) {
-                myFileTemplate = argv[i + 1];
-            }
+        option = Option.builder().longOpt("log").hasArg().build();
+        options.addOption(option);
 
-            if (argv[i].equals("-cfg")) {
-                myConfigFile = argv[i + 1];
-            }
+        option = Option.builder().longOpt("file").hasArg().build();
+        options.addOption(option);
 
-            if (argv[i].equals("-out")) {
-                myOutFile = argv[i + 1];
-            }
+        option = Option.builder().longOpt("cfg").hasArg().build();
+        options.addOption(option);
 
-            if (argv[i].equals("-help")) {
-                LogAnalyser.usage();
-                System.exit(0);
-            }
+        option = Option.builder().longOpt("out").hasArg().build();
+        options.addOption(option);
 
-            if (argv[i].equals("-start")) {
-                myStartDate = parseDate(argv[i + 1]);
-            }
+        option = Option.builder().longOpt("help").build();
+        options.addOption(option);
 
-            if (argv[i].equals("-end")) {
-                myEndDate = parseDate(argv[i + 1]);
-            }
+        option = Option.builder().longOpt("start").hasArg().build();
+        options.addOption(option);
 
-            if (argv[i].equals("-lookup")) {
-                myLookUp = true;
-            }
+        option = Option.builder().longOpt("end").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("lookup").build();
+        options.addOption(option);
+
+        // Parse the command.
+        DefaultParser cmdParser = new DefaultParser();
+        CommandLine cmd = cmdParser.parse(options, argv);
+
+        // Analyze the command.
+        if (cmd.hasOption("help")) {
+            LogAnalyser.usage();
+            System.exit(0);
         }
 
+        if (cmd.hasOption("log")) {
+            myLogDir = cmd.getOptionValue("log");
+        }
+
+        if (cmd.hasOption("file")) {
+            myFileTemplate = cmd.getOptionValue("file");
+        }
+
+        if (cmd.hasOption("cfg")) {
+            myConfigFile = cmd.getOptionValue("cfg");
+        }
+
+        if (cmd.hasOption("out")) {
+            myOutFile = cmd.getOptionValue("out");
+        }
+
+        if (cmd.hasOption("start")) {
+            myStartDate = parseDate(cmd.getOptionValue("start"));
+        }
+
+        if (cmd.hasOption("end")) {
+            myEndDate = parseDate(cmd.getOptionValue("end"));
+        }
+
+        myLookUp = cmd.hasOption("lookup");
+
         // now call the method which actually processes the logs
-        processLogs(context, myLogDir, myFileTemplate, myConfigFile, myOutFile, myStartDate, myEndDate, myLookUp);
+        processLogs(context, myLogDir, myFileTemplate, myConfigFile, myOutFile,
+                myStartDate, myEndDate, myLookUp);
     }
 
     /**
@@ -406,18 +440,18 @@ public class LogAnalyser {
         startTime = new GregorianCalendar();
 
         //instantiate aggregators
-        actionAggregator = new HashMap<String, Integer>();
-        searchAggregator = new HashMap<String, Integer>();
-        userAggregator = new HashMap<String, Integer>();
-        itemAggregator = new HashMap<String, Integer>();
-        archiveStats = new HashMap<String, Integer>();
+        actionAggregator = new HashMap<>();
+        searchAggregator = new HashMap<>();
+        userAggregator = new HashMap<>();
+        itemAggregator = new HashMap<>();
+        archiveStats = new HashMap<>();
 
         //instantiate lists
-        generalSummary = new ArrayList<String>();
-        excludeWords = new ArrayList<String>();
-        excludeTypes = new ArrayList<String>();
-        excludeChars = new ArrayList<String>();
-        itemTypes = new ArrayList<String>();
+        generalSummary = new ArrayList<>();
+        excludeWords = new ArrayList<>();
+        excludeTypes = new ArrayList<>();
+        excludeChars = new ArrayList<>();
+        itemTypes = new ArrayList<>();
 
         // set the parameters for this analysis
         setParameters(myLogDir, myFileTemplate, myConfigFile, myOutFile, myStartDate, myEndDate, myLookUp);
@@ -529,10 +563,11 @@ public class LogAnalyser {
 
                             // for each search word add to the aggregator or
                             // increment the aggregator's counter
-                            for (int j = 0; j < words.length; j++) {
+                            for (String word : words) {
                                 // FIXME: perhaps aggregators ought to be objects
                                 // themselves
-                                searchAggregator.put(words[j], increment(searchAggregator, words[j]));
+                                searchAggregator.put(word,
+                                        increment(searchAggregator, word));
                             }
                         }
 
@@ -591,13 +626,13 @@ public class LogAnalyser {
         }
 
         // do the average views analysis
-        if ((archiveStats.get("All Items")).intValue() != 0) {
+        if ((archiveStats.get("All Items")) != 0) {
             // FIXME: this is dependent on their being a query on the db, which
             // there might not always be if it becomes configurable
-            Double avg = Math.ceil(
+            double avg = Math.ceil(
                 (actionAggregator.get("view_item")).doubleValue() /
                     (archiveStats.get("All Items")).doubleValue());
-            views = avg.intValue();
+            views = Math.round(avg);
         }
 
         // finally, write the output
@@ -672,55 +707,55 @@ public class LogAnalyser {
         Iterator<String> keys = null;
 
         // output the number of lines parsed
-        summary.append("log_lines=" + Integer.toString(lineCount) + "\n");
+        summary.append("log_lines=").append(Integer.toString(lineCount)).append("\n");
 
         // output the number of warnings encountered
-        summary.append("warnings=" + Integer.toString(warnCount) + "\n");
-        summary.append("exceptions=" + Integer.toString(excCount) + "\n");
+        summary.append("warnings=").append(Integer.toString(warnCount)).append("\n");
+        summary.append("exceptions=").append(Integer.toString(excCount)).append("\n");
 
         // set the general summary config up in the aggregator file
         for (int i = 0; i < generalSummary.size(); i++) {
-            summary.append("general_summary=" + generalSummary.get(i) + "\n");
+            summary.append("general_summary=").append(generalSummary.get(i)).append("\n");
         }
 
         // output the host name
-        summary.append("server_name=" + hostName + "\n");
+        summary.append("server_name=").append(hostName).append("\n");
 
         // output the service name
-        summary.append("service_name=" + name + "\n");
+        summary.append("service_name=").append(name).append("\n");
 
         // output the date information if necessary
         SimpleDateFormat sdf = new SimpleDateFormat("dd'/'MM'/'yyyy");
 
         if (startDate != null) {
-            summary.append("start_date=" + sdf.format(startDate) + "\n");
+            summary.append("start_date=").append(sdf.format(startDate)).append("\n");
         } else if (logStartDate != null) {
-            summary.append("start_date=" + sdf.format(logStartDate) + "\n");
+            summary.append("start_date=").append(sdf.format(logStartDate)).append("\n");
         }
 
         if (endDate != null) {
-            summary.append("end_date=" + sdf.format(endDate) + "\n");
+            summary.append("end_date=").append(sdf.format(endDate)).append("\n");
         } else if (logEndDate != null) {
-            summary.append("end_date=" + sdf.format(logEndDate) + "\n");
+            summary.append("end_date=").append(sdf.format(logEndDate)).append("\n");
         }
 
         // write out the archive stats
         keys = archiveStats.keySet().iterator();
         while (keys.hasNext()) {
             String key = keys.next();
-            summary.append("archive." + key + "=" + archiveStats.get(key) + "\n");
+            summary.append("archive.").append(key).append("=").append(archiveStats.get(key)).append("\n");
         }
 
         // write out the action aggregation results
         keys = actionAggregator.keySet().iterator();
         while (keys.hasNext()) {
             String key = keys.next();
-            summary.append("action." + key + "=" + actionAggregator.get(key) + "\n");
+            summary.append("action.").append(key).append("=").append(actionAggregator.get(key)).append("\n");
         }
 
         // depending on the config settings for reporting on emails output the
         // login information
-        summary.append("user_email=" + userEmail + "\n");
+        summary.append("user_email=").append(userEmail).append("\n");
         int address = 1;
         keys = userAggregator.keySet().iterator();
 
@@ -731,9 +766,10 @@ public class LogAnalyser {
             String key = keys.next();
             summary.append("user.");
             if (userEmail.equals("on")) {
-                summary.append(key + "=" + userAggregator.get(key) + "\n");
+                summary.append(key).append("=").append(userAggregator.get(key)).append("\n");
             } else if (userEmail.equals("alias")) {
-                summary.append("Address " + Integer.toString(address++) + "=" + userAggregator.get(key) + "\n");
+                summary.append("Address ").append(Integer.toString(address++))
+                        .append("=").append(userAggregator.get(key)).append("\n");
             }
         }
 
@@ -742,12 +778,13 @@ public class LogAnalyser {
         // the listing there are
 
         // output the search word information
-        summary.append("search_floor=" + searchFloor + "\n");
+        summary.append("search_floor=").append(searchFloor).append("\n");
         keys = searchAggregator.keySet().iterator();
         while (keys.hasNext()) {
             String key = keys.next();
-            if ((searchAggregator.get(key)).intValue() >= searchFloor) {
-                summary.append("search." + key + "=" + searchAggregator.get(key) + "\n");
+            if ((searchAggregator.get(key)) >= searchFloor) {
+                summary.append("search.").append(key).append("=")
+                        .append(searchAggregator.get(key)).append("\n");
             }
         }
 
@@ -759,35 +796,35 @@ public class LogAnalyser {
         //      be the same thing.
 
         // item viewing information
-        summary.append("item_floor=" + itemFloor + "\n");
-        summary.append("host_url=" + url + "\n");
-        summary.append("item_lookup=" + itemLookup + "\n");
+        summary.append("item_floor=").append(itemFloor).append("\n");
+        summary.append("host_url=").append(url).append("\n");
+        summary.append("item_lookup=").append(itemLookup).append("\n");
 
         // write out the item access information
         keys = itemAggregator.keySet().iterator();
         while (keys.hasNext()) {
             String key = keys.next();
-            if ((itemAggregator.get(key)).intValue() >= itemFloor) {
-                summary.append("item." + key + "=" + itemAggregator.get(key) + "\n");
+            if ((itemAggregator.get(key)) >= itemFloor) {
+                summary.append("item.").append(key).append("=")
+                        .append(itemAggregator.get(key)).append("\n");
             }
         }
 
         // output the average views per item
         if (views > 0) {
-            summary.append("avg_item_views=" + views + "\n");
+            summary.append("avg_item_views=").append(views).append("\n");
         }
 
         // insert the analysis processing time information
         Calendar endTime = new GregorianCalendar();
         long timeInMillis = (endTime.getTimeInMillis() - startTime.getTimeInMillis());
-        summary.append("analysis_process_time=" + Long.toString(timeInMillis / 1000) + "\n");
+        summary.append("analysis_process_time=")
+                .append(Long.toString(timeInMillis / 1000)).append("\n");
 
         // finally write the string into the output file
-        try {
-            BufferedWriter out = new BufferedWriter(new FileWriter(outFile));
+        try (BufferedWriter out = new BufferedWriter(new FileWriter(outFile));) {
             out.write(summary.toString());
             out.flush();
-            out.close();
         } catch (IOException e) {
             System.out.println("Unable to write to output file " + outFile);
             System.exit(0);
@@ -891,11 +928,11 @@ public class LogAnalyser {
             if (i > 0) {
                 wordRXString.append("|");
             }
-            wordRXString.append(" " + excludeWords.get(i) + " ");
+            wordRXString.append(" ").append(excludeWords.get(i)).append(" ");
             wordRXString.append("|");
-            wordRXString.append("^" + excludeWords.get(i) + " ");
+            wordRXString.append("^").append(excludeWords.get(i)).append(" ");
             wordRXString.append("|");
-            wordRXString.append(" " + excludeWords.get(i) + "$");
+            wordRXString.append(" ").append(excludeWords.get(i)).append("$");
         }
         wordRXString.append(")");
         wordRX = Pattern.compile(wordRXString.toString());
@@ -956,8 +993,8 @@ public class LogAnalyser {
         // read in the config file and set up our instance variables
         while ((record = br.readLine()) != null) {
             // check to see what kind of line we have
-            Matcher matchComment = comment.matcher(record);
-            Matcher matchReal = real.matcher(record);
+            Matcher matchComment = COMMENT.matcher(record);
+            Matcher matchReal = REAL.matcher(record);
 
             // if the line is not a comment and is real, read it in
             if (!matchComment.matches() && matchReal.matches()) {
@@ -968,7 +1005,7 @@ public class LogAnalyser {
                 // read the config values into our instance variables (see
                 // documentation for more info on config params)
                 if (key.equals("general.summary")) {
-                    actionAggregator.put(value, Integer.valueOf(0));
+                    actionAggregator.put(value, 0);
                     generalSummary.add(value);
                 }
 
@@ -1022,9 +1059,9 @@ public class LogAnalyser {
         Integer newValue = null;
         if (map.containsKey(key)) {
             // FIXME: this seems like a ridiculous way to add Integers
-            newValue = Integer.valueOf((map.get(key)).intValue() + 1);
+            newValue = (map.get(key)) + 1;
         } else {
-            newValue = Integer.valueOf(1);
+            newValue = 1;
         }
         return newValue;
     }
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java b/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
index 25c6d8cb9c..c5fe0072f5 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
@@ -27,6 +27,10 @@ import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.MetadataValue;
@@ -162,7 +166,7 @@ public class ReportGenerator {
     /**
      * pattern that matches an unqualified aggregator property
      */
-    private static final Pattern real = Pattern.compile("^(.+)=(.+)");
+    private static final Pattern REAL = Pattern.compile("^(.+)=(.+)");
 
     //////////////////////////
     // Miscellaneous variables
@@ -221,28 +225,46 @@ public class ReportGenerator {
         String myOutput = null;
         String myMap = null;
 
-        // read in our command line options
-        for (int i = 0; i < argv.length; i++) {
-            if (argv[i].equals("-format")) {
-                myFormat = argv[i + 1].toLowerCase();
-            }
+        Options options = new Options();
+        Option option;
 
-            if (argv[i].equals("-in")) {
-                myInput = argv[i + 1];
-            }
+        option = Option.builder().longOpt("format").hasArg().build();
+        options.addOption(option);
 
-            if (argv[i].equals("-out")) {
-                myOutput = argv[i + 1];
-            }
+        option = Option.builder().longOpt("in").hasArg().build();
+        options.addOption(option);
 
-            if (argv[i].equals("-map")) {
-                myMap = argv[i + 1];
-            }
+        option = Option.builder().longOpt("out").hasArg().build();
+        options.addOption(option);
 
-            if (argv[i].equals("-help")) {
-                usage();
-                System.exit(0);
-            }
+        option = Option.builder().longOpt("map").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("help").build();
+        options.addOption(option);
+
+        DefaultParser parser = new DefaultParser();
+        CommandLine cmd = parser.parse(options, argv);
+
+        if (cmd.hasOption("help")) {
+            usage();
+            System.exit(0);
+        }
+
+        if (cmd.hasOption("format")) {
+            myFormat = cmd.getOptionValue("format");
+        }
+
+        if (cmd.hasOption("in")) {
+            myInput = cmd.getOptionValue("in");
+        }
+
+        if (cmd.hasOption("out")) {
+            myOutput = cmd.getOptionValue("out");
+        }
+
+        if (cmd.hasOption("map")) {
+            myMap = cmd.getOptionValue("map");
         }
 
         processReport(context, myFormat, myInput, myOutput, myMap);
@@ -576,7 +598,7 @@ public class ReportGenerator {
 
             // loop through the map file and read in the values
             while ((record = br.readLine()) != null) {
-                Matcher matchReal = real.matcher(record);
+                Matcher matchReal = REAL.matcher(record);
 
                 // if the line is real then read it in
                 if (matchReal.matches()) {
@@ -650,7 +672,7 @@ public class ReportGenerator {
         // loop through the aggregator file and read in the values
         while ((record = br.readLine()) != null) {
             // match real lines
-            Matcher matchReal = real.matcher(record);
+            Matcher matchReal = REAL.matcher(record);
 
             // pre-prepare our input strings
             String section = null;
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java b/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
index fd72b3b805..cc8a7024f1 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
@@ -324,11 +324,7 @@ public class StatisticsLoader {
         ConfigurationService configurationService
                 = DSpaceServicesFactory.getInstance().getConfigurationService();
         File reportDir = new File(configurationService.getProperty("log.report.dir"));
-        if (reportDir != null) {
-            return reportDir.listFiles(new AnalysisAndReportFilter());
-        }
-
-        return null;
+        return reportDir.listFiles(new AnalysisAndReportFilter());
     }
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/app/util/CacheSnooper.java b/dspace-api/src/main/java/org/dspace/app/util/CacheSnooper.java
deleted file mode 100644
index 22ad518ea3..0000000000
--- a/dspace-api/src/main/java/org/dspace/app/util/CacheSnooper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * 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/
- */
-
-package org.dspace.app.util;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import org.dspace.core.Context;
-import org.dspace.servicemanager.DSpaceKernelImpl;
-import org.dspace.servicemanager.DSpaceKernelInit;
-import org.dspace.services.CachingService;
-
-/**
- * List all EhCache CacheManager and Cache instances.
- *
- * <p>This is a debugging tool, not used in the daily operation of DSpace.
- * Just run it from the installed instance using
- * {@code bin/dspace dsrun org.dspace.app.util.CacheSnooper}
- * to check that the cache configuration is what you expect it to be,
- * given your configuration.
- *
- * <p>This was created to prove a specific cache configuration patch,
- * but I leave it here in the hope that it may be useful to others.
- *
- * @author Mark H. Wood <mwood@iupui.edu>
- */
-public class CacheSnooper {
-    private CacheSnooper() { }
-
-    public static void main(String[] argv) {
-        // Ensure that the DSpace kernel is started.
-        DSpaceKernelImpl kernel = DSpaceKernelInit.getKernel(null);
-
-        // Ensure that the services cache manager is started.
-        CachingService serviceCaches = kernel.getServiceManager()
-                .getServiceByName(null, CachingService.class);
-
-        // Ensure that the database layer is started.
-        Context ctx = new Context();
-
-        // List those caches!
-        for (CacheManager manager : CacheManager.ALL_CACHE_MANAGERS) {
-            System.out.format("CacheManager:  %s%n", manager);
-            for (String cacheName : manager.getCacheNames()) {
-                Cache cache = manager.getCache(cacheName);
-                System.out.format("       Cache:  '%s'; maxHeap:  %d; maxDisk:  %d%n",
-                        cacheName,
-                        cache.getCacheConfiguration().getMaxEntriesLocalHeap(),
-                        cache.getCacheConfiguration().getMaxEntriesLocalDisk());
-            }
-        }
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/app/util/Configuration.java b/dspace-api/src/main/java/org/dspace/app/util/Configuration.java
index e9b125c41c..e4a59eeb4d 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/Configuration.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/Configuration.java
@@ -37,6 +37,7 @@ public class Configuration {
      * <li>{@code --property name} prints the value of the DSpace configuration
      * property {@code name} to the standard output.</li>
      * <li>{@code --raw} suppresses parameter substitution in the output.</li>
+     * <li>{@code --first} print only the first of multiple values.</li>
      * <li>{@code --help} describes these options.</li>
      * </ul>
      * If the property does not exist, nothing is written.
@@ -51,6 +52,8 @@ public class Configuration {
                           "optional name of the module in which 'property' exists");
         options.addOption("r", "raw", false,
                           "do not do property substitution on the value");
+        options.addOption("f", "first", false,
+                          "display only the first value of an array property");
         options.addOption("?", "Get help");
         options.addOption("h", "help", false, "Get help");
 
@@ -90,19 +93,36 @@ public class Configuration {
         propNameBuilder.append(cmd.getOptionValue('p'));
         String propName = propNameBuilder.toString();
 
-        // Print the property's value, if it exists
+        // Print the property's value(s), if it exists
         ConfigurationService cfg = DSpaceServicesFactory.getInstance().getConfigurationService();
         if (!cfg.hasProperty(propName)) {
             System.out.println();
         } else {
-            String val;
             if (cmd.hasOption('r')) {
-                val = cfg.getPropertyValue(propName).toString();
+                // Print "raw" values (without property substitutions)
+                Object rawValue = cfg.getPropertyValue(propName);
+                if (rawValue.getClass().isArray()) {
+                    for (Object value : (Object[]) rawValue) {
+                        System.out.println(value.toString());
+                        if (cmd.hasOption('f')) {
+                            break; // If --first print only one value
+                        }
+                    }
+                } else { // Not an array
+                    System.out.println(rawValue.toString());
+                }
             } else {
-                val = cfg.getProperty(propName);
+                // Print values with property substitutions
+                String[] values = cfg.getArrayProperty(propName);
+                for (String value : values) {
+                    System.out.println(value);
+                    if (cmd.hasOption('f')) {
+                        break; // If --first print only one value
+                    }
+                }
             }
-            System.out.println(val);
         }
+
         System.exit(0);
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/util/DCInput.java b/dspace-api/src/main/java/org/dspace/app/util/DCInput.java
index 32fd5d634d..11f9aadd86 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/DCInput.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/DCInput.java
@@ -10,6 +10,7 @@ package org.dspace.app.util;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import javax.annotation.Nullable;
@@ -131,10 +132,15 @@ public class DCInput {
     private boolean closedVocabulary = false;
 
     /**
-     * the regex to comply with, null if nothing
+     * the regex in ECMAScript standard format, usable also by rests.
      */
     private String regex = null;
 
+    /**
+     * the computed pattern, null if nothing
+     */
+    private Pattern pattern = null;
+
     /**
      * allowed document types
      */
@@ -144,8 +150,8 @@ public class DCInput {
     private boolean isMetadataField = false;
     private String relationshipType = null;
     private String searchConfiguration = null;
-    private String filter;
-    private List<String> externalSources;
+    private final String filter;
+    private final List<String> externalSources;
 
     /**
      * The scope of the input sets, this restricts hidden metadata fields from
@@ -178,7 +184,7 @@ public class DCInput {
 
         //check if the input have a language tag
         language = Boolean.valueOf(fieldMap.get("language"));
-        valueLanguageList = new ArrayList();
+        valueLanguageList = new ArrayList<>();
         if (language) {
             String languageNameTmp = fieldMap.get("value-pairs-name");
             if (StringUtils.isBlank(languageNameTmp)) {
@@ -191,7 +197,7 @@ public class DCInput {
         repeatable = "true".equalsIgnoreCase(repStr)
             || "yes".equalsIgnoreCase(repStr);
         String nameVariantsString = fieldMap.get("name-variants");
-        nameVariants = (StringUtils.isNotBlank(nameVariantsString)) ?
+        nameVariants = StringUtils.isNotBlank(nameVariantsString) ?
                 nameVariantsString.equalsIgnoreCase("true") : false;
         label = fieldMap.get("label");
         inputType = fieldMap.get("input-type");
@@ -203,11 +209,11 @@ public class DCInput {
         }
         hint = fieldMap.get("hint");
         warning = fieldMap.get("required");
-        required = (warning != null && warning.length() > 0);
+        required = warning != null && warning.length() > 0;
         visibility = fieldMap.get("visibility");
         readOnly = fieldMap.get("readonly");
         vocabulary = fieldMap.get("vocabulary");
-        regex = fieldMap.get("regex");
+        this.initRegex(fieldMap.get("regex"));
         String closedVocabularyStr = fieldMap.get("closedVocabulary");
         closedVocabulary = "true".equalsIgnoreCase(closedVocabularyStr)
             || "yes".equalsIgnoreCase(closedVocabularyStr);
@@ -238,6 +244,22 @@ public class DCInput {
 
     }
 
+    protected void initRegex(String regex) {
+        this.regex = null;
+        this.pattern = null;
+        if (regex != null) {
+            try {
+                Optional.ofNullable(RegexPatternUtils.computePattern(regex))
+                    .ifPresent(pattern -> {
+                        this.pattern = pattern;
+                        this.regex = regex;
+                    });
+            } catch (PatternSyntaxException e) {
+                log.warn("The regex field of input {} with value {} is invalid!", this.label, regex);
+            }
+        }
+    }
+
     /**
      * Is this DCInput for display in the given scope? The scope should be
      * either "workflow" or "submit", as per the input forms definition. If the
@@ -248,7 +270,7 @@ public class DCInput {
      * @return whether the input should be displayed or not
      */
     public boolean isVisible(String scope) {
-        return (visibility == null || visibility.equals(scope));
+        return visibility == null || visibility.equals(scope);
     }
 
     /**
@@ -381,7 +403,7 @@ public class DCInput {
 
     /**
      * Get the style for this form field
-     * 
+     *
      * @return the style
      */
     public String getStyle() {
@@ -512,8 +534,12 @@ public class DCInput {
         return visibility;
     }
 
+    public Pattern getPattern() {
+        return this.pattern;
+    }
+
     public String getRegex() {
-        return regex;
+        return this.regex;
     }
 
     public String getFieldName() {
@@ -546,34 +572,45 @@ public class DCInput {
     public boolean validate(String value) {
         if (StringUtils.isNotBlank(value)) {
             try {
-                if (StringUtils.isNotBlank(regex)) {
-                    Pattern pattern = Pattern.compile(regex);
+                if (this.pattern != null) {
                     if (!pattern.matcher(value).matches()) {
                         return false;
                     }
                 }
             } catch (PatternSyntaxException ex) {
-                log.error("Regex validation failed!", ex.getMessage());
+                log.error("Regex validation failed!  {}", ex.getMessage());
             }
 
         }
-
         return true;
     }
 
     /**
-     * Verify whether the current field contains an entity relationship
-     * This also implies a relationship type is defined for this field
-     * The field can contain both an entity relationship and a metadata field simultaneously
+     * Get the type bind list for use in determining whether
+     * to display this field in angular dynamic form building
+     * @return list of bound types
+     */
+    public List<String> getTypeBindList() {
+        return typeBind;
+    }
+
+    /**
+     * Verify whether the current field contains an entity relationship.
+     * This also implies a relationship type is defined for this field.
+     * The field can contain both an entity relationship and a metadata field
+     * simultaneously.
+     * @return true if the field contains a relationship.
      */
     public boolean isRelationshipField() {
         return isRelationshipField;
     }
 
     /**
-     * Verify whether the current field contains a metadata field
-     * This also implies a field type is defined for this field
-     * The field can contain both an entity relationship and a metadata field simultaneously
+     * Verify whether the current field contains a metadata field.
+     * This also implies a field type is defined for this field.
+     * The field can contain both an entity relationship and a metadata field
+     * simultaneously.
+     * @return true if the field contains a metadata field.
      */
     public boolean isMetadataField() {
         return isMetadataField;
diff --git a/dspace-api/src/main/java/org/dspace/app/util/DCInputSet.java b/dspace-api/src/main/java/org/dspace/app/util/DCInputSet.java
index bfd4270cf2..e903c11b13 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/DCInputSet.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/DCInputSet.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.app.util;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -16,7 +17,6 @@ import org.dspace.core.Utils;
  * Class representing all DC inputs required for a submission, organized into pages
  *
  * @author Brian S. Hughes, based on work by Jenny Toves, OCLC
- * @version $Revision$
  */
 
 public class DCInputSet {
@@ -33,7 +33,6 @@ public class DCInputSet {
      * constructor
      *
      * @param formName       form name
-     * @param mandatoryFlags
      * @param rows           the rows
      * @param listMap        map
      */
@@ -176,4 +175,50 @@ public class DCInputSet {
         return true;
     }
 
+    /**
+     * Iterate DC input rows and populate a list of all allowed field names in this submission configuration.
+     * This is important because an input can be configured repeatedly in a form (for example it could be required
+     * for type Book, and allowed but not required for type Article).
+     * If the field is allowed for this document type it'll never be stripped from metadata on validation.
+     *
+     * This can be more efficient than isFieldPresent to avoid looping the input set with each check.
+     *
+     * @param documentTypeValue     Document type eg. Article, Book
+     * @return                      ArrayList of field names to use in validation
+     */
+    public List<String> populateAllowedFieldNames(String documentTypeValue) {
+        List<String> allowedFieldNames = new ArrayList<>();
+        // Before iterating each input for validation, run through all inputs + fields and populate a lookup
+        // map with inputs for this type. Because an input can be configured repeatedly in a form (for example
+        // it could be required for type Book, and allowed but not required for type Article), allowed=true will
+        // always take precedence
+        for (DCInput[] row : inputs) {
+            for (DCInput input : row) {
+                if (input.isQualdropValue()) {
+                    List<Object> inputPairs = input.getPairs();
+                    //starting from the second element of the list and skipping one every time because the display
+                    // values are also in the list and before the stored values.
+                    for (int i = 1; i < inputPairs.size(); i += 2) {
+                        String fullFieldname = input.getFieldName() + "." + inputPairs.get(i);
+                        if (input.isAllowedFor(documentTypeValue)) {
+                            if (!allowedFieldNames.contains(fullFieldname)) {
+                                allowedFieldNames.add(fullFieldname);
+                            }
+                            // For the purposes of qualdrop, we have to add the field name without the qualifier
+                            // too, or a required qualdrop will get confused and incorrectly reject a value
+                            if (!allowedFieldNames.contains(input.getFieldName())) {
+                                allowedFieldNames.add(input.getFieldName());
+                            }
+                        }
+                    }
+                } else {
+                    if (input.isAllowedFor(documentTypeValue) && !allowedFieldNames.contains(input.getFieldName())) {
+                        allowedFieldNames.add(input.getFieldName());
+                    }
+                }
+            }
+        }
+        return allowedFieldNames;
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/util/GoogleBitstreamComparator.java b/dspace-api/src/main/java/org/dspace/app/util/GoogleBitstreamComparator.java
index add98af96f..ae6ba7e83f 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/GoogleBitstreamComparator.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/GoogleBitstreamComparator.java
@@ -86,8 +86,10 @@ public class GoogleBitstreamComparator implements Comparator<Bitstream> {
         if (priority1 > priority2) {
             return 1;
         } else if (priority1 == priority2) {
-            if (b1.getSizeBytes() <= b2.getSizeBytes()) {
+            if (b1.getSizeBytes() < b2.getSizeBytes()) {
                 return 1;
+            } else if (b1.getSizeBytes() == b2.getSizeBytes()) {
+                return 0;
             } else {
                 return -1;
             }
diff --git a/dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java b/dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java
index 0021f26700..c4f3f2235e 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java
@@ -42,7 +42,7 @@ import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * Configuration and mapping for Google Scholar output metadata
@@ -470,11 +470,7 @@ public class GoogleMetadata {
             parsedOptions.add(parsedFields);
         }
 
-        if (null != parsedOptions) {
-            return parsedOptions;
-        } else {
-            return null;
-        }
+        return parsedOptions;
     }
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java
index 97f25cb2b2..514143c93e 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java
@@ -16,10 +16,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import com.sun.syndication.feed.module.opensearch.OpenSearchModule;
-import com.sun.syndication.feed.module.opensearch.entity.OSQuery;
-import com.sun.syndication.feed.module.opensearch.impl.OpenSearchModuleImpl;
-import com.sun.syndication.io.FeedException;
+import com.rometools.modules.opensearch.OpenSearchModule;
+import com.rometools.modules.opensearch.entity.OSQuery;
+import com.rometools.modules.opensearch.impl.OpenSearchModuleImpl;
+import com.rometools.rome.io.FeedException;
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.util.service.OpenSearchService;
 import org.dspace.content.DSpaceObject;
@@ -29,11 +30,11 @@ import org.dspace.discovery.IndexableObject;
 import org.dspace.handle.service.HandleService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.output.DOMOutputter;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.output.DOMOutputter;
+import org.jdom2.output.XMLOutputter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.w3c.dom.Document;
 
@@ -96,7 +97,7 @@ public class OpenSearchServiceImpl implements OpenSearchService {
      * Get base search UI URL (websvc.opensearch.uicontext)
      */
     protected String getBaseSearchUIURL() {
-        return configurationService.getProperty("dspace.server.url") + "/" +
+        return configurationService.getProperty("dspace.ui.url") + "/" +
             configurationService.getProperty("websvc.opensearch.uicontext");
     }
 
@@ -177,7 +178,9 @@ public class OpenSearchServiceImpl implements OpenSearchService {
         OSQuery osq = new OSQuery();
         osq.setRole("request");
         try {
-            osq.setSearchTerms(URLEncoder.encode(query, "UTF-8"));
+            if (StringUtils.isNotBlank(query)) {
+                osq.setSearchTerms(URLEncoder.encode(query, "UTF-8"));
+            }
         } catch (UnsupportedEncodingException e) {
             log.error(e);
         }
@@ -192,7 +195,7 @@ public class OpenSearchServiceImpl implements OpenSearchService {
      * @param scope - null for the entire repository, or a collection/community handle
      * @return Service Document
      */
-    protected org.jdom.Document getServiceDocument(String scope) {
+    protected org.jdom2.Document getServiceDocument(String scope) {
         ConfigurationService config = DSpaceServicesFactory.getInstance().getConfigurationService();
 
         Namespace ns = Namespace.getNamespace(osNs);
@@ -245,7 +248,7 @@ public class OpenSearchServiceImpl implements OpenSearchService {
             url.setAttribute("template", template.toString());
             root.addContent(url);
         }
-        return new org.jdom.Document(root);
+        return new org.jdom2.Document(root);
     }
 
     /**
@@ -255,7 +258,7 @@ public class OpenSearchServiceImpl implements OpenSearchService {
      * @return W3C Document object
      * @throws IOException if IO error
      */
-    protected Document jDomToW3(org.jdom.Document jdomDoc) throws IOException {
+    protected Document jDomToW3(org.jdom2.Document jdomDoc) throws IOException {
         DOMOutputter domOut = new DOMOutputter();
         try {
             return domOut.output(jdomDoc);
diff --git a/dspace-api/src/main/java/org/dspace/app/util/OptimizeSelectCollection.java b/dspace-api/src/main/java/org/dspace/app/util/OptimizeSelectCollection.java
index 1e018ff889..5dd286726d 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/OptimizeSelectCollection.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/OptimizeSelectCollection.java
@@ -11,7 +11,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
@@ -23,12 +22,12 @@ import org.dspace.eperson.service.EPersonService;
 import org.springframework.util.StopWatch;
 
 /**
+ * A command line tool to verify/test the accuracy and speed gains of
+ * {@link Collection.findAuthorizedOptimized}.
+ * Invocation: {@code dsrun org.dspace.app.util.OptimizeSelectCollection}
  * @author peterdietz
- * A command line tool to verify/test the accuracy and speed gains of Collection.findAuthorizedOptimized()
- * Invocation: dsrun org.dspace.app.util.OptimizeSelectCollection
  */
 public class OptimizeSelectCollection {
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(OptimizeSelectCollection.class);
     private static Context context;
 
     private static ArrayList<EPerson> brokenPeople;
@@ -49,7 +48,7 @@ public class OptimizeSelectCollection {
                          "values as the legacy select-collection logic.");
 
         context = new Context();
-        brokenPeople = new ArrayList<EPerson>();
+        brokenPeople = new ArrayList<>();
         int peopleChecked = 0;
         timeSavedMS = 0L;
 
@@ -68,7 +67,7 @@ public class OptimizeSelectCollection {
             }
         }
 
-        if (brokenPeople.size() > 0) {
+        if (!brokenPeople.isEmpty()) {
             System.out.println("NOT DONE YET!!! Some people don't have all their collections.");
             for (EPerson person : brokenPeople) {
                 System.out.println("-- " + person.getEmail());
@@ -90,7 +89,7 @@ public class OptimizeSelectCollection {
         stopWatch.start("findAuthorized");
         List<Collection> collections = collectionService.findAuthorized(context, null, Constants.ADD);
         stopWatch.stop();
-        Long defaultMS = stopWatch.getLastTaskTimeMillis();
+        long defaultMS = stopWatch.getLastTaskTimeMillis();
 
         stopWatch.start("ListingCollections");
         System.out.println("Legacy Find Authorized");
@@ -100,7 +99,7 @@ public class OptimizeSelectCollection {
         stopWatch.start("findAuthorizedOptimized");
         List<Collection> collectionsOptimized = collectionService.findAuthorizedOptimized(context, Constants.ADD);
         stopWatch.stop();
-        Long optimizedMS = stopWatch.getLastTaskTimeMillis();
+        long optimizedMS = stopWatch.getLastTaskTimeMillis();
         timeSavedMS += defaultMS - optimizedMS;
 
 
diff --git a/dspace-api/src/main/java/org/dspace/app/util/RegexPatternUtils.java b/dspace-api/src/main/java/org/dspace/app/util/RegexPatternUtils.java
new file mode 100644
index 0000000000..578e57fb09
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/util/RegexPatternUtils.java
@@ -0,0 +1,73 @@
+/**
+ * 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/
+ */
+package org.dspace.app.util;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Utility class useful for check regex and patterns.
+ *
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ *
+ */
+public class RegexPatternUtils {
+
+    // checks input having the format /{pattern}/{flags}
+    // allowed flags are: g,i,m,s,u,y
+    public static final String REGEX_INPUT_VALIDATOR = "(/?)(.+)\\1([gimsuy]*)";
+    // flags usable inside regex definition using format (?i|m|s|u|y)
+    public static final String REGEX_FLAGS = "(?%s)";
+    public static final Pattern PATTERN_REGEX_INPUT_VALIDATOR =
+        Pattern.compile(REGEX_INPUT_VALIDATOR, CASE_INSENSITIVE);
+
+    /**
+     * Computes a pattern starting from a regex definition with flags that
+     * uses the standard format: <code>/{regex}/{flags}</code> (ECMAScript format).
+     * This method can transform an ECMAScript regex into a java {@code Pattern} object
+     * wich can be used to validate strings.
+     * <br/>
+     * If regex is null, empty or blank a null {@code Pattern} will be retrieved
+     * If it's a valid regex, then a non-null {@code Pattern} will be retrieved,
+     * an exception will be thrown otherwise.
+     *
+     * @param regex with format <code>/{regex}/{flags}</code>
+     * @return {@code Pattern} regex pattern instance
+     * @throws PatternSyntaxException
+     */
+    public static final Pattern computePattern(String regex) throws PatternSyntaxException {
+        if (StringUtils.isBlank(regex)) {
+            return null;
+        }
+        Matcher inputMatcher = PATTERN_REGEX_INPUT_VALIDATOR.matcher(regex);
+        String regexPattern = regex;
+        String regexFlags = "";
+        if (inputMatcher.matches()) {
+            regexPattern =
+                Optional.of(inputMatcher.group(2))
+                    .filter(StringUtils::isNotBlank)
+                    .orElse(regex);
+            regexFlags =
+                Optional.ofNullable(inputMatcher.group(3))
+                    .filter(StringUtils::isNotBlank)
+                    .map(flags -> String.format(REGEX_FLAGS, flags))
+                    .orElse("")
+                    .replaceAll("g", "");
+        }
+        return Pattern.compile(regexFlags + regexPattern);
+    }
+
+    private RegexPatternUtils() {}
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java b/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
index 2576df0193..8f155b6330 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
@@ -15,26 +15,26 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
-import com.sun.syndication.feed.module.DCModule;
-import com.sun.syndication.feed.module.DCModuleImpl;
-import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.feed.module.itunes.EntryInformation;
-import com.sun.syndication.feed.module.itunes.EntryInformationImpl;
-import com.sun.syndication.feed.module.itunes.types.Duration;
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEnclosure;
-import com.sun.syndication.feed.synd.SyndEnclosureImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.feed.synd.SyndImage;
-import com.sun.syndication.feed.synd.SyndImageImpl;
-import com.sun.syndication.feed.synd.SyndPerson;
-import com.sun.syndication.feed.synd.SyndPersonImpl;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.modules.itunes.EntryInformation;
+import com.rometools.modules.itunes.EntryInformationImpl;
+import com.rometools.modules.itunes.types.Duration;
+import com.rometools.rome.feed.module.DCModule;
+import com.rometools.rome.feed.module.DCModuleImpl;
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.feed.synd.SyndContent;
+import com.rometools.rome.feed.synd.SyndContentImpl;
+import com.rometools.rome.feed.synd.SyndEnclosure;
+import com.rometools.rome.feed.synd.SyndEnclosureImpl;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndEntryImpl;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
+import com.rometools.rome.feed.synd.SyndImage;
+import com.rometools.rome.feed.synd.SyndImageImpl;
+import com.rometools.rome.feed.synd.SyndPerson;
+import com.rometools.rome.feed.synd.SyndPersonImpl;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedOutput;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
@@ -193,13 +193,11 @@ public class SyndicationFeed {
         String defaultTitle = null;
         boolean podcastFeed = false;
         this.request = request;
-
         // dso is null for the whole site, or a search without scope
         if (dso == null) {
             defaultTitle = configurationService.getProperty("dspace.name");
             feed.setDescription(localize(labels, MSG_FEED_DESCRIPTION));
             objectURL = resolveURL(request, null);
-            logoURL = configurationService.getProperty("webui.feed.logo.url");
         } else {
             Bitstream logo = null;
             if (dso instanceof IndexableCollection) {
@@ -329,7 +327,8 @@ public class SyndicationFeed {
                     dcDescriptionField != null) {
                     DCModule dc = new DCModuleImpl();
                     if (dcCreatorField != null) {
-                        List<MetadataValue> dcAuthors = itemService.getMetadataByMetadataString(item, dcCreatorField);
+                        List<MetadataValue> dcAuthors = itemService
+                                .getMetadataByMetadataString(item, dcCreatorField);
                         if (dcAuthors.size() > 0) {
                             List<String> creators = new ArrayList<>();
                             for (MetadataValue author : dcAuthors) {
@@ -345,7 +344,8 @@ public class SyndicationFeed {
                         }
                     }
                     if (dcDescriptionField != null) {
-                        List<MetadataValue> v = itemService.getMetadataByMetadataString(item, dcDescriptionField);
+                        List<MetadataValue> v = itemService
+                                .getMetadataByMetadataString(item, dcDescriptionField);
                         if (v.size() > 0) {
                             StringBuilder descs = new StringBuilder();
                             for (MetadataValue d : v) {
@@ -376,6 +376,7 @@ public class SyndicationFeed {
                                     enc.setLength(bit.getSizeBytes());
                                     enc.setUrl(urlOfBitstream(request, bit));
                                     enclosures.add(enc);
+
                                 }
                             }
                         }
@@ -419,7 +420,7 @@ public class SyndicationFeed {
                     // with length of song in seconds
                     if (extent != null && extent.length() > 0) {
                         extent = extent.split(" ")[0];
-                        Integer duration = Integer.parseInt(extent);
+                        long duration = Long.parseLong(extent);
                         itunes.setDuration(new Duration(duration));             // <itunes:duration>
                     }
 
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationMethod.java b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationMethod.java
index 25d31776cc..274779e928 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationMethod.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationMethod.java
@@ -224,4 +224,15 @@ public interface AuthenticationMethod {
      * @return whether the authentication method is being used.
      */
     public boolean isUsed(Context context, HttpServletRequest request);
+
+    /**
+     * Check if the given current password is valid to change the password of the
+     * given ePerson
+     * @param  context         The DSpace context
+     * @param  ePerson         the ePerson related to the password change
+     * @param  currentPassword The current password to check
+     * @return                 true if the provided password matches with current
+     *                         password
+     */
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword);
 }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationServiceImpl.java b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationServiceImpl.java
index 1270c1cb2c..a9449b87d4 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationServiceImpl.java
@@ -207,4 +207,16 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
         return null;
     }
+
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+
+        for (AuthenticationMethod method : getAuthenticationMethodStack()) {
+            if (method.getName().equals(context.getAuthenticationMethod())) {
+                return method.canChangePassword(context, ePerson, currentPassword);
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java
index 67405b5c1c..9c37fcee47 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java
@@ -278,4 +278,9 @@ public class IPAuthentication implements AuthenticationMethod {
     public boolean isUsed(final Context context, final HttpServletRequest request) {
         return false;
     }
+
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        return false;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
index 520a5f62a6..f3c6022e02 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
@@ -752,4 +752,9 @@ public class LDAPAuthentication
         }
         return false;
     }
+
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        return false;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthentication.java
index edaa87dd13..5d4635d48e 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthentication.java
@@ -86,4 +86,9 @@ public class OidcAuthentication implements AuthenticationMethod {
         return false;
     }
 
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        return false;
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java b/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java
index 41b40066b3..8a4ac190c8 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java
@@ -294,4 +294,9 @@ public class OidcAuthenticationBean implements AuthenticationMethod {
         return false;
     }
 
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        return false;
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthentication.java
new file mode 100644
index 0000000000..3e9ff6638a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthentication.java
@@ -0,0 +1,109 @@
+/**
+ * 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/
+ */
+package org.dspace.authenticate;
+
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.dspace.authenticate.factory.AuthenticateServiceFactory;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
+import org.dspace.kernel.ServiceManager;
+import org.dspace.utils.DSpace;
+
+/**
+ * Implementation of {@link AuthenticationMethod} that delegate all the method
+ * invocations to the bean of class {@link OrcidAuthenticationBean}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidAuthentication implements AuthenticationMethod {
+
+    private final ServiceManager serviceManager = new DSpace().getServiceManager();
+
+    /**
+     * Check if OrcidAuthentication plugin is enabled
+     * @return true if enabled, false otherwise
+     */
+    public static boolean isEnabled() {
+
+        String pluginName = new OrcidAuthentication().getName();
+
+        Iterator<AuthenticationMethod> authenticationMethodIterator = AuthenticateServiceFactory.getInstance()
+            .getAuthenticationService().authenticationMethodIterator();
+
+        while (authenticationMethodIterator.hasNext()) {
+            if (pluginName.equals(authenticationMethodIterator.next().getName())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean canSelfRegister(Context context, HttpServletRequest request, String username) throws SQLException {
+        return getOrcidAuthentication().canSelfRegister(context, request, username);
+    }
+
+    @Override
+    public void initEPerson(Context context, HttpServletRequest request, EPerson eperson) throws SQLException {
+        getOrcidAuthentication().initEPerson(context, request, eperson);
+    }
+
+    @Override
+    public boolean allowSetPassword(Context context, HttpServletRequest request, String username) throws SQLException {
+        return getOrcidAuthentication().allowSetPassword(context, request, username);
+    }
+
+    @Override
+    public boolean isImplicit() {
+        return getOrcidAuthentication().isImplicit();
+    }
+
+    @Override
+    public List<Group> getSpecialGroups(Context context, HttpServletRequest request) throws SQLException {
+        return getOrcidAuthentication().getSpecialGroups(context, request);
+    }
+
+    @Override
+    public int authenticate(Context context, String username, String password, String realm, HttpServletRequest request)
+        throws SQLException {
+        return getOrcidAuthentication().authenticate(context, username, password, realm, request);
+    }
+
+    @Override
+    public String loginPageURL(Context context, HttpServletRequest request, HttpServletResponse response) {
+        return getOrcidAuthentication().loginPageURL(context, request, response);
+    }
+
+    @Override
+    public String getName() {
+        return getOrcidAuthentication().getName();
+    }
+
+    private OrcidAuthenticationBean getOrcidAuthentication() {
+        return serviceManager.getServiceByName("orcidAuthentication", OrcidAuthenticationBean.class);
+    }
+
+    @Override
+    public boolean isUsed(Context context, HttpServletRequest request) {
+        return getOrcidAuthentication().isUsed(context, request);
+    }
+
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        return false;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
new file mode 100644
index 0000000000..a11bbfc867
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
@@ -0,0 +1,335 @@
+/**
+ * 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/
+ */
+package org.dspace.authenticate;
+
+import static java.lang.String.format;
+import static java.net.URLEncoder.encode;
+import static org.apache.commons.lang.BooleanUtils.toBoolean;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.dspace.content.Item.ANY;
+
+import java.io.UnsupportedEncodingException;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.dspace.services.ConfigurationService;
+import org.orcid.jaxb.model.v3.release.record.Email;
+import org.orcid.jaxb.model.v3.release.record.Person;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * ORCID authentication for DSpace.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidAuthenticationBean implements AuthenticationMethod {
+
+    public static final String ORCID_AUTH_ATTRIBUTE = "orcid-authentication";
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(OrcidAuthenticationBean.class);
+
+    private final static String LOGIN_PAGE_URL_FORMAT = "%s?client_id=%s&response_type=code&scope=%s&redirect_uri=%s";
+
+    @Autowired
+    private OrcidClient orcidClient;
+
+    @Autowired
+    private OrcidConfiguration orcidConfiguration;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private EPersonService ePersonService;
+
+    @Autowired
+    private ResearcherProfileService researcherProfileService;
+
+    @Autowired
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    @Override
+    public int authenticate(Context context, String username, String password, String realm, HttpServletRequest request)
+        throws SQLException {
+
+        if (request == null) {
+            LOGGER.warn("Unable to authenticate using ORCID because the request object is null.");
+            return BAD_ARGS;
+        }
+
+        String code = (String) request.getParameter("code");
+        if (StringUtils.isEmpty(code)) {
+            LOGGER.warn("The incoming request has not code parameter");
+            return NO_SUCH_USER;
+        }
+        request.setAttribute(ORCID_AUTH_ATTRIBUTE, true);
+        return authenticateWithOrcid(context, code, request);
+    }
+
+    @Override
+    public String loginPageURL(Context context, HttpServletRequest request, HttpServletResponse response) {
+
+        String authorizeUrl = orcidConfiguration.getAuthorizeEndpointUrl();
+        String clientId = orcidConfiguration.getClientId();
+        String redirectUri = orcidConfiguration.getRedirectUrl();
+        String scopes = String.join("+", orcidConfiguration.getScopes());
+
+        if (StringUtils.isAnyBlank(authorizeUrl, clientId, redirectUri, scopes)) {
+            LOGGER.error("Missing mandatory configuration properties for OrcidAuthentication");
+            return "";
+        }
+
+        try {
+            return format(LOGIN_PAGE_URL_FORMAT, authorizeUrl, clientId, scopes, encode(redirectUri, "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            LOGGER.error(e.getMessage(), e);
+            return "";
+        }
+
+    }
+
+    @Override
+    public boolean isUsed(Context context, HttpServletRequest request) {
+        return request.getAttribute(ORCID_AUTH_ATTRIBUTE) != null;
+    }
+
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        return false;
+    }
+
+    @Override
+    public boolean canSelfRegister(Context context, HttpServletRequest request, String username) throws SQLException {
+        return canSelfRegister();
+    }
+
+    @Override
+    public void initEPerson(Context context, HttpServletRequest request, EPerson eperson) throws SQLException {
+
+    }
+
+    @Override
+    public boolean allowSetPassword(Context context, HttpServletRequest request, String username) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean isImplicit() {
+        return false;
+    }
+
+    @Override
+    public List<Group> getSpecialGroups(Context context, HttpServletRequest request) throws SQLException {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public String getName() {
+        return "orcid";
+    }
+
+    private int authenticateWithOrcid(Context context, String code, HttpServletRequest request) throws SQLException {
+        OrcidTokenResponseDTO token = getOrcidAccessToken(code);
+        if (token == null) {
+            return NO_SUCH_USER;
+        }
+
+        String orcid = token.getOrcid();
+
+        EPerson ePerson = ePersonService.findByNetid(context, orcid);
+        if (ePerson != null) {
+            return ePerson.canLogIn() ? logInEPerson(context, token, ePerson) : BAD_ARGS;
+        }
+
+        Person person = getPersonFromOrcid(token);
+        if (person == null) {
+            return NO_SUCH_USER;
+        }
+
+        String email = getEmail(person).orElse(null);
+
+        ePerson = ePersonService.findByEmail(context, email);
+        if (ePerson != null) {
+            return ePerson.canLogIn() ? logInEPerson(context, token, ePerson) : BAD_ARGS;
+        }
+
+        return canSelfRegister() ? registerNewEPerson(context, person, token) : NO_SUCH_USER;
+
+    }
+
+    private int logInEPerson(Context context, OrcidTokenResponseDTO token, EPerson ePerson)
+        throws SQLException {
+
+        context.setCurrentUser(ePerson);
+
+        setOrcidMetadataOnEPerson(context, ePerson, token);
+
+        ResearcherProfile profile = findProfile(context, ePerson);
+        if (profile != null) {
+            orcidSynchronizationService.linkProfile(context, profile.getItem(), token);
+        }
+
+        return SUCCESS;
+
+    }
+
+    private ResearcherProfile findProfile(Context context, EPerson ePerson) throws SQLException {
+        try {
+            return researcherProfileService.findById(context, ePerson.getID());
+        } catch (AuthorizeException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private int registerNewEPerson(Context context, Person person, OrcidTokenResponseDTO token) throws SQLException {
+
+        try {
+            context.turnOffAuthorisationSystem();
+
+            String email = getEmail(person)
+                .orElseThrow(() -> new IllegalStateException("The email is configured private on orcid"));
+
+            String orcid = token.getOrcid();
+
+            EPerson eperson = ePersonService.create(context);
+
+            eperson.setNetid(orcid);
+
+            eperson.setEmail(email);
+
+            Optional<String> firstName = getFirstName(person);
+            if (firstName.isPresent()) {
+                eperson.setFirstName(context, firstName.get());
+            }
+
+            Optional<String> lastName = getLastName(person);
+            if (lastName.isPresent()) {
+                eperson.setLastName(context, lastName.get());
+            }
+            eperson.setCanLogIn(true);
+            eperson.setSelfRegistered(true);
+
+            setOrcidMetadataOnEPerson(context, eperson, token);
+
+            ePersonService.update(context, eperson);
+            context.setCurrentUser(eperson);
+            context.dispatchEvents();
+
+            return SUCCESS;
+
+        } catch (Exception ex) {
+            LOGGER.error("An error occurs registering a new EPerson from ORCID", ex);
+            context.rollback();
+            return NO_SUCH_USER;
+        } finally {
+            context.restoreAuthSystemState();
+        }
+    }
+
+    private void setOrcidMetadataOnEPerson(Context context, EPerson person, OrcidTokenResponseDTO token)
+        throws SQLException {
+
+        String orcid = token.getOrcid();
+        String accessToken = token.getAccessToken();
+        String[] scopes = token.getScopeAsArray();
+
+        ePersonService.setMetadataSingleValue(context, person, "eperson", "orcid", null, null, orcid);
+        ePersonService.clearMetadata(context, person, "eperson", "orcid", "scope", ANY);
+        for (String scope : scopes) {
+            ePersonService.addMetadata(context, person, "eperson", "orcid", "scope", null, scope);
+        }
+
+        OrcidToken orcidToken = orcidTokenService.findByEPerson(context, person);
+        if (orcidToken == null) {
+            orcidTokenService.create(context, person, accessToken);
+        } else {
+            orcidToken.setAccessToken(accessToken);
+        }
+
+    }
+
+    private Person getPersonFromOrcid(OrcidTokenResponseDTO token) {
+        try {
+            return orcidClient.getPerson(token.getAccessToken(), token.getOrcid());
+        } catch (Exception ex) {
+            LOGGER.error("An error occurs retriving the ORCID record with id " + token.getOrcid(), ex);
+            return null;
+        }
+    }
+
+    private Optional<String> getEmail(Person person) {
+        List<Email> emails = person.getEmails() != null ? person.getEmails().getEmails() : Collections.emptyList();
+        if (CollectionUtils.isEmpty(emails)) {
+            return Optional.empty();
+        }
+        return Optional.ofNullable(emails.get(0).getEmail());
+    }
+
+    private Optional<String> getFirstName(Person person) {
+        return Optional.ofNullable(person.getName())
+            .map(name -> name.getGivenNames())
+            .map(givenNames -> givenNames.getContent());
+    }
+
+    private Optional<String> getLastName(Person person) {
+        return Optional.ofNullable(person.getName())
+            .map(name -> name.getFamilyName())
+            .map(givenNames -> givenNames.getContent());
+    }
+
+    private boolean canSelfRegister() {
+        String canSelfRegister = configurationService.getProperty("authentication-orcid.can-self-register", "true");
+        if (isBlank(canSelfRegister)) {
+            return true;
+        }
+        return toBoolean(canSelfRegister);
+    }
+
+    private OrcidTokenResponseDTO getOrcidAccessToken(String code) {
+        try {
+            return orcidClient.getAccessToken(code);
+        } catch (Exception ex) {
+            LOGGER.error("An error occurs retriving the ORCID access_token", ex);
+            return null;
+        }
+    }
+
+    public OrcidClient getOrcidClient() {
+        return orcidClient;
+    }
+
+    public void setOrcidClient(OrcidClient orcidClient) {
+        this.orcidClient = orcidClient;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/PasswordAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/PasswordAuthentication.java
index 50a685872a..6d1ca862d3 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/PasswordAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/PasswordAuthentication.java
@@ -22,6 +22,7 @@ import org.dspace.core.LogHelper;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.eperson.service.EPersonService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
@@ -53,6 +54,8 @@ public class PasswordAuthentication
 
     private static final String PASSWORD_AUTHENTICATED = "password.authenticated";
 
+    private EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+
 
 
     /**
@@ -264,4 +267,12 @@ public class PasswordAuthentication
         }
         return false;
     }
+
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        if (context == null || ePerson == null) {
+            return false;
+        }
+        return ePersonService.checkPassword(context, ePerson, currentPassword);
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
index a913d27d62..791634a7dc 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -290,20 +289,13 @@ public class ShibAuthentication implements AuthenticationMethod {
         try {
             // User has not successfuly authenticated via shibboleth.
             if (request == null ||
-                context.getCurrentUser() == null ||
-                request.getSession().getAttribute("shib.authenticated") == null) {
+                context.getCurrentUser() == null) {
                 return Collections.EMPTY_LIST;
             }
 
-            // If we have already calculated the special groups then return them.
-            if (request.getSession().getAttribute("shib.specialgroup") != null) {
+            if (context.getSpecialGroups().size() > 0 ) {
                 log.debug("Returning cached special groups.");
-                List<UUID> sessionGroupIds = (List<UUID>) request.getSession().getAttribute("shib.specialgroup");
-                List<Group> result = new ArrayList<>();
-                for (UUID uuid : sessionGroupIds) {
-                    result.add(groupService.find(context, uuid));
-                }
-                return result;
+                return context.getSpecialGroups();
             }
 
             log.debug("Starting to determine special groups");
@@ -396,16 +388,8 @@ public class ShibAuthentication implements AuthenticationMethod {
 
             log.info("Added current EPerson to special groups: " + groups);
 
-            List<UUID> groupIds = new ArrayList<>();
-            for (Group group : groups) {
-                groupIds.add(group.getID());
-            }
-
-            // Cache the special groups, so we don't have to recalculate them again
-            // for this session.
-            request.setAttribute("shib.specialgroup", groupIds);
-
             return new ArrayList<>(groups);
+
         } catch (Throwable t) {
             log.error("Unable to validate any sepcial groups this user may belong too because of an exception.", t);
             return Collections.EMPTY_LIST;
@@ -1292,5 +1276,10 @@ public class ShibAuthentication implements AuthenticationMethod {
         }
         return false;
     }
+
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        return false;
+    }
 }
 
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java b/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
index 503d90d0ec..12dc5feda5 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
@@ -608,4 +608,9 @@ public class X509Authentication implements AuthenticationMethod {
         }
         return false;
     }
+
+    @Override
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword) {
+        return false;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/service/AuthenticationService.java b/dspace-api/src/main/java/org/dspace/authenticate/service/AuthenticationService.java
index fba2f00323..e955302ec3 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/service/AuthenticationService.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/service/AuthenticationService.java
@@ -177,4 +177,16 @@ public interface AuthenticationService {
      */
     public String getAuthenticationMethod(Context context, HttpServletRequest request);
 
+    /**
+     * Check if the given current password is valid to change the password of the
+     * given ePerson.
+     *
+     * @param  context         The DSpace context
+     * @param  ePerson         the ePerson related to the password change
+     * @param  currentPassword The current password to check
+     * @return                 true if the provided password matches with current
+     *                         password
+     */
+    public boolean canChangePassword(Context context, EPerson ePerson, String currentPassword);
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java b/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
index dab8cd5b2e..ca5b4a11b5 100644
--- a/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
@@ -50,7 +50,7 @@ public class AuthoritySolrServiceImpl implements AuthorityIndexingService, Autho
      */
     protected SolrClient solr = null;
 
-    protected SolrClient getSolr()
+    public SolrClient getSolr()
             throws MalformedURLException, SolrServerException, IOException {
         if (solr == null) {
 
@@ -67,7 +67,11 @@ public class AuthoritySolrServiceImpl implements AuthorityIndexingService, Autho
 
             SolrQuery solrQuery = new SolrQuery().setQuery("*:*");
 
-            solrServer.query(solrQuery);
+            try {
+                solrServer.query(solrQuery);
+            } catch (Exception ex) {
+                log.error("An error occurs querying authority solr core", ex);
+            }
 
             solr = solrServer;
         }
diff --git a/dspace-api/src/main/java/org/dspace/authority/orcid/Orcidv3SolrAuthorityImpl.java b/dspace-api/src/main/java/org/dspace/authority/orcid/Orcidv3SolrAuthorityImpl.java
index a1c3867fb9..6753a5d113 100644
--- a/dspace-api/src/main/java/org/dspace/authority/orcid/Orcidv3SolrAuthorityImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authority/orcid/Orcidv3SolrAuthorityImpl.java
@@ -21,7 +21,8 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authority.AuthorityValue;
 import org.dspace.authority.SolrAuthorityInterface;
 import org.dspace.external.OrcidRestConnector;
@@ -40,7 +41,7 @@ import org.orcid.jaxb.model.v3.release.search.Result;
  */
 public class Orcidv3SolrAuthorityImpl implements SolrAuthorityInterface {
 
-    private static Logger log = Logger.getLogger(Orcidv3SolrAuthorityImpl.class);
+    private final static Logger log = LogManager.getLogger();
 
     private OrcidRestConnector orcidRestConnector;
     private String OAUTHUrl;
diff --git a/dspace-api/src/main/java/org/dspace/authority/util/XMLUtils.java b/dspace-api/src/main/java/org/dspace/authority/util/XMLUtils.java
index 77568205af..6cf49ac65b 100644
--- a/dspace-api/src/main/java/org/dspace/authority/util/XMLUtils.java
+++ b/dspace-api/src/main/java/org/dspace/authority/util/XMLUtils.java
@@ -14,11 +14,12 @@ import java.util.Iterator;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.logging.log4j.Logger;
-import org.apache.xpath.XPathAPI;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -62,36 +63,26 @@ public class XMLUtils {
 
     /**
      * @param xml           The starting context (a Node or a Document, for example).
-     * @param NodeListXPath xpath
+     * @param nodeListXPath xpath
      * @return A Node matches the NodeListXPath
      * null if nothing matches the NodeListXPath
      * @throws XPathExpressionException if xpath error
      */
-    public static Node getNode(Node xml, String NodeListXPath) throws XPathExpressionException {
-        Node result = null;
-        try {
-            result = XPathAPI.selectSingleNode(xml, NodeListXPath);
-        } catch (TransformerException e) {
-            log.error("Error", e);
-        }
-        return result;
+    public static Node getNode(Node xml, String nodeListXPath) throws XPathExpressionException {
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        return (Node) xPath.compile(nodeListXPath).evaluate(xml, XPathConstants.NODE);
     }
 
     /**
      * @param xml           The starting context (a Node or a Document, for example).
-     * @param NodeListXPath xpath
+     * @param nodeListXPath xpath
      * @return A NodeList containing the nodes that match the NodeListXPath
      * null if nothing matches the NodeListXPath
      * @throws XPathExpressionException if xpath error
      */
-    public static NodeList getNodeList(Node xml, String NodeListXPath) throws XPathExpressionException {
-        NodeList nodeList = null;
-        try {
-            nodeList = XPathAPI.selectNodeList(xml, NodeListXPath);
-        } catch (TransformerException e) {
-            log.error("Error", e);
-        }
-        return nodeList;
+    public static NodeList getNodeList(Node xml, String nodeListXPath) throws XPathExpressionException {
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        return (NodeList) xPath.compile(nodeListXPath).evaluate(xml, XPathConstants.NODESET);
     }
 
     public static Iterator<Node> getNodeListIterator(Node xml, String NodeListXPath) throws XPathExpressionException {
diff --git a/dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java b/dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java
index 919e82f14f..5dd491fd4d 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java
@@ -7,6 +7,9 @@
  */
 package org.dspace.authorize;
 
+import static org.dspace.app.util.AuthorizeUtil.canCollectionAdminManageAccounts;
+import static org.dspace.app.util.AuthorizeUtil.canCommunityAdminManageAccounts;
+
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,10 +31,12 @@ import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
+import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.DiscoverQuery.SORT_ORDER;
 import org.dspace.discovery.DiscoverResult;
 import org.dspace.discovery.IndexableObject;
 import org.dspace.discovery.SearchService;
@@ -827,7 +832,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         query = formatCustomQuery(query);
         DiscoverResult discoverResult = getDiscoverResult(context, query + "search.resourcetype:" +
                                                               IndexableCommunity.TYPE,
-            offset, limit);
+            offset, limit, null, null);
         for (IndexableObject solrCollections : discoverResult.getIndexableObjects()) {
             Community community = ((IndexableCommunity) solrCollections).getIndexedObject();
             communities.add(community);
@@ -849,7 +854,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         query = formatCustomQuery(query);
         DiscoverResult discoverResult = getDiscoverResult(context, query + "search.resourcetype:" +
                                                               IndexableCommunity.TYPE,
-            null, null);
+            null, null, null, null);
         return discoverResult.getTotalSearchResults();
     }
 
@@ -874,7 +879,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         query = formatCustomQuery(query);
         DiscoverResult discoverResult = getDiscoverResult(context, query + "search.resourcetype:" +
                                                               IndexableCollection.TYPE,
-            offset, limit);
+            offset, limit, CollectionService.SOLR_SORT_FIELD, SORT_ORDER.asc);
         for (IndexableObject solrCollections : discoverResult.getIndexableObjects()) {
             Collection collection = ((IndexableCollection) solrCollections).getIndexedObject();
             collections.add(collection);
@@ -896,17 +901,27 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         query = formatCustomQuery(query);
         DiscoverResult discoverResult = getDiscoverResult(context, query + "search.resourcetype:" +
                                                               IndexableCollection.TYPE,
-            null, null);
+            null, null, null, null);
         return discoverResult.getTotalSearchResults();
     }
 
+    @Override
+    public boolean isAccountManager(Context context) {
+        try {
+            return (canCommunityAdminManageAccounts() && isCommunityAdmin(context)
+                || canCollectionAdminManageAccounts() && isCollectionAdmin(context));
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private boolean performCheck(Context context, String query) throws SQLException {
         if (context.getCurrentUser() == null) {
             return false;
         }
 
         try {
-            DiscoverResult discoverResult = getDiscoverResult(context, query, null, null);
+            DiscoverResult discoverResult = getDiscoverResult(context, query, null, null, null, null);
             if (discoverResult.getTotalSearchResults() > 0) {
                 return true;
             }
@@ -918,7 +933,8 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         return false;
     }
 
-    private DiscoverResult getDiscoverResult(Context context, String query, Integer offset, Integer limit)
+    private DiscoverResult getDiscoverResult(Context context, String query, Integer offset, Integer limit,
+            String sortField, SORT_ORDER sortOrder)
         throws SearchServiceException, SQLException {
         String groupQuery = getGroupToQuery(groupService.allMemberGroups(context, context.getCurrentUser()));
 
@@ -934,7 +950,9 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         if (limit != null) {
             discoverQuery.setMaxResults(limit);
         }
-
+        if (sortField != null && sortOrder != null) {
+            discoverQuery.setSortField(sortField, sortOrder);
+        }
 
         return searchService.search(context, discoverQuery);
     }
diff --git a/dspace-api/src/main/java/org/dspace/authorize/RegexPasswordValidator.java b/dspace-api/src/main/java/org/dspace/authorize/RegexPasswordValidator.java
new file mode 100644
index 0000000000..d12c3ba919
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/authorize/RegexPasswordValidator.java
@@ -0,0 +1,48 @@
+/**
+ * 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/
+ */
+package org.dspace.authorize;
+
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
+import java.util.regex.Pattern;
+
+import org.dspace.authorize.service.PasswordValidatorService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link PasswordValidatorService} that verifies if the given
+ * passowrd matches the configured pattern.
+ * 
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+public class RegexPasswordValidator implements PasswordValidatorService {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Override
+    public boolean isPasswordValidationEnabled() {
+        return isNotBlank(getPasswordValidationPattern());
+    }
+
+    @Override
+    public boolean isPasswordValid(String password) {
+        if (!isPasswordValidationEnabled()) {
+            return true;
+        }
+
+        Pattern pattern = Pattern.compile(getPasswordValidationPattern());
+        return pattern.matcher(password).find();
+    }
+
+    private String getPasswordValidationPattern() {
+        return configurationService.getProperty("authentication-password.regex-validation.pattern");
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java b/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java
index a25a492a3a..954bb96990 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java
@@ -93,7 +93,7 @@ public class ResourcePolicy implements ReloadableEntity<Integer> {
     private String rptype;
 
     @Lob
-    @Type(type = "org.hibernate.type.MaterializedClobType")
+    @Type(type = "org.dspace.storage.rdbms.hibernate.DatabaseAwareLobType")
     @Column(name = "rpdescription")
     private String rpdescription;
 
diff --git a/dspace-api/src/main/java/org/dspace/authorize/ValidatePasswordServiceImpl.java b/dspace-api/src/main/java/org/dspace/authorize/ValidatePasswordServiceImpl.java
new file mode 100644
index 0000000000..663308d627
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/authorize/ValidatePasswordServiceImpl.java
@@ -0,0 +1,33 @@
+/**
+ * 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/
+ */
+package org.dspace.authorize;
+
+import java.util.List;
+
+import org.dspace.authorize.service.PasswordValidatorService;
+import org.dspace.authorize.service.ValidatePasswordService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Basic implementation for validation password robustness.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class ValidatePasswordServiceImpl implements ValidatePasswordService {
+
+    @Autowired
+    private List<PasswordValidatorService> validators;
+
+    @Override
+    public boolean isPasswordValid(String password) {
+        return validators.stream()
+            .filter(passwordValidator -> passwordValidator.isPasswordValidationEnabled())
+            .allMatch(passwordValidator -> passwordValidator.isPasswordValid(password));
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/authorize/service/AuthorizeService.java b/dspace-api/src/main/java/org/dspace/authorize/service/AuthorizeService.java
index 9f6171a220..6b097cdd73 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/service/AuthorizeService.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/service/AuthorizeService.java
@@ -592,4 +592,12 @@ public interface AuthorizeService {
      */
     long countAdminAuthorizedCollection(Context context, String query)
         throws SearchServiceException, SQLException;
+
+    /**
+     * Returns true if the current user can manage accounts.
+     *
+     * @param  context context with the current user
+     * @return         true if the current user can manage accounts
+     */
+    boolean isAccountManager(Context context);
 }
diff --git a/dspace-api/src/main/java/org/dspace/authorize/service/PasswordValidatorService.java b/dspace-api/src/main/java/org/dspace/authorize/service/PasswordValidatorService.java
new file mode 100644
index 0000000000..5817969b6d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/authorize/service/PasswordValidatorService.java
@@ -0,0 +1,29 @@
+/**
+ * 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/
+ */
+package org.dspace.authorize.service;
+
+/**
+ * Interface for classes that validate a given password with a specific
+ * strategy.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+public interface PasswordValidatorService {
+
+    /**
+     * Check if the password validator is active.
+     */
+    public boolean isPasswordValidationEnabled();
+
+    /**
+     * This method checks whether the password is valid
+     * 
+     * @param password password to validate
+     */
+    public boolean isPasswordValid(String password);
+}
diff --git a/dspace-api/src/main/java/org/dspace/authorize/service/ValidatePasswordService.java b/dspace-api/src/main/java/org/dspace/authorize/service/ValidatePasswordService.java
new file mode 100644
index 0000000000..0d5f6191f6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/authorize/service/ValidatePasswordService.java
@@ -0,0 +1,25 @@
+/**
+ * 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/
+ */
+package org.dspace.authorize.service;
+
+/**
+ * Services to use during Validating of password.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public interface ValidatePasswordService {
+
+    /**
+     * This method checks whether the password is valid based on the configured
+     * rules/strategies.
+     * 
+     * @param password password to validate
+     */
+    public boolean isPasswordValid(String password);
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseDAO.java b/dspace-api/src/main/java/org/dspace/browse/BrowseDAO.java
index 22cf02fe13..29debf64e2 100644
--- a/dspace-api/src/main/java/org/dspace/browse/BrowseDAO.java
+++ b/dspace-api/src/main/java/org/dspace/browse/BrowseDAO.java
@@ -346,7 +346,7 @@ public interface BrowseDAO {
     public String getFilterValueField();
 
     /**
-     * Set he name of the field in which the value to constrain results is
+     * Set the name of the field in which the value to constrain results is
      * contained
      *
      * @param valueField the name of the field
diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java b/dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java
index 7454c8e82b..6f0235e6c1 100644
--- a/dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java
+++ b/dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java
@@ -11,6 +11,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
@@ -202,6 +203,13 @@ public class BrowseEngine {
             // get the table name that we are going to be getting our data from
             dao.setTable(browseIndex.getTableName());
 
+            if (scope.getBrowseIndex() != null && OrderFormat.TITLE.equals(scope.getBrowseIndex().getDataType())) {
+                // For browsing by title, apply the same normalization applied to indexed titles
+                dao.setStartsWith(normalizeJumpToValue(scope.getStartsWith()));
+            } else {
+                dao.setStartsWith(StringUtils.lowerCase(scope.getStartsWith()));
+            }
+
             // tell the browse query whether we are ascending or descending on the value
             dao.setAscending(scope.isAscending());
 
@@ -248,9 +256,6 @@ public class BrowseEngine {
                 }
             }
 
-            // this is the total number of results in answer to the query
-            int total = getTotalResults();
-
             // assemble the ORDER BY clause
             String orderBy = browseIndex.getSortField(scope.isSecondLevel());
             if (scope.getSortBy() > 0) {
@@ -258,6 +263,9 @@ public class BrowseEngine {
             }
             dao.setOrderField(orderBy);
 
+            // this is the total number of results in answer to the query
+            int total = getTotalResults();
+
             int offset = scope.getOffset();
             String rawFocusValue = null;
             if (offset < 1 && (scope.hasJumpToItem() || scope.hasJumpToValue() || scope.hasStartsWith())) {
@@ -269,9 +277,6 @@ public class BrowseEngine {
                 String focusValue = normalizeJumpToValue(rawFocusValue);
 
                 log.debug("browsing using focus: " + focusValue);
-
-                // Convert the focus value into an offset
-                offset = getOffsetForValue(focusValue);
             }
 
             dao.setOffset(offset);
@@ -290,7 +295,7 @@ public class BrowseEngine {
                 // now, if we don't have any results, we are at the end of the browse.  This will
                 // be because a starts_with value has been supplied for which we don't have
                 // any items.
-                if (results.size() == 0) {
+                if (results.isEmpty()) {
                     // In this case, we will calculate a new offset for the last page of results
                     offset = total - scope.getResultsPerPage();
                     if (offset < 0) {
@@ -450,7 +455,7 @@ public class BrowseEngine {
                 // now, if we don't have any results, we are at the end of the browse.  This will
                 // be because a starts_with value has been supplied for which we don't have
                 // any items.
-                if (results.size() == 0) {
+                if (results.isEmpty()) {
                     // In this case, we will calculate a new offset for the last page of results
                     offset = total - scope.getResultsPerPage();
                     if (offset < 0) {
@@ -463,7 +468,7 @@ public class BrowseEngine {
                 }
             } else {
                 // No records, so make an empty list
-                results = new ArrayList<String[]>();
+                results = new ArrayList<>();
             }
 
             // construct the BrowseInfo object to pass back
@@ -554,7 +559,7 @@ public class BrowseEngine {
         }
 
         String col = "sort_1";
-        if (so.getNumber() > 0) {
+        if (so != null && so.getNumber() > 0) {
             col = "sort_" + Integer.toString(so.getNumber());
         }
 
@@ -591,7 +596,7 @@ public class BrowseEngine {
         }
 
         String col = "sort_1";
-        if (so.getNumber() > 0) {
+        if (so != null && so.getNumber() > 0) {
             col = "sort_" + Integer.toString(so.getNumber());
         }
 
@@ -684,13 +689,11 @@ public class BrowseEngine {
         // our count, storing them locally to reinstate later
         String focusField = dao.getJumpToField();
         String focusValue = dao.getJumpToValue();
-        String orderField = dao.getOrderField();
         int limit = dao.getLimit();
         int offset = dao.getOffset();
 
         dao.setJumpToField(null);
         dao.setJumpToValue(null);
-        dao.setOrderField(null);
         dao.setLimit(-1);
         dao.setOffset(-1);
 
@@ -700,7 +703,6 @@ public class BrowseEngine {
         // now put back the values we removed for this method
         dao.setJumpToField(focusField);
         dao.setJumpToValue(focusValue);
-        dao.setOrderField(orderField);
         dao.setLimit(limit);
         dao.setOffset(offset);
         dao.setCountValues(null);
diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java b/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
index 859063272a..8d065c21ce 100644
--- a/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
+++ b/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
@@ -313,14 +313,6 @@ public final class BrowseIndex {
         return name;
     }
 
-    /**
-     * @param name The name to set.
-     */
-//  public void setName(String name)
-//  {
-//     this.name = name;
-//  }
-
     /**
      * Get the SortOption associated with this index.
      *
diff --git a/dspace-api/src/main/java/org/dspace/browse/ItemListConfig.java b/dspace-api/src/main/java/org/dspace/browse/ItemListConfig.java
index 9cbbe8f194..6a63659c82 100644
--- a/dspace-api/src/main/java/org/dspace/browse/ItemListConfig.java
+++ b/dspace-api/src/main/java/org/dspace/browse/ItemListConfig.java
@@ -25,22 +25,7 @@ public class ItemListConfig {
     /**
      * a map of column number to metadata value
      */
-    private Map<Integer, String[]> metadata = new HashMap<Integer, String[]>();
-
-    /**
-     * a map of column number to data type
-     */
-    private Map<Integer, Integer> types = new HashMap<Integer, Integer>();
-
-    /**
-     * constant for a DATE column
-     */
-    private static final int DATE = 1;
-
-    /**
-     * constant for a TEXT column
-     */
-    private static final int TEXT = 2;
+    private Map<Integer, String[]> metadata = new HashMap<>();
 
     private final transient ConfigurationService configurationService
         = DSpaceServicesFactory.getInstance().getConfigurationService();
@@ -63,14 +48,11 @@ public class ItemListConfig {
             // parse the config
             int i = 1;
             for (String token : browseFields) {
-                Integer key = Integer.valueOf(i);
+                Integer key = i;
 
                 // find out if the field is a date
                 if (token.indexOf("(date)") > 0) {
                     token = token.replaceAll("\\(date\\)", "");
-                    types.put(key, Integer.valueOf(ItemListConfig.DATE));
-                } else {
-                    types.put(key, Integer.valueOf(ItemListConfig.TEXT));
                 }
 
                 String[] mdBits = interpretField(token.trim(), null);
@@ -100,7 +82,7 @@ public class ItemListConfig {
      * @return array of metadata
      */
     public String[] getMetadata(int col) {
-        return metadata.get(Integer.valueOf(col));
+        return metadata.get(col);
     }
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java b/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java
index 6a960e8d75..cee3ae017e 100644
--- a/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java
+++ b/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java
@@ -17,6 +17,7 @@ import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.util.ClientUtils;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Item;
@@ -205,6 +206,10 @@ public class SolrBrowseDAO implements BrowseDAO {
                 } else if (valuePartial) {
                     query.addFilterQueries("{!field f=" + facetField + "_partial}" + value);
                 }
+                if (StringUtils.isNotBlank(startsWith) && orderField != null) {
+                    query.addFilterQueries(
+                        "bi_" + orderField + "_sort:" + ClientUtils.escapeQueryChars(startsWith) + "*");
+                }
                 // filter on item to be sure to don't include any other object
                 // indexed in the Discovery Search core
                 query.addFilterQueries("search.resourcetype:" + IndexableItem.TYPE);
diff --git a/dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java
index aa32983362..485f1d6451 100644
--- a/dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java
@@ -158,6 +158,11 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
         }
 
         bundle.addBitstream(bitstream);
+        // If a bitstream is moved from one bundle to another it may be temporarily flagged as deleted
+        // (when removed from the original bundle)
+        if (bitstream.isDeleted()) {
+            bitstream.setDeleted(false);
+        }
         bitstream.getBundles().add(bundle);
 
 
diff --git a/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
index e54f609389..8488b4eaf1 100644
--- a/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
@@ -43,6 +43,7 @@ import org.dspace.core.I18nUtil;
 import org.dspace.core.LogHelper;
 import org.dspace.core.service.LicenseService;
 import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.DiscoverQuery.SORT_ORDER;
 import org.dspace.discovery.DiscoverResult;
 import org.dspace.discovery.IndexableObject;
 import org.dspace.discovery.SearchService;
@@ -946,6 +947,7 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
         discoverQuery.setDSpaceObjectFilter(IndexableCollection.TYPE);
         discoverQuery.setStart(offset);
         discoverQuery.setMaxResults(limit);
+        discoverQuery.setSortField(SOLR_SORT_FIELD, SORT_ORDER.asc);
         DiscoverResult resp = retrieveCollectionsWithSubmit(context, discoverQuery, null, community, q);
         for (IndexableObject solrCollections : resp.getIndexableObjects()) {
             Collection c = ((IndexableCollection) solrCollections).getIndexedObject();
@@ -1025,6 +1027,7 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
         discoverQuery.setDSpaceObjectFilter(IndexableCollection.TYPE);
         discoverQuery.setStart(offset);
         discoverQuery.setMaxResults(limit);
+        discoverQuery.setSortField(SOLR_SORT_FIELD, SORT_ORDER.asc);
         DiscoverResult resp = retrieveCollectionsWithSubmit(context, discoverQuery,
                 entityType, community, q);
         for (IndexableObject solrCollections : resp.getIndexableObjects()) {
diff --git a/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
index 6b188396f6..24778824bf 100644
--- a/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
@@ -243,67 +243,64 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
 
         boolean authorityControlled = metadataAuthorityService.isAuthorityControlled(metadataField);
         boolean authorityRequired = metadataAuthorityService.isAuthorityRequired(metadataField);
-        List<MetadataValue> newMetadata = new ArrayList<>(values.size());
+        List<MetadataValue> newMetadata = new ArrayList<>();
         // We will not verify that they are valid entries in the registry
         // until update() is called.
         for (int i = 0; i < values.size(); i++) {
-
-            if (authorities != null && authorities.size() >= i) {
-                if (StringUtils.startsWith(authorities.get(i), Constants.VIRTUAL_AUTHORITY_PREFIX)) {
-                    continue;
-                }
-            }
-            MetadataValue metadataValue = metadataValueService.create(context, dso, metadataField);
-            newMetadata.add(metadataValue);
-
-            metadataValue.setPlace(placeSupplier.get());
-
-            metadataValue.setLanguage(lang == null ? null : lang.trim());
-
-            // Logic to set Authority and Confidence:
-            //  - normalize an empty string for authority to NULL.
-            //  - if authority key is present, use given confidence or NOVALUE if not given
-            //  - otherwise, preserve confidence if meaningful value was given since it may document a failed
-            // authority lookup
-            //  - CF_UNSET signifies no authority nor meaningful confidence.
-            //  - it's possible to have empty authority & CF_ACCEPTED if e.g. user deletes authority key
-            if (authorityControlled) {
-                if (authorities != null && authorities.get(i) != null && authorities.get(i).length() > 0) {
-                    metadataValue.setAuthority(authorities.get(i));
-                    metadataValue.setConfidence(confidences == null ? Choices.CF_NOVALUE : confidences.get(i));
-                } else {
-                    metadataValue.setAuthority(null);
-                    metadataValue.setConfidence(confidences == null ? Choices.CF_UNSET : confidences.get(i));
-                }
-                // authority sanity check: if authority is required, was it supplied?
-                // XXX FIXME? can't throw a "real" exception here without changing all the callers to expect it, so
-                // use a runtime exception
-                if (authorityRequired && (metadataValue.getAuthority() == null || metadataValue.getAuthority()
-                                                                                               .length() == 0)) {
-                    throw new IllegalArgumentException("The metadata field \"" + metadataField
-                        .toString() + "\" requires an authority key but none was provided. Value=\"" + values
-                        .get(i) + "\"");
-                }
-            }
             if (values.get(i) != null) {
+                if (authorities != null && authorities.size() >= i) {
+                    if (StringUtils.startsWith(authorities.get(i), Constants.VIRTUAL_AUTHORITY_PREFIX)) {
+                        continue;
+                    }
+                }
+                MetadataValue metadataValue = metadataValueService.create(context, dso, metadataField);
+                newMetadata.add(metadataValue);
+
+                metadataValue.setPlace(placeSupplier.get());
+
+                metadataValue.setLanguage(lang == null ? null : lang.trim());
+
+                // Logic to set Authority and Confidence:
+                //  - normalize an empty string for authority to NULL.
+                //  - if authority key is present, use given confidence or NOVALUE if not given
+                //  - otherwise, preserve confidence if meaningful value was given since it may document a failed
+                // authority lookup
+                //  - CF_UNSET signifies no authority nor meaningful confidence.
+                //  - it's possible to have empty authority & CF_ACCEPTED if e.g. user deletes authority key
+                if (authorityControlled) {
+                    if (authorities != null && authorities.get(i) != null && authorities.get(i).length() > 0) {
+                        metadataValue.setAuthority(authorities.get(i));
+                        metadataValue.setConfidence(confidences == null ? Choices.CF_NOVALUE : confidences.get(i));
+                    } else {
+                        metadataValue.setAuthority(null);
+                        metadataValue.setConfidence(confidences == null ? Choices.CF_UNSET : confidences.get(i));
+                    }
+                    // authority sanity check: if authority is required, was it supplied?
+                    // XXX FIXME? can't throw a "real" exception here without changing all the callers to expect it, so
+                    // use a runtime exception
+                    if (authorityRequired && (metadataValue.getAuthority() == null || metadataValue.getAuthority()
+                                                                                                   .length() == 0)) {
+                        throw new IllegalArgumentException("The metadata field \"" + metadataField
+                                .toString() + "\" requires an authority key but none was provided. Value=\"" + values
+                                .get(i) + "\"");
+                    }
+                }
                 // remove control unicode char
                 String temp = values.get(i).trim();
                 char[] dcvalue = temp.toCharArray();
                 for (int charPos = 0; charPos < dcvalue.length; charPos++) {
                     if (Character.isISOControl(dcvalue[charPos]) &&
-                        !String.valueOf(dcvalue[charPos]).equals("\u0009") &&
-                        !String.valueOf(dcvalue[charPos]).equals("\n") &&
-                        !String.valueOf(dcvalue[charPos]).equals("\r")) {
+                            !String.valueOf(dcvalue[charPos]).equals("\u0009") &&
+                            !String.valueOf(dcvalue[charPos]).equals("\n") &&
+                            !String.valueOf(dcvalue[charPos]).equals("\r")) {
                         dcvalue[charPos] = ' ';
                     }
                 }
                 metadataValue.setValue(String.valueOf(dcvalue));
-            } else {
-                metadataValue.setValue(null);
-            }
-            //An update here isn't needed, this is persited upon the merge of the owning object
+                //An update here isn't needed, this is persited upon the merge of the owning object
 //            metadataValueService.update(context, metadataValue);
-            dso.addDetails(metadataField.toString());
+                dso.addDetails(metadataField.toString());
+            }
         }
         setMetadataModified(dso);
         return newMetadata;
@@ -624,8 +621,14 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
             });
             for (MetadataValue metadataValue : metadataValues) {
                 //Retrieve & store the place for each metadata value
-                if (StringUtils.startsWith(metadataValue.getAuthority(), Constants.VIRTUAL_AUTHORITY_PREFIX) &&
-                    ((RelationshipMetadataValue) metadataValue).isUseForPlace()) {
+                if (
+                    // For virtual MDVs with useForPlace=true,
+                    // update both the place of the metadatum and the place of the Relationship.
+                    // E.g. for an Author relationship,
+                    //   the place should be updated using the same principle as dc.contributor.author.
+                    StringUtils.startsWith(metadataValue.getAuthority(), Constants.VIRTUAL_AUTHORITY_PREFIX)
+                        && ((RelationshipMetadataValue) metadataValue).isUseForPlace()
+                ) {
                     int mvPlace = getMetadataValuePlace(fieldToLastPlace, metadataValue);
                     metadataValue.setPlace(mvPlace);
                     String authority = metadataValue.getAuthority();
@@ -638,8 +641,16 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
                     }
                     relationshipService.update(context, relationship);
 
-                } else if (!StringUtils.startsWith(metadataValue.getAuthority(),
-                                                   Constants.VIRTUAL_AUTHORITY_PREFIX)) {
+                } else if (
+                    // Otherwise, just set the place of the metadatum
+                    // ...unless the metadatum in question is a relation.* metadatum.
+                    // This case is a leftover from when a Relationship is removed and copied to metadata.
+                    // If we let its place change the order of any remaining Relationships will be affected.
+                    // todo: this makes it so these leftover MDVs can't be reordered later on
+                    !StringUtils.equals(
+                        metadataValue.getMetadataField().getMetadataSchema().getName(), "relation"
+                    )
+                ) {
                     int mvPlace = getMetadataValuePlace(fieldToLastPlace, metadataValue);
                     metadataValue.setPlace(mvPlace);
                 }
diff --git a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
index 96dac1a4df..27d0ba189c 100644
--- a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
@@ -17,6 +17,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Supplier;
@@ -40,6 +41,7 @@ import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
+import org.dspace.content.service.EntityTypeService;
 import org.dspace.content.service.InstallItemService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.MetadataSchemaService;
@@ -56,6 +58,15 @@ import org.dspace.harvest.HarvestedItem;
 import org.dspace.harvest.service.HarvestedItemService;
 import org.dspace.identifier.IdentifierException;
 import org.dspace.identifier.service.IdentifierService;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.service.ResearcherProfileService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.versioning.service.VersioningService;
 import org.dspace.workflow.WorkflowItemService;
@@ -120,6 +131,24 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
     @Autowired(required = true)
     private RelationshipMetadataService relationshipMetadataService;
 
+    @Autowired(required = true)
+    private EntityTypeService entityTypeService;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    @Autowired(required = true)
+    private OrcidHistoryService orcidHistoryService;
+
+    @Autowired(required = true)
+    private OrcidQueueService orcidQueueService;
+
+    @Autowired(required = true)
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    @Autowired(required = true)
+    private ResearcherProfileService researcherProfileService;
+
     protected ItemServiceImpl() {
         super();
     }
@@ -241,6 +270,10 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
         return itemDAO.findAll(context, true, true);
     }
 
+    public Iterator<Item> findAllRegularItems(Context context) throws SQLException {
+        return itemDAO.findAllRegularItems(context);
+    };
+
     @Override
     public Iterator<Item> findBySubmitter(Context context, EPerson eperson) throws SQLException {
         return itemDAO.findBySubmitter(context, eperson);
@@ -724,7 +757,7 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
             + item.getID()));
 
         // Remove relationships
-        for (Relationship relationship : relationshipService.findByItem(context, item)) {
+        for (Relationship relationship : relationshipService.findByItem(context, item, -1, -1, false, false)) {
             relationshipService.forceDelete(context, relationship, false, false);
         }
 
@@ -737,6 +770,8 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
         // remove version attached to the item
         removeVersion(context, item);
 
+        removeOrcidSynchronizationStuff(context, item);
+
         // Also delete the item if it appears in a harvested collection.
         HarvestedItem hi = harvestedItemService.find(context, item);
 
@@ -744,6 +779,11 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
             harvestedItemService.delete(context, hi);
         }
 
+        OrcidToken orcidToken = orcidTokenService.findByProfileItem(context, item);
+        if (orcidToken != null) {
+            orcidToken.setProfileItem(null);
+        }
+
         //Only clear collections after we have removed everything else from the item
         item.clearCollections();
         item.setOwningCollection(null);
@@ -911,6 +951,12 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
     @Override
     public void move(Context context, Item item, Collection from, Collection to)
         throws SQLException, AuthorizeException, IOException {
+
+        // If the two collections are the same, do nothing.
+        if (from.equals(to)) {
+            return;
+        }
+
         // Use the normal move method, and default to not inherit permissions
         this.move(context, item, from, to, false);
     }
@@ -1125,6 +1171,50 @@ prevent the generation of resource policy entry values with null dspace_object a
         return !(hasCustomPolicy && isAnonimousGroup && datesAreNull);
     }
 
+    /**
+     * Returns an iterator of Items possessing the passed metadata field, or only
+     * those matching the passed value, if value is not Item.ANY
+     *
+     * @param context   DSpace context object
+     * @param schema    metadata field schema
+     * @param element   metadata field element
+     * @param qualifier metadata field qualifier
+     * @param value     field value or Item.ANY to match any value
+     * @return an iterator over the items matching that authority value
+     * @throws SQLException       if database error
+     *                            An exception that provides information on a database access error or other errors.
+     * @throws AuthorizeException if authorization error
+     *                            Exception indicating the current user of the context does not have permission
+     *                            to perform a particular action.
+     */
+    @Override
+    public Iterator<Item> findArchivedByMetadataField(Context context,
+                                                      String schema, String element, String qualifier, String value)
+            throws SQLException, AuthorizeException {
+        MetadataSchema mds = metadataSchemaService.find(context, schema);
+        if (mds == null) {
+            throw new IllegalArgumentException("No such metadata schema: " + schema);
+        }
+        MetadataField mdf = metadataFieldService.findByElement(context, mds, element, qualifier);
+        if (mdf == null) {
+            throw new IllegalArgumentException(
+                    "No such metadata field: schema=" + schema + ", element=" + element + ", qualifier=" + qualifier);
+        }
+
+        if (Item.ANY.equals(value)) {
+            return itemDAO.findByMetadataField(context, mdf, null, true);
+        } else {
+            return itemDAO.findByMetadataField(context, mdf, value, true);
+        }
+    }
+
+    @Override
+    public Iterator<Item> findArchivedByMetadataField(Context context, String metadataField, String value)
+            throws SQLException, AuthorizeException {
+        String[] mdValueByField = getMDValueByField(metadataField);
+        return findArchivedByMetadataField(context, mdValueByField[0], mdValueByField[1], mdValueByField[2], value);
+    }
+
     /**
      * Returns an iterator of Items possessing the passed metadata field, or only
      * those matching the passed value, if value is not Item.ANY
@@ -1529,5 +1619,100 @@ prevent the generation of resource policy entry values with null dspace_object a
                 .stream().findFirst().orElse(null);
     }
 
+    @Override
+    public String getEntityTypeLabel(Item item) {
+        List<MetadataValue> mdvs = getMetadata(item, "dspace", "entity", "type", Item.ANY, false);
+        if (mdvs.isEmpty()) {
+            return null;
+        }
+
+        if (mdvs.size() > 1) {
+            log.warn(
+                "Item with uuid {}, handle {} has {} entity types ({}), expected 1 entity type",
+                item.getID(), item.getHandle(), mdvs.size(),
+                mdvs.stream().map(MetadataValue::getValue).collect(Collectors.toList())
+            );
+        }
+
+        String entityType = mdvs.get(0).getValue();
+        if (StringUtils.isBlank(entityType)) {
+            return null;
+        }
+
+        return entityType;
+    }
+
+    @Override
+    public EntityType getEntityType(Context context, Item item) throws SQLException {
+        String entityTypeString = getEntityTypeLabel(item);
+        if (StringUtils.isBlank(entityTypeString)) {
+            return null;
+        }
+
+        return entityTypeService.findByEntityType(context, entityTypeString);
+    }
+
+    private void removeOrcidSynchronizationStuff(Context context, Item item) throws SQLException, AuthorizeException {
+
+        if (isNotProfileOrOrcidEntity(item)) {
+            return;
+        }
+
+        context.turnOffAuthorisationSystem();
+
+        try {
+
+            createOrcidQueueRecordsToDeleteOnOrcid(context, item);
+            deleteOrcidHistoryRecords(context, item);
+            deleteOrcidQueueRecords(context, item);
+
+        } finally {
+            context.restoreAuthSystemState();
+        }
+
+    }
+
+    private boolean isNotProfileOrOrcidEntity(Item item) {
+        String entityType = getEntityTypeLabel(item);
+        return !OrcidEntityType.isValidEntityType(entityType)
+            && !researcherProfileService.getProfileType().equals(entityType);
+    }
+
+    private void createOrcidQueueRecordsToDeleteOnOrcid(Context context, Item entity) throws SQLException {
+
+        String entityType = getEntityTypeLabel(entity);
+        if (entityType == null || researcherProfileService.getProfileType().equals(entityType)) {
+            return;
+        }
+
+        Map<Item, String> profileAndPutCodeMap = orcidHistoryService.findLastPutCodes(context, entity);
+        for (Item profile : profileAndPutCodeMap.keySet()) {
+            if (orcidSynchronizationService.isSynchronizationAllowed(profile, entity)) {
+                String putCode = profileAndPutCodeMap.get(profile);
+                String title = getMetadataFirstValue(entity, "dc", "title", null, Item.ANY);
+                orcidQueueService.createEntityDeletionRecord(context, profile, title, entityType, putCode);
+            }
+        }
+
+    }
+
+    private void deleteOrcidHistoryRecords(Context context, Item item) throws SQLException {
+        List<OrcidHistory> historyRecords = orcidHistoryService.findByProfileItemOrEntity(context, item);
+        for (OrcidHistory historyRecord : historyRecords) {
+            if (historyRecord.getProfileItem().equals(item)) {
+                orcidHistoryService.delete(context, historyRecord);
+            } else {
+                historyRecord.setEntity(null);
+                orcidHistoryService.update(context, historyRecord);
+            }
+        }
+    }
+
+    private void deleteOrcidQueueRecords(Context context, Item item) throws SQLException {
+        List<OrcidQueue> orcidQueueRecords = orcidQueueService.findByProfileItemOrEntity(context, item);
+        for (OrcidQueue orcidQueueRecord : orcidQueueRecords) {
+            orcidQueueService.delete(context, orcidQueueRecord);
+        }
+    }
 
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/LicenseUtils.java b/dspace-api/src/main/java/org/dspace/content/LicenseUtils.java
index be804a9bbb..673a30d2dd 100644
--- a/dspace-api/src/main/java/org/dspace/content/LicenseUtils.java
+++ b/dspace-api/src/main/java/org/dspace/content/LicenseUtils.java
@@ -59,7 +59,7 @@ public class LicenseUtils {
      * {6} the eperson object that will be formatted using the appropriate
      * LicenseArgumentFormatter plugin (if defined)<br>
      * {x} any addition argument supplied wrapped in the
-     * LicenseArgumentFormatter based on his type (map key)
+     * LicenseArgumentFormatter based on its type (map key)
      *
      * @param locale         Formatter locale
      * @param collection     collection to get license from
diff --git a/dspace-api/src/main/java/org/dspace/content/MetadataValue.java b/dspace-api/src/main/java/org/dspace/content/MetadataValue.java
index d1b636cdff..9ff3cb9ec2 100644
--- a/dspace-api/src/main/java/org/dspace/content/MetadataValue.java
+++ b/dspace-api/src/main/java/org/dspace/content/MetadataValue.java
@@ -59,7 +59,7 @@ public class MetadataValue implements ReloadableEntity<Integer> {
      * The value of the field
      */
     @Lob
-    @Type(type = "org.hibernate.type.MaterializedClobType")
+    @Type(type = "org.dspace.storage.rdbms.hibernate.DatabaseAwareLobType")
     @Column(name = "text_value")
     private String value;
 
diff --git a/dspace-api/src/main/java/org/dspace/content/Relationship.java b/dspace-api/src/main/java/org/dspace/content/Relationship.java
index 81d13d6c10..77c418a23d 100644
--- a/dspace-api/src/main/java/org/dspace/content/Relationship.java
+++ b/dspace-api/src/main/java/org/dspace/content/Relationship.java
@@ -89,6 +89,15 @@ public class Relationship implements ReloadableEntity<Integer> {
     @Column(name = "rightward_value")
     private String rightwardValue;
 
+    /**
+     * Whether the left and/or right side of a given relationship are the "latest".
+     * A side of a relationship is "latest" if the item on that side has either no other versions,
+     * or the item on that side is the most recent version that is relevant to the given relationship.
+     * This column affects what version of an item appears on search pages or the relationship listings of other items.
+     */
+    @Column(name = "latest_version_status")
+    private LatestVersionStatus latestVersionStatus = LatestVersionStatus.BOTH;
+
     /**
      * Protected constructor, create object using:
      * {@link org.dspace.content.service.RelationshipService#create(Context)} }
@@ -216,6 +225,39 @@ public class Relationship implements ReloadableEntity<Integer> {
         this.rightwardValue = rightwardValue;
     }
 
+    /**
+     * Getter for {@link #latestVersionStatus}.
+     * @return the latest version status of this relationship.
+     */
+    public LatestVersionStatus getLatestVersionStatus() {
+        return latestVersionStatus;
+    }
+
+    /**
+     * Setter for {@link #latestVersionStatus}.
+     * @param latestVersionStatus the new latest version status for this relationship.
+     */
+    public void setLatestVersionStatus(LatestVersionStatus latestVersionStatus) {
+        if (this.latestVersionStatus == latestVersionStatus) {
+            return; // no change or cache reset needed
+        }
+
+        this.latestVersionStatus = latestVersionStatus;
+
+        // on one item, relation.* fields will change
+        // on the other item, relation.*.latestForDiscovery will change
+        leftItem.setMetadataModified();
+        rightItem.setMetadataModified();
+    }
+
+    public enum LatestVersionStatus {
+        // NOTE: SQL migration expects BOTH to be the first constant in this enum!
+        BOTH, // both items in this relationship are the "latest"
+        LEFT_ONLY, // the left-hand item of this relationship is the "latest", but the right-hand item is not
+        RIGHT_ONLY // the right-hand item of this relationship is the "latest", but the left-hand item is not
+        // NOTE: one side of any given relationship should ALWAYS be the "latest"
+    }
+
     /**
      * Standard getter for the ID for this Relationship
      * @return  The ID of this relationship
diff --git a/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataService.java b/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataService.java
index 38b0d18bd9..c3570ad47e 100644
--- a/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataService.java
+++ b/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataService.java
@@ -56,7 +56,9 @@ public interface RelationshipMetadataService {
      * This method will retrieve the EntityType String from an item
      * @param item  The Item for which the entityType String will be returned
      * @return      A String value indicating the entityType
+     * @deprecated use {@link org.dspace.content.service.ItemService#getEntityTypeLabel(Item)} instead.
      */
+    @Deprecated
     public String getEntityTypeStringFromMetadata(Item item);
 
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataServiceImpl.java
index f8b756a1ea..14ed441b81 100644
--- a/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataServiceImpl.java
@@ -7,16 +7,24 @@
  */
 package org.dspace.content;
 
+import static org.dspace.content.RelationshipType.Tilted.LEFT;
+import static org.dspace.content.RelationshipType.Tilted.RIGHT;
+
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
+import org.dspace.content.service.ItemService;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.RelationshipService;
+import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.content.virtual.VirtualMetadataConfiguration;
 import org.dspace.content.virtual.VirtualMetadataPopulator;
 import org.dspace.core.Constants;
@@ -33,6 +41,12 @@ public class RelationshipMetadataServiceImpl implements RelationshipMetadataServ
     @Autowired(required = true)
     protected RelationshipService relationshipService;
 
+    @Autowired(required = true)
+    protected RelationshipTypeService relationshipTypeService;
+
+    @Autowired(required = true)
+    protected ItemService itemService;
+
     @Autowired(required = true)
     protected VirtualMetadataPopulator virtualMetadataPopulator;
 
@@ -44,12 +58,25 @@ public class RelationshipMetadataServiceImpl implements RelationshipMetadataServ
         Context context = new Context();
         List<RelationshipMetadataValue> fullMetadataValueList = new LinkedList<>();
         try {
-            String entityType = getEntityTypeStringFromMetadata(item);
-            if (StringUtils.isNotBlank(entityType)) {
+            EntityType entityType = itemService.getEntityType(context, item);
+            if (entityType != null) {
+                // NOTE: The following code will add metadata fields of type relation.*.latestForDiscovery
+                //       (e.g. relation.isAuthorOfPublication.latestForDiscovery).
+                //       These fields contain the UUIDs of the items that have a relationship with current item,
+                //       from the perspective of the other item. In other words, given a relationship with this item,
+                //       the current item should have "latest status" in order for the other item to appear in
+                //       relation.*.latestForDiscovery fields.
+                fullMetadataValueList.addAll(findLatestForDiscoveryMetadataValues(context, item, entityType));
+
+                // NOTE: The following code will, among other things,
+                //       add metadata fields of type relation.* (e.g. relation.isAuthorOfPublication).
+                //       These fields contain the UUIDs of the items that have a relationship with current item,
+                //       from the perspective of this item. In other words, given a relationship with this item,
+                //       the other item should have "latest status" in order to appear in relation.* fields.
                 List<Relationship> relationships = relationshipService.findByItem(context, item, -1, -1, true);
                 for (Relationship relationship : relationships) {
                     fullMetadataValueList
-                        .addAll(findRelationshipMetadataValueForItemRelationship(context, item, entityType,
+                        .addAll(findRelationshipMetadataValueForItemRelationship(context, item, entityType.getLabel(),
                                 relationship, enableVirtualMetadata));
                 }
 
@@ -60,16 +87,90 @@ public class RelationshipMetadataServiceImpl implements RelationshipMetadataServ
         return fullMetadataValueList;
     }
 
-    public String getEntityTypeStringFromMetadata(Item item) {
-        List<MetadataValue> list = item.getMetadata();
-        for (MetadataValue mdv : list) {
-            if (StringUtils.equals(mdv.getMetadataField().getMetadataSchema().getName(), "dspace")
-                && StringUtils.equals(mdv.getMetadataField().getElement(), "entity")
-                && StringUtils.equals(mdv.getMetadataField().getQualifier(), "type")) {
-                return mdv.getValue();
+    /**
+     * Create the list of relation.*.latestForDiscovery virtual metadata values for the given item.
+     * @param context the DSpace context.
+     * @param item the item.
+     * @param itemEntityType the entity type of the item.
+     * @return a list (may be empty) of metadata values of type relation.*.latestForDiscovery.
+     */
+    protected List<RelationshipMetadataValue> findLatestForDiscoveryMetadataValues(
+        Context context, Item item, EntityType itemEntityType
+    ) throws SQLException {
+        final String schema = MetadataSchemaEnum.RELATION.getName();
+        final String qualifier = "latestForDiscovery";
+
+        List<RelationshipMetadataValue> mdvs = new LinkedList<>();
+
+        List<RelationshipType> relationshipTypes = relationshipTypeService.findByEntityType(context, itemEntityType);
+        for (RelationshipType relationshipType : relationshipTypes) {
+            // item is on left side of this relationship type
+            // NOTE: On the left item, we should index the uuids of the right items. If the relationship type is
+            //       "tilted right", it means that we expect a huge amount of right items, so we don't index their uuids
+            //       on the left item as a storage/performance improvement.
+            //       As a consequence, when searching for related items (using discovery)
+            //       on the pages of the right items you won't be able to find the left item.
+            if (relationshipType.getTilted() != RIGHT && relationshipType.getLeftType().equals(itemEntityType)) {
+                String element = relationshipType.getLeftwardType();
+                List<ItemUuidAndRelationshipId> data = relationshipService
+                    .findByLatestItemAndRelationshipType(context, item, relationshipType, true);
+                mdvs.addAll(constructLatestForDiscoveryMetadataValues(context, schema, element, qualifier, data));
+            }
+
+            // item is on right side of this relationship type
+            // NOTE: On the right item, we should index the uuids of the left items. If the relationship type is
+            //       "tilted left", it means that we expect a huge amount of left items, so we don't index their uuids
+            //       on the right item as a storage/performance improvement.
+            //       As a consequence, when searching for related items (using discovery)
+            //       on the pages of the left items you won't be able to find the right item.
+            if (relationshipType.getTilted() != LEFT && relationshipType.getRightType().equals(itemEntityType)) {
+                String element = relationshipType.getRightwardType();
+                List<ItemUuidAndRelationshipId> data = relationshipService
+                    .findByLatestItemAndRelationshipType(context, item, relationshipType, false);
+                mdvs.addAll(constructLatestForDiscoveryMetadataValues(context, schema, element, qualifier, data));
             }
         }
-        return null;
+
+        return mdvs;
+    }
+
+    /**
+     * Turn the given data into a list of relation.*.latestForDiscovery virtual metadata values.
+     * @param context the DSpace context.
+     * @param schema the schema for all metadata values.
+     * @param element the element for all metadata values.
+     * @param qualifier the qualifier for all metadata values.
+     * @param data a POJO containing the item uuid and relationship id.
+     * @return a list (may be empty) of metadata values of type relation.*.latestForDiscovery.
+     */
+    protected List<RelationshipMetadataValue> constructLatestForDiscoveryMetadataValues(
+        Context context, String schema, String element, String qualifier, List<ItemUuidAndRelationshipId> data
+    ) {
+        String mdf = new MetadataFieldName(schema, element, qualifier).toString();
+
+        return data.stream()
+            .map(datum -> {
+                RelationshipMetadataValue mdv = constructMetadataValue(context, mdf);
+                if (mdv == null) {
+                    return null;
+                }
+
+                mdv.setAuthority(Constants.VIRTUAL_AUTHORITY_PREFIX + datum.getRelationshipId());
+                mdv.setValue(datum.getItemUuid().toString());
+                // NOTE: place has no meaning for relation.*.latestForDiscovery metadata fields
+                mdv.setPlace(-1);
+                mdv.setUseForPlace(false);
+
+                return mdv;
+            })
+            .filter(Objects::nonNull)
+            .collect(Collectors.toUnmodifiableList());
+    }
+
+    @Override
+    @Deprecated
+    public String getEntityTypeStringFromMetadata(Item item) {
+        return itemService.getEntityTypeLabel(item);
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
index 1c99878e81..1fdfde6c74 100644
--- a/dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
@@ -10,9 +10,11 @@ package org.dspace.content;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -20,15 +22,19 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.Relationship.LatestVersionStatus;
 import org.dspace.content.dao.RelationshipDAO;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.content.service.EntityTypeService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.RelationshipService;
 import org.dspace.content.service.RelationshipTypeService;
+import org.dspace.content.virtual.VirtualMetadataConfiguration;
 import org.dspace.content.virtual.VirtualMetadataPopulator;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
+import org.dspace.versioning.utils.RelationshipVersioningUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class RelationshipServiceImpl implements RelationshipService {
@@ -55,6 +61,10 @@ public class RelationshipServiceImpl implements RelationshipService {
 
     @Autowired
     private RelationshipMetadataService relationshipMetadataService;
+
+    @Autowired
+    private RelationshipVersioningUtils relationshipVersioningUtils;
+
     @Autowired
     private VirtualMetadataPopulator virtualMetadataPopulator;
 
@@ -76,9 +86,10 @@ public class RelationshipServiceImpl implements RelationshipService {
 
 
     @Override
-    public Relationship create(Context c, Item leftItem, Item rightItem, RelationshipType relationshipType,
-                               int leftPlace, int rightPlace, String leftwardValue, String rightwardValue)
-            throws AuthorizeException, SQLException {
+    public Relationship create(
+        Context c, Item leftItem, Item rightItem, RelationshipType relationshipType, int leftPlace, int rightPlace,
+        String leftwardValue, String rightwardValue, LatestVersionStatus latestVersionStatus
+    ) throws AuthorizeException, SQLException {
         Relationship relationship = new Relationship();
         relationship.setLeftItem(leftItem);
         relationship.setRightItem(rightItem);
@@ -87,9 +98,21 @@ public class RelationshipServiceImpl implements RelationshipService {
         relationship.setRightPlace(rightPlace);
         relationship.setLeftwardValue(leftwardValue);
         relationship.setRightwardValue(rightwardValue);
+        relationship.setLatestVersionStatus(latestVersionStatus);
         return create(c, relationship);
     }
 
+    @Override
+    public Relationship create(
+        Context c, Item leftItem, Item rightItem, RelationshipType relationshipType, int leftPlace, int rightPlace,
+        String leftwardValue, String rightwardValue
+    ) throws AuthorizeException, SQLException {
+        return create(
+            c, leftItem, rightItem, relationshipType, leftPlace, rightPlace, leftwardValue, rightwardValue,
+            LatestVersionStatus.BOTH
+        );
+    }
+
     @Override
     public Relationship create(Context context, Relationship relationship) throws SQLException, AuthorizeException {
         if (isRelationshipValidToCreate(context, relationship)) {
@@ -98,7 +121,7 @@ public class RelationshipServiceImpl implements RelationshipService {
                 // This order of execution should be handled in the creation (create, updateplace, update relationship)
                 // for a proper place allocation
                 Relationship relationshipToReturn = relationshipDAO.create(context, relationship);
-                updatePlaceInRelationship(context, relationshipToReturn);
+                updatePlaceInRelationship(context, relationshipToReturn, null, null, true, true);
                 update(context, relationshipToReturn);
                 updateItemsInRelationship(context, relationship);
                 return relationshipToReturn;
@@ -113,71 +136,388 @@ public class RelationshipServiceImpl implements RelationshipService {
     }
 
     @Override
-    public void updatePlaceInRelationship(Context context, Relationship relationship)
-        throws SQLException, AuthorizeException {
+    public Relationship move(
+        Context context, Relationship relationship, Integer newLeftPlace, Integer newRightPlace
+    ) throws SQLException, AuthorizeException {
+        if (authorizeService.authorizeActionBoolean(context, relationship.getLeftItem(), Constants.WRITE) ||
+            authorizeService.authorizeActionBoolean(context, relationship.getRightItem(), Constants.WRITE)) {
+
+            // Don't do anything if neither the leftPlace nor rightPlace was updated
+            if (newLeftPlace != null || newRightPlace != null) {
+                // This order of execution should be handled in the creation (create, updateplace, update relationship)
+                // for a proper place allocation
+                updatePlaceInRelationship(context, relationship, newLeftPlace, newRightPlace, false, false);
+                update(context, relationship);
+                updateItemsInRelationship(context, relationship);
+            }
+
+            return relationship;
+        } else {
+            throw new AuthorizeException(
+                "You do not have write rights on this relationship's items");
+        }
+    }
+
+    @Override
+    public Relationship move(
+        Context context, Relationship relationship, Item newLeftItem, Item newRightItem
+    ) throws SQLException, AuthorizeException {
+        // If the new Item is the same as the current Item, don't move
+        newLeftItem = newLeftItem != relationship.getLeftItem() ? newLeftItem : null;
+        newRightItem = newRightItem != relationship.getRightItem() ? newRightItem : null;
+
+        // Don't do anything if neither the leftItem nor rightItem was updated
+        if (newLeftItem != null || newRightItem != null) {
+            // First move the Relationship to the back within the current Item's lists
+            // This ensures that we won't have any gaps once we move the Relationship to a different Item
+            move(
+                context, relationship,
+                newLeftItem != null ? -1 : null,
+                newRightItem != null ? -1 : null
+            );
+
+            boolean insertLeft = false;
+            boolean insertRight = false;
+
+            // If Item has been changed, mark the previous Item as modified to make sure we discard the old relation.*
+            // metadata on the next update.
+            // Set the Relationship's Items to the new ones, appending to the end
+            if (newLeftItem != null) {
+                relationship.getLeftItem().setMetadataModified();
+                relationship.setLeftItem(newLeftItem);
+                relationship.setLeftPlace(-1);
+                insertLeft = true;
+            }
+            if (newRightItem != null) {
+                relationship.getRightItem().setMetadataModified();
+                relationship.setRightItem(newRightItem);
+                relationship.setRightPlace(-1);
+                insertRight = true;
+            }
+
+            // This order of execution should be handled in the creation (create, updateplace, update relationship)
+            // for a proper place allocation
+            updatePlaceInRelationship(context, relationship, null, null, insertLeft, insertRight);
+            update(context, relationship);
+            updateItemsInRelationship(context, relationship);
+        }
+        return relationship;
+    }
+
+    /**
+     * This method will update the place for the Relationship and all other relationships found by the items and
+     * relationship type of the given Relationship.
+     *
+     * @param context           The relevant DSpace context
+     * @param relationship      The Relationship object that will have its place updated and that will be used
+     *                          to retrieve the other relationships whose place might need to be updated.
+     * @param newLeftPlace      If the Relationship in question is to be moved, the leftPlace it is to be moved to.
+     *                          Set this to null if the Relationship has not been moved, i.e. it has just been created,
+     *                          deleted or when its Items have been modified.
+     * @param newRightPlace     If the Relationship in question is to be moved, the rightPlace it is to be moved to.
+     *                          Set this to null if the Relationship has not been moved, i.e. it has just been created,
+     *                          deleted or when its Items have been modified.
+     * @param insertLeft        Whether the Relationship in question should be inserted into the left Item.
+     *                          Should be set to true when creating or moving to a different Item.
+     * @param insertRight       Whether the Relationship in question should be inserted into the right Item.
+     *                          Should be set to true when creating or moving to a different Item.
+     * @throws SQLException     If something goes wrong
+     * @throws AuthorizeException
+     *                          If the user is not authorized to update the Relationship or its Items
+     */
+    private void updatePlaceInRelationship(
+        Context context, Relationship relationship,
+        Integer newLeftPlace, Integer newRightPlace, boolean insertLeft, boolean insertRight
+    ) throws SQLException, AuthorizeException {
         Item leftItem = relationship.getLeftItem();
-        // Max value is used to ensure that these will get added to the back of the list and thus receive the highest
-        // (last) place as it's set to a -1 for creation
-        if (relationship.getLeftPlace() == -1) {
-            relationship.setLeftPlace(Integer.MAX_VALUE);
-        }
         Item rightItem = relationship.getRightItem();
-        if (relationship.getRightPlace() == -1) {
-            relationship.setRightPlace(Integer.MAX_VALUE);
-        }
-        List<Relationship> leftRelationships = findByItemAndRelationshipType(context,
-                                                                             leftItem,
-                                                                             relationship.getRelationshipType(), true);
-        List<Relationship> rightRelationships = findByItemAndRelationshipType(context,
-                                                                              rightItem,
-                                                                              relationship.getRelationshipType(),
-                                                                              false);
 
-        // These relationships are only deleted from the temporary lists incase they're present in them so that we can
+        // These list also include the non-latest. This is relevant to determine whether it's deleted.
+        // This can also imply there may be overlapping places, and/or the given relationship will overlap
+        // But the shift will allow this, and only happen when needed based on the latest status
+        List<Relationship> leftRelationships = findByItemAndRelationshipType(
+            context, leftItem, relationship.getRelationshipType(), true, -1, -1, false
+        );
+        List<Relationship> rightRelationships = findByItemAndRelationshipType(
+            context, rightItem, relationship.getRelationshipType(), false, -1, -1, false
+        );
+
+        // These relationships are only deleted from the temporary lists in case they're present in them so that we can
         // properly perform our place calculation later down the line in this method.
-        if (leftRelationships.contains(relationship)) {
-            leftRelationships.remove(relationship);
-        }
-        if (rightRelationships.contains(relationship)) {
-            rightRelationships.remove(relationship);
-        }
+        boolean deletedFromLeft = !leftRelationships.contains(relationship);
+        boolean deletedFromRight = !rightRelationships.contains(relationship);
+        leftRelationships.remove(relationship);
+        rightRelationships.remove(relationship);
+
+        List<MetadataValue> leftMetadata = getSiblingMetadata(leftItem, relationship, true);
+        List<MetadataValue> rightMetadata = getSiblingMetadata(rightItem, relationship, false);
+
+        // For new relationships added to the end, this will be -1.
+        // For new relationships added at a specific position, this will contain that position.
+        // For existing relationships, this will contain the place before it was moved.
+        // For deleted relationships, this will contain the place before it was deleted.
+        int oldLeftPlace = relationship.getLeftPlace();
+        int oldRightPlace = relationship.getRightPlace();
+
+
+        boolean movedUpLeft = resolveRelationshipPlace(
+            relationship, true, leftRelationships, leftMetadata, oldLeftPlace, newLeftPlace
+        );
+        boolean movedUpRight = resolveRelationshipPlace(
+            relationship, false, rightRelationships, rightMetadata, oldRightPlace, newRightPlace
+        );
+
         context.turnOffAuthorisationSystem();
-        //If useForPlace for the leftwardType is false for the relationshipType,
-        // we need to sort the relationships here based on leftplace.
-        if (!virtualMetadataPopulator.isUseForPlaceTrueForRelationshipType(relationship.getRelationshipType(), true)) {
-            if (!leftRelationships.isEmpty()) {
-                leftRelationships.sort(Comparator.comparingInt(Relationship::getLeftPlace));
-                for (int i = 0; i < leftRelationships.size(); i++) {
-                    leftRelationships.get(i).setLeftPlace(i);
-                }
-                relationship.setLeftPlace(leftRelationships.size());
-            } else {
-                relationship.setLeftPlace(0);
-            }
-        } else {
-            updateItem(context, leftItem);
 
+        //only shift if the place is relevant for the latest relationships
+        if (relationshipVersioningUtils.otherSideIsLatest(true, relationship.getLatestVersionStatus())) {
+            shiftSiblings(
+                relationship, true, oldLeftPlace, movedUpLeft, insertLeft, deletedFromLeft,
+                leftRelationships, leftMetadata
+            );
+        }
+        if (relationshipVersioningUtils.otherSideIsLatest(false, relationship.getLatestVersionStatus())) {
+            shiftSiblings(
+                relationship, false, oldRightPlace, movedUpRight, insertRight, deletedFromRight,
+                rightRelationships, rightMetadata
+            );
         }
 
-        //If useForPlace for the rightwardType is false for the relationshipType,
-        // we need to sort the relationships here based on the rightplace.
-        if (!virtualMetadataPopulator.isUseForPlaceTrueForRelationshipType(relationship.getRelationshipType(), false)) {
-            if (!rightRelationships.isEmpty()) {
-                rightRelationships.sort(Comparator.comparingInt(Relationship::getRightPlace));
-                for (int i = 0; i < rightRelationships.size(); i++) {
-                    rightRelationships.get(i).setRightPlace(i);
-                }
-                relationship.setRightPlace(rightRelationships.size());
-            } else {
-                relationship.setRightPlace(0);
-            }
+        updateItem(context, leftItem);
+        updateItem(context, rightItem);
 
-        } else {
-            updateItem(context, rightItem);
-
-        }
         context.restoreAuthSystemState();
+    }
 
+    /**
+     * Return the MDVs in the Item's MDF corresponding to the given Relationship.
+     * Return an empty list if the Relationship isn't mapped to any MDF
+     * or if the mapping is configured with useForPlace=false.
+     *
+     * This returns actual metadata (not virtual) which in the same metadata field as the useForPlace.
+     * For a publication with 2 author relationships and 3 plain text dc.contributor.author values,
+     * it would return the 3 plain text dc.contributor.author values.
+     * For a person related to publications, it would return an empty list.
+     */
+    private List<MetadataValue> getSiblingMetadata(
+        Item item, Relationship relationship, boolean isLeft
+    ) {
+        List<MetadataValue> metadata = new ArrayList<>();
+        if (virtualMetadataPopulator.isUseForPlaceTrueForRelationshipType(relationship.getRelationshipType(), isLeft)) {
+            HashMap<String, VirtualMetadataConfiguration> mapping;
+            if (isLeft) {
+                mapping = virtualMetadataPopulator.getMap().get(relationship.getRelationshipType().getLeftwardType());
+            } else {
+                mapping = virtualMetadataPopulator.getMap().get(relationship.getRelationshipType().getRightwardType());
+            }
+            if (mapping != null) {
+                for (String mdf : mapping.keySet()) {
+                    metadata.addAll(
+                        // Make sure we're only looking at database MDVs; if the relationship currently overlaps
+                        // one of these, its virtual MDV will overwrite the database MDV in itemService.getMetadata()
+                        // The relationship pass should be sufficient to move any sibling virtual MDVs.
+                        item.getMetadata()
+                            .stream()
+                            .filter(mdv -> mdv.getMetadataField().toString().equals(mdf.replace(".", "_")))
+                            .collect(Collectors.toList())
+                    );
+                }
+            }
+        }
+        return metadata;
+    }
+
+    /**
+     * Set the left/right place of a Relationship
+     *   - To a new place in case it's being moved
+     *   - Resolve -1 to the actual last place based on the places of its sibling Relationships and/or MDVs
+     * and determine if it has been moved up in the list.
+     *
+     * Examples:
+     *   - Insert a Relationship at place 3
+     *     newPlace starts out as null and is not updated. Return movedUp=false
+     *   - Insert a Relationship at place -1
+     *     newPlace starts out as null and is resolved to e.g. 6. Update the Relationship and return movedUp=false
+     *   - Move a Relationship from place 4 to 2
+     *     Update the Relationship and return movedUp=false.
+     *   - Move a Relationship from place 2 to -1
+     *     newPlace starts out as -1 and is resolved to e.g. 5. Update the relationship and return movedUp=true.
+     *   - Remove a relationship from place 1
+     *     Return movedUp=false
+     *
+     * @param relationship      the Relationship that's being updated
+     * @param isLeft            whether to consider the left side of the Relationship.
+     *                          This method should be called twice, once with isLeft=true and once with isLeft=false.
+     *                          Make sure this matches the provided relationships/metadata/oldPlace/newPlace.
+     * @param relationships     the list of sibling Relationships
+     * @param metadata          the list of sibling MDVs
+     * @param oldPlace          the previous place for this Relationship, in case it has been moved.
+     *                          Otherwise, the current place of a deleted Relationship
+     *                          or the place a Relationship has been inserted.
+     * @param newPlace          The new place for this Relationship. Will be null on insert/delete.
+     * @return  true if the Relationship was moved and newPlace > oldPlace
+     */
+    private boolean resolveRelationshipPlace(
+        Relationship relationship, boolean isLeft,
+        List<Relationship> relationships, List<MetadataValue> metadata,
+        int oldPlace, Integer newPlace
+    ) {
+        boolean movedUp = false;
+
+        if (newPlace != null) {
+            // We're moving an existing Relationship...
+            if (newPlace == -1) {
+                // ...to the end of the list
+                int nextPlace = getNextPlace(relationships, metadata, isLeft);
+                if (nextPlace == oldPlace) {
+                    // If this Relationship is already at the end, do nothing.
+                    newPlace = oldPlace;
+                } else {
+                    // Subtract 1 from the next place since we're moving, not inserting and
+                    // the total number of Relationships stays the same.
+                    newPlace = nextPlace - 1;
+                }
+            }
+            if (newPlace > oldPlace) {
+                // ...up the list. We have to keep track of this in order to shift correctly later on
+                movedUp = true;
+            }
+        } else if (oldPlace == -1) {
+            // We're _not_ moving an existing Relationship. The newPlace is already set in the Relationship object.
+            // We only need to resolve it to the end of the list if it's set to -1, otherwise we can just keep it as is.
+            newPlace = getNextPlace(relationships, metadata, isLeft);
+        }
+
+        if (newPlace != null) {
+            setPlace(relationship, isLeft, newPlace);
+        }
+
+        return movedUp;
+    }
+
+    /**
+     * Return the index of the next place in a list of Relationships and Metadata.
+     * By not relying on the size of both lists we can support one-to-many virtual MDV mappings.
+     * @param isLeft  whether to take the left or right place of each Relationship
+     */
+    private int getNextPlace(List<Relationship> relationships, List<MetadataValue> metadata, boolean isLeft) {
+        return Stream.concat(
+                         metadata.stream().map(MetadataValue::getPlace),
+                         relationships.stream().map(r -> getPlace(r, isLeft))
+                     ).max(Integer::compare)
+                     .map(integer -> integer + 1)
+                     .orElse(0);
+    }
+
+    /**
+     * Adjust the left/right place of sibling Relationships and MDVs
+     *
+     * Examples: with sibling Relationships R,S,T and metadata a,b,c
+     *   - Insert T at place 1                                              aRbSc     ->  a T RbSc
+     *     Shift all siblings with place >= 1 one place to the right
+     *   - Delete R from place 2                                            aT R bSc  ->  aTbSc
+     *     Shift all siblings with place > 2 one place to the left
+     *   - Move S from place 3 to place 2 (movedUp=false)                   aTb S c   ->  aT S bc
+     *     Shift all siblings with 2 < place <= 3 one place to the right
+     *   - Move T from place 1 to place 3 (movedUp=true)                    a T Sbc   ->  aSb T c
+     *     Shift all siblings with 1 < place <= 3 one place to the left
+     *
+     * @param relationship      the Relationship that's being updated
+     * @param isLeft            whether to consider the left side of the Relationship.
+     *                          This method should be called twice, once with isLeft=true and once with isLeft=false.
+     *                          Make sure this matches the provided relationships/metadata/oldPlace/newPlace.
+     * @param oldPlace          the previous place for this Relationship, in case it has been moved.
+     *                          Otherwise, the current place of a deleted Relationship
+     *                          or the place a Relationship has been inserted.
+     * @param movedUp           if this Relationship has been moved up the list, e.g. from place 2 to place 4
+     * @param deleted           whether this Relationship has been deleted
+     * @param relationships     the list of sibling Relationships
+     * @param metadata          the list of sibling MDVs
+     */
+    private void shiftSiblings(
+        Relationship relationship, boolean isLeft, int oldPlace, boolean movedUp, boolean inserted, boolean deleted,
+        List<Relationship> relationships, List<MetadataValue> metadata
+    ) {
+        int newPlace = getPlace(relationship, isLeft);
+
+        for (Relationship sibling : relationships) {
+            // NOTE: If and only if the other side of the relationship has "latest" status, the relationship will appear
+            //       as a metadata value on the item at the current side (indicated by isLeft) of the relationship.
+            //
+            //       Example: volume <----> issue (LEFT_ONLY)
+            //       => LEFT_ONLY means that the volume has "latest" status, but the issue does NOT have "latest" status
+            //       => the volume will appear in the metadata of the issue,
+            //          but the issue will NOT appear in the metadata of the volume
+            //
+            //       This means that the other side of the relationship has to have "latest" status, otherwise this
+            //       relationship is NOT relevant for place calculation.
+            if (relationshipVersioningUtils.otherSideIsLatest(isLeft, sibling.getLatestVersionStatus())) {
+                int siblingPlace = getPlace(sibling, isLeft);
+                if (
+                    (deleted && siblingPlace > newPlace)
+                    // If the relationship was deleted, all relationships after it should shift left
+                    // We must make the distinction between deletes and moves because for inserts oldPlace == newPlace
+                        || (movedUp && siblingPlace <= newPlace && siblingPlace > oldPlace)
+                            // If the relationship was moved up e.g. from place 2 to 5, all relationships
+                            // with place > 2 (the old place) and <= to 5 should shift left
+                ) {
+                    setPlace(sibling, isLeft, siblingPlace - 1);
+                } else if (
+                    (inserted && siblingPlace >= newPlace)
+                    // If the relationship was inserted, all relationships starting from that place should shift right
+                    // We must make the distinction between inserts and moves because for inserts oldPlace == newPlace
+                        || (!movedUp && siblingPlace >= newPlace && siblingPlace < oldPlace)
+                            // If the relationship was moved down e.g. from place 5 to 2, all relationships
+                            // with place >= 2 and < 5 (the old place) should shift right
+                ) {
+                    setPlace(sibling, isLeft, siblingPlace + 1);
+                }
+            }
+        }
+        for (MetadataValue mdv : metadata) {
+            // NOTE: Plain text metadata values should ALWAYS be included in the place calculation,
+            //       because they are by definition only visible/relevant to the side of the relationship
+            //       that we are currently processing.
+            int mdvPlace = mdv.getPlace();
+            if (
+                (deleted && mdvPlace > newPlace)
+                // If the relationship was deleted, all metadata after it should shift left
+                // We must make the distinction between deletes and moves because for inserts oldPlace == newPlace
+                // If the reltionship was copied to metadata on deletion:
+                //   - the plain text can be after the relationship (in which case it's moved forward again)
+                //   - or before the relationship (in which case it remains in place)
+                    || (movedUp && mdvPlace <= newPlace && mdvPlace > oldPlace)
+                        // If the relationship was moved up e.g. from place 2 to 5, all metadata
+                        // with place > 2 (the old place) and <= to 5 should shift left
+            ) {
+                mdv.setPlace(mdvPlace - 1);
+            } else if (
+                (inserted && mdvPlace >= newPlace)
+                // If the relationship was inserted, all relationships starting from that place should shift right
+                // We must make the distinction between inserts and moves because for inserts oldPlace == newPlace
+                    || (!movedUp && mdvPlace >= newPlace && mdvPlace < oldPlace)
+                        // If the relationship was moved down e.g. from place 5 to 2, all relationships
+                        // with place >= 2 and < 5 (the old place) should shift right
+            ) {
+                mdv.setPlace(mdvPlace + 1);
+            }
+        }
+    }
+
+    private int getPlace(Relationship relationship, boolean isLeft) {
+        if (isLeft) {
+            return relationship.getLeftPlace();
+        } else {
+            return relationship.getRightPlace();
+        }
+    }
+
+    private void setPlace(Relationship relationship, boolean isLeft, int place) {
+        if (isLeft) {
+            relationship.setLeftPlace(place);
+        } else {
+            relationship.setRightPlace(place);
+        }
     }
 
     @Override
@@ -187,16 +527,6 @@ public class RelationshipServiceImpl implements RelationshipService {
         itemService.update(context, relatedItem);
     }
 
-    @Override
-    public int findNextLeftPlaceByLeftItem(Context context, Item item) throws SQLException {
-        return relationshipDAO.findNextLeftPlaceByLeftItem(context, item);
-    }
-
-    @Override
-    public int findNextRightPlaceByRightItem(Context context, Item item) throws SQLException {
-        return relationshipDAO.findNextRightPlaceByRightItem(context, item);
-    }
-
     private boolean isRelationshipValidToCreate(Context context, Relationship relationship) throws SQLException {
         RelationshipType relationshipType = relationship.getRelationshipType();
 
@@ -212,15 +542,19 @@ public class RelationshipServiceImpl implements RelationshipService {
             logRelationshipTypeDetailsForError(relationshipType);
             return false;
         }
-        if (!verifyMaxCardinality(context, relationship.getLeftItem(),
+        if (!relationship.getLatestVersionStatus().equals(LatestVersionStatus.LEFT_ONLY)
+            && !verifyMaxCardinality(context, relationship.getLeftItem(),
                                   relationshipType.getLeftMaxCardinality(), relationshipType, true)) {
+            //If RIGHT_ONLY => it's a copied relationship, and the count can be ignored
             log.warn("The relationship has been deemed invalid since the left item has more" +
                          " relationships than the left max cardinality allows after we'd store this relationship");
             logRelationshipTypeDetailsForError(relationshipType);
             return false;
         }
-        if (!verifyMaxCardinality(context, relationship.getRightItem(),
+        if (!relationship.getLatestVersionStatus().equals(LatestVersionStatus.RIGHT_ONLY)
+                && !verifyMaxCardinality(context, relationship.getRightItem(),
                                   relationshipType.getRightMaxCardinality(), relationshipType, false)) {
+            //If LEFT_ONLY => it's a copied relationship, and the count can be ignored
             log.warn("The relationship has been deemed invalid since the right item has more" +
                          " relationships than the right max cardinality allows after we'd store this relationship");
             logRelationshipTypeDetailsForError(relationshipType);
@@ -279,14 +613,22 @@ public class RelationshipServiceImpl implements RelationshipService {
     }
 
     @Override
-    public List<Relationship> findByItem(Context context, Item item, Integer limit, Integer offset,
-                                         boolean excludeTilted) throws SQLException {
+    public List<Relationship> findByItem(
+        Context context, Item item, Integer limit, Integer offset, boolean excludeTilted
+    ) throws SQLException {
+        return findByItem(context, item, limit, offset, excludeTilted, true);
+    }
 
-        List<Relationship> list = relationshipDAO.findByItem(context, item, limit, offset, excludeTilted);
+    @Override
+    public List<Relationship> findByItem(
+        Context context, Item item, Integer limit, Integer offset, boolean excludeTilted, boolean excludeNonLatest
+    ) throws SQLException {
+        List<Relationship> list =
+            relationshipDAO.findByItem(context, item, limit, offset, excludeTilted, excludeNonLatest);
 
         list.sort((o1, o2) -> {
             int relationshipType = o1.getRelationshipType().getLeftwardType()
-                                     .compareTo(o2.getRelationshipType().getLeftwardType());
+                .compareTo(o2.getRelationshipType().getLeftwardType());
             if (relationshipType != 0) {
                 return relationshipType;
             } else {
@@ -377,7 +719,7 @@ public class RelationshipServiceImpl implements RelationshipService {
         if (authorizeService.authorizeActionBoolean(context, relationship.getLeftItem(), Constants.WRITE) ||
             authorizeService.authorizeActionBoolean(context, relationship.getRightItem(), Constants.WRITE)) {
             relationshipDAO.delete(context, relationship);
-            updatePlaceInRelationship(context, relationship);
+            updatePlaceInRelationship(context, relationship, null, null, false, false);
             updateItemsInRelationship(context, relationship);
         } else {
             throw new AuthorizeException(
@@ -450,7 +792,7 @@ public class RelationshipServiceImpl implements RelationshipService {
                     + item.getID() + " due to " + currentDepth + " depth");
             return;
         }
-        String entityTypeStringFromMetadata = relationshipMetadataService.getEntityTypeStringFromMetadata(item);
+        String entityTypeStringFromMetadata = itemService.getEntityTypeLabel(item);
         EntityType actualEntityType = entityTypeService.findByEntityType(context, entityTypeStringFromMetadata);
         // Get all types of relations for the current item
         List<RelationshipType> relationshipTypes = relationshipTypeService.findByEntityType(context, actualEntityType);
@@ -510,6 +852,9 @@ public class RelationshipServiceImpl implements RelationshipService {
 
     /**
      * Converts virtual metadata from RelationshipMetadataValue objects to actual item metadata.
+     * The resulting MDVs are added in front or behind the Relationship's virtual MDVs.
+     * The Relationship's virtual MDVs may be shifted right, and all subsequent metadata will be shifted right.
+     * So this method ensures the places are still valid.
      *
      * @param context           The relevant DSpace context
      * @param relationship      The relationship containing the left and right items
@@ -520,13 +865,20 @@ public class RelationshipServiceImpl implements RelationshipService {
                                     boolean copyToRightItem)
         throws SQLException, AuthorizeException {
         if (copyToLeftItem) {
-            String entityTypeString = relationshipMetadataService
-                .getEntityTypeStringFromMetadata(relationship.getLeftItem());
+            String entityTypeString = itemService.getEntityTypeLabel(relationship.getLeftItem());
             List<RelationshipMetadataValue> relationshipMetadataValues =
                 relationshipMetadataService.findRelationshipMetadataValueForItemRelationship(context,
                     relationship.getLeftItem(), entityTypeString, relationship, true);
             for (RelationshipMetadataValue relationshipMetadataValue : relationshipMetadataValues) {
-                itemService.addAndShiftRightMetadata(context, relationship.getLeftItem(),
+                // This adds the plain text metadata values on the same spot as the virtual values.
+                // This will be overruled in org.dspace.content.DSpaceObjectServiceImpl.update
+                //   in the line below but it's not important whether the plain text or virtual values end up on top.
+                // The virtual values will eventually be deleted, and the others shifted
+                // This is required because addAndShiftRightMetadata has issues on metadata fields containing
+                //   relationship values which are not useForPlace, while the relationhip type has useForPlace
+                // E.g. when using addAndShiftRightMetadata on relation.isAuthorOfPublication, it will break the order
+                // from dc.contributor.author
+                itemService.addMetadata(context, relationship.getLeftItem(),
                                                      relationshipMetadataValue.getMetadataField().
                                                          getMetadataSchema().getName(),
                                                      relationshipMetadataValue.getMetadataField().getElement(),
@@ -535,16 +887,16 @@ public class RelationshipServiceImpl implements RelationshipService {
                                                      relationshipMetadataValue.getValue(), null, -1,
                                                      relationshipMetadataValue.getPlace());
             }
+            //This will ensure the new values no longer overlap, but won't break the order
             itemService.update(context, relationship.getLeftItem());
         }
         if (copyToRightItem) {
-            String entityTypeString = relationshipMetadataService
-                .getEntityTypeStringFromMetadata(relationship.getRightItem());
+            String entityTypeString = itemService.getEntityTypeLabel(relationship.getRightItem());
             List<RelationshipMetadataValue> relationshipMetadataValues =
                 relationshipMetadataService.findRelationshipMetadataValueForItemRelationship(context,
                     relationship.getRightItem(), entityTypeString, relationship, true);
             for (RelationshipMetadataValue relationshipMetadataValue : relationshipMetadataValues) {
-                itemService.addAndShiftRightMetadata(context, relationship.getRightItem(),
+                itemService.addMetadata(context, relationship.getRightItem(),
                                                      relationshipMetadataValue.getMetadataField().
                                                          getMetadataSchema().getName(),
                                                      relationshipMetadataValue.getMetadataField().getElement(),
@@ -638,22 +990,46 @@ public class RelationshipServiceImpl implements RelationshipService {
     public List<Relationship> findByItemAndRelationshipType(Context context, Item item,
                                                             RelationshipType relationshipType)
         throws SQLException {
-        return relationshipDAO.findByItemAndRelationshipType(context, item, relationshipType, -1, -1);
+        return findByItemAndRelationshipType(context, item, relationshipType, -1, -1, true);
     }
 
     @Override
     public List<Relationship> findByItemAndRelationshipType(Context context, Item item,
                                                             RelationshipType relationshipType, int limit, int offset)
             throws SQLException {
-        return relationshipDAO.findByItemAndRelationshipType(context, item, relationshipType, limit, offset);
+        return findByItemAndRelationshipType(context, item, relationshipType, limit, offset, true);
     }
 
     @Override
-    public List<Relationship> findByItemAndRelationshipType(Context context, Item item,
-                                                            RelationshipType relationshipType, boolean isLeft,
-                                                            int limit, int offset)
-            throws SQLException {
-        return relationshipDAO.findByItemAndRelationshipType(context, item, relationshipType, isLeft, limit, offset);
+    public List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, int limit, int offset, boolean excludeNonLatest
+    ) throws SQLException {
+        return relationshipDAO
+            .findByItemAndRelationshipType(context, item, relationshipType, limit, offset, excludeNonLatest);
+    }
+
+    @Override
+    public List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, int limit, int offset
+    ) throws SQLException {
+        return findByItemAndRelationshipType(context, item, relationshipType, isLeft, limit, offset, true);
+    }
+
+    @Override
+    public List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, int limit, int offset,
+        boolean excludeNonLatest
+    ) throws SQLException {
+        return relationshipDAO
+            .findByItemAndRelationshipType(context, item, relationshipType, isLeft, limit, offset, excludeNonLatest);
+    }
+
+    @Override
+    public List<ItemUuidAndRelationshipId> findByLatestItemAndRelationshipType(
+        Context context, Item latestItem, RelationshipType relationshipType, boolean isLeft
+    ) throws SQLException {
+        return relationshipDAO
+            .findByLatestItemAndRelationshipType(context, latestItem, relationshipType, isLeft);
     }
 
     @Override
@@ -690,7 +1066,14 @@ public class RelationshipServiceImpl implements RelationshipService {
 
     @Override
     public int countByItem(Context context, Item item) throws SQLException {
-        return relationshipDAO.countByItem(context, item);
+        return countByItem(context, item, false, true);
+    }
+
+    @Override
+    public int countByItem(
+        Context context, Item item, boolean excludeTilted, boolean excludeNonLatest
+    ) throws SQLException {
+        return relationshipDAO.countByItem(context, item, excludeTilted, excludeNonLatest);
     }
 
     @Override
@@ -699,9 +1082,18 @@ public class RelationshipServiceImpl implements RelationshipService {
     }
 
     @Override
-    public int countByItemAndRelationshipType(Context context, Item item, RelationshipType relationshipType,
-                                              boolean isLeft) throws SQLException {
-        return relationshipDAO.countByItemAndRelationshipType(context, item, relationshipType, isLeft);
+    public int countByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft
+    ) throws SQLException {
+        return countByItemAndRelationshipType(context, item, relationshipType, isLeft, true);
+    }
+
+    @Override
+    public int countByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, boolean excludeNonLatest
+    ) throws SQLException {
+        return relationshipDAO
+            .countByItemAndRelationshipType(context, item, relationshipType, isLeft, excludeNonLatest);
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/content/WorkspaceItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/WorkspaceItemServiceImpl.java
index d891dcf638..f40bb5256f 100644
--- a/dspace-api/src/main/java/org/dspace/content/WorkspaceItemServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/WorkspaceItemServiceImpl.java
@@ -128,19 +128,23 @@ public class WorkspaceItemServiceImpl implements WorkspaceItemService {
         Optional<MetadataValue> colEntityType = getDSpaceEntityType(collection);
         Optional<MetadataValue> templateItemEntityType = getDSpaceEntityType(templateItem);
 
-        if (colEntityType.isPresent() && templateItemEntityType.isPresent() &&
+        if (template && colEntityType.isPresent() && templateItemEntityType.isPresent() &&
                 !StringUtils.equals(colEntityType.get().getValue(), templateItemEntityType.get().getValue())) {
             throw new IllegalStateException("The template item has entity type : (" +
                       templateItemEntityType.get().getValue() + ") different than collection entity type : " +
                       colEntityType.get().getValue());
         }
 
-        if (colEntityType.isPresent() && templateItemEntityType.isEmpty()) {
+        if (template && colEntityType.isPresent() && templateItemEntityType.isEmpty()) {
             MetadataValue original = colEntityType.get();
             MetadataField metadataField = original.getMetadataField();
             MetadataSchema metadataSchema = metadataField.getMetadataSchema();
-            itemService.addMetadata(context, item, metadataSchema.getName(), metadataField.getElement(),
-                                    metadataField.getQualifier(), original.getLanguage(), original.getValue());
+            // NOTE: dspace.entity.type = <blank> does not make sense
+            //       the collection entity type is by default blank when a collection is first created
+            if (StringUtils.isNotBlank(original.getValue())) {
+                itemService.addMetadata(context, item, metadataSchema.getName(), metadataField.getElement(),
+                                        metadataField.getQualifier(), original.getLanguage(), original.getValue());
+            }
         }
 
         if (template && (templateItem != null)) {
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/EPersonAuthority.java b/dspace-api/src/main/java/org/dspace/content/authority/EPersonAuthority.java
new file mode 100644
index 0000000000..8d929a8d3b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/authority/EPersonAuthority.java
@@ -0,0 +1,127 @@
+/**
+ * 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/
+ */
+package org.dspace.content.authority;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.authorize.factory.AuthorizeServiceFactory;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.util.UUIDUtils;
+import org.dspace.web.ContextUtil;
+
+/**
+ * Implementation of {@link ChoiceAuthority} based on EPerson. Allows you to set
+ * the id of an eperson as authority.
+ *
+ * @author Mykhaylo Boychuk (4science.it)
+ */
+public class EPersonAuthority implements ChoiceAuthority {
+
+    private static final Logger log = LogManager.getLogger(EPersonAuthority.class);
+
+    /**
+     * the name assigned to the specific instance by the PluginService, @see
+     * {@link NameAwarePlugin}
+     **/
+    private String authorityName;
+
+    private EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+
+    private AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
+
+    @Override
+    public Choices getBestMatch(String text, String locale) {
+        return getMatches(text, 0, 2, locale);
+    }
+
+    @Override
+    public Choices getMatches(String text, int start, int limit, String locale) {
+        if (limit <= 0) {
+            limit = 20;
+        }
+
+        Context context = getContext();
+
+        List<EPerson> ePersons = searchEPersons(context, text, start, limit);
+
+        List<Choice> choiceList = new ArrayList<Choice>();
+        for (EPerson eperson : ePersons) {
+            choiceList.add(new Choice(eperson.getID().toString(), eperson.getFullName(), eperson.getFullName()));
+        }
+        Choice[] results = new Choice[choiceList.size()];
+        results = choiceList.toArray(results);
+        return new Choices(results, start, ePersons.size(), Choices.CF_AMBIGUOUS, ePersons.size() > (start + limit), 0);
+    }
+
+    @Override
+    public String getLabel(String key, String locale) {
+
+        UUID uuid = UUIDUtils.fromString(key);
+        if (uuid == null) {
+            return null;
+        }
+
+        Context context = getContext();
+        try {
+            EPerson ePerson = ePersonService.find(context, uuid);
+            return ePerson != null ? ePerson.getFullName() : null;
+        } catch (SQLException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+    }
+
+    private List<EPerson> searchEPersons(Context context, String text, int start, int limit) {
+
+        if (!isCurrentUserAdminOrAccessGroupManager(context)) {
+            return Collections.emptyList();
+        }
+
+        try {
+            return ePersonService.search(context, text, start, limit);
+        } catch (SQLException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+    }
+
+    private Context getContext() {
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        return context != null ? context : new Context();
+    }
+
+    private boolean isCurrentUserAdminOrAccessGroupManager(Context context) {
+        try {
+            return authorizeService.isAdmin(context) || authorizeService.isAccountManager(context);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String getPluginInstanceName() {
+        return authorityName;
+    }
+
+    @Override
+    public void setPluginInstanceName(String name) {
+        this.authorityName = name;
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPDIMCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPDIMCrosswalk.java
index 2d919baa9d..4b77e4807a 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPDIMCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPDIMCrosswalk.java
@@ -14,8 +14,8 @@ import java.util.List;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * Crosswalk descriptive metadata to and from DIM (DSpace Intermediate
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java
index 8ffddf715f..978cabfb4b 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java
@@ -40,8 +40,8 @@ import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * Crosswalk of technical metadata for DSpace AIP.  This is
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMDisseminationCrosswalk.java
index 3f4d6bd44e..4365d9a485 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMDisseminationCrosswalk.java
@@ -23,8 +23,8 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * DIM dissemination crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMIngestionCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMIngestionCrosswalk.java
index ad922a65f2..4217308e65 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMIngestionCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMIngestionCrosswalk.java
@@ -19,8 +19,8 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * DIM ingestion crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/DisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/DisseminationCrosswalk.java
index 23e1965d7b..3e4fe21f8f 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/DisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/DisseminationCrosswalk.java
@@ -14,8 +14,8 @@ import java.util.List;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * Dissemination Crosswalk plugin -- translate DSpace native
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/IngestionCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/IngestionCrosswalk.java
index 7edfb6f79f..bb73c83c45 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/IngestionCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/IngestionCrosswalk.java
@@ -14,7 +14,7 @@ import java.util.List;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * Ingestion Crosswalk plugin -- translate an external metadata format
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/METSDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/METSDisseminationCrosswalk.java
index e44774a672..b8a4a8aef3 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/METSDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/METSDisseminationCrosswalk.java
@@ -24,11 +24,11 @@ import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * METS dissemination crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/METSRightsCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/METSRightsCrosswalk.java
index 559d463be2..7f6622841b 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/METSRightsCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/METSRightsCrosswalk.java
@@ -35,8 +35,8 @@ import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * METSRights Ingestion and Dissemination Crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
index 182fcebe2f..1e63be5ba1 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
@@ -15,7 +15,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -42,16 +41,18 @@ import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.Text;
-import org.jdom.Verifier;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
-import org.jdom.xpath.XPath;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.Text;
+import org.jdom2.Verifier;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
 
 /**
  * Configurable MODS Crosswalk
@@ -156,7 +157,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
     static class modsTriple {
         public String qdc = null;
         public Element xml = null;
-        public XPath xpath = null;
+        public XPathExpression xpath = null;
 
         /**
          * Initialize from text versions of QDC, XML and XPath.
@@ -171,9 +172,9 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
             final String postlog = "</mods>";
             try {
                 result.qdc = qdc;
-                result.xpath = XPath.newInstance(xpath);
-                result.xpath.addNamespace(MODS_NS.getPrefix(), MODS_NS.getURI());
-                result.xpath.addNamespace(XLINK_NS);
+                result.xpath =
+                    XPathFactory.instance()
+                        .compile(xpath, Filters.fpassthrough(), null, MODS_NS, XLINK_NS);
                 Document d = builder.build(new StringReader(prolog + xml + postlog));
                 result.xml = (Element) d.getRootElement().getContent(0);
             } catch (JDOMException | IOException je) {
@@ -295,6 +296,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
      * @throws IOException        if IO error
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
+     * @return List of Elements
      */
     @Override
     public List<Element> disseminateList(Context context, DSpaceObject dso)
@@ -352,37 +354,29 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
             if (trip == null) {
                 log.warn("WARNING: " + getPluginInstanceName() + ": No MODS mapping for \"" + qdc + "\"");
             } else {
-                try {
-                    Element me = (Element) trip.xml.clone();
-                    if (addSchema) {
-                        me.setAttribute("schemaLocation", schemaLocation, XSI_NS);
-                    }
-                    Iterator ni = trip.xpath.selectNodes(me).iterator();
-                    if (!ni.hasNext()) {
-                        log.warn("XPath \"" + trip.xpath.getXPath() +
-                                     "\" found no elements in \"" +
-                                     outputUgly.outputString(me) +
-                                     "\", qdc=" + qdc);
-                    }
-                    while (ni.hasNext()) {
-                        Object what = ni.next();
-                        if (what instanceof Element) {
-                            ((Element) what).setText(checkedString(value));
-                        } else if (what instanceof Attribute) {
-                            ((Attribute) what).setValue(checkedString(value));
-                        } else if (what instanceof Text) {
-                            ((Text) what).setText(checkedString(value));
-                        } else {
-                            log.warn("Got unknown object from XPath, class=" + what.getClass().getName());
-                        }
-                    }
-                    result.add(me);
-                } catch (JDOMException je) {
-                    log.error("Error following XPath in modsTriple: context=" +
-                                  outputUgly.outputString(trip.xml) +
-                                  ", xpath=" + trip.xpath.getXPath() + ", exception=" +
-                                  je.toString());
+                Element me = (Element) trip.xml.clone();
+                if (addSchema) {
+                    me.setAttribute("schemaLocation", schemaLocation, XSI_NS);
                 }
+                List<Object> matches = trip.xpath.evaluate(me);
+                if (matches.isEmpty()) {
+                    log.warn("XPath \"" + trip.xpath.getExpression() +
+                                 "\" found no elements in \"" +
+                                 outputUgly.outputString(me) +
+                                 "\", qdc=" + qdc);
+                }
+                for (Object match: matches) {
+                    if (match instanceof Element) {
+                        ((Element) match).setText(checkedString(value));
+                    } else if (match instanceof Attribute) {
+                        ((Attribute) match).setValue(checkedString(value));
+                    } else if (match instanceof Text) {
+                        ((Text) match).setText(checkedString(value));
+                    } else {
+                        log.warn("Got unknown object from XPath, class=" + match.getClass().getName());
+                    }
+                }
+                result.add(me);
             }
         }
         return result;
@@ -423,9 +417,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
         String title = site.getName();
         String url = site.getURL();
 
-        if (identifier_uri != null) {
-            metadata.add(createDCValue("identifier.uri", null, identifier_uri));
-        }
+        metadata.add(createDCValue("identifier.uri", null, identifier_uri));
 
         //FIXME: adding two URIs for now (site handle and URL), in case site isn't using handles
         if (url != null) {
@@ -472,9 +464,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
             metadata.add(createDCValue("description", "tableofcontents", description_table));
         }
 
-        if (identifier_uri != null) {
-            metadata.add(createDCValue("identifier.uri", null, identifier_uri));
-        }
+        metadata.add(createDCValue("identifier.uri", null, identifier_uri));
 
         if (rights != null) {
             metadata.add(createDCValue("rights", null, rights));
@@ -526,9 +516,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
             metadata.add(createDCValue("description", "tableofcontents", description_table));
         }
 
-        if (identifier_uri != null) {
-            metadata.add(createDCValue("identifier", "uri", identifier_uri));
-        }
+        metadata.add(createDCValue("identifier", "uri", identifier_uri));
 
         if (provenance != null) {
             metadata.add(createDCValue("provenance", null, provenance));
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/NullIngestionCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/NullIngestionCrosswalk.java
index 994e15601d..562dadaca0 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/NullIngestionCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/NullIngestionCrosswalk.java
@@ -15,9 +15,9 @@ import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
-import org.jdom.Element;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 
 /**
  * "Null" ingestion crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/OAIDCIngestionCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/OAIDCIngestionCrosswalk.java
index 10bd5ce6fa..6b0ecae780 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/OAIDCIngestionCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/OAIDCIngestionCrosswalk.java
@@ -20,8 +20,8 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * DIM ingestion crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java
index 3dde093784..ac1c434322 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java
@@ -31,8 +31,8 @@ import org.dspace.core.Context;
 import org.dspace.core.Utils;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * ORE dissemination crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java
index 80c424e782..f756aae225 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java
@@ -34,12 +34,13 @@ import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.xpath.XPath;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
 
 /**
  * ORE ingestion crosswalk
@@ -113,23 +114,21 @@ public class OREIngestionCrosswalk
         Document doc = new Document();
         doc.addContent(root.detach());
 
-        XPath xpathLinks;
         List<Element> aggregatedResources;
         String entryId;
-        try {
-            xpathLinks = XPath.newInstance("/atom:entry/atom:link[@rel=\"" + ORE_NS.getURI() + "aggregates" + "\"]");
-            xpathLinks.addNamespace(ATOM_NS);
-            aggregatedResources = xpathLinks.selectNodes(doc);
+        XPathExpression<Element> xpathLinks =
+            XPathFactory.instance()
+                        .compile("/atom:entry/atom:link[@rel=\"" + ORE_NS.getURI() + "aggregates" + "\"]",
+                                 Filters.element(), null, ATOM_NS);
+        aggregatedResources = xpathLinks.evaluate(doc);
 
-            xpathLinks = XPath.newInstance("/atom:entry/atom:link[@rel='alternate']/@href");
-            xpathLinks.addNamespace(ATOM_NS);
-            entryId = ((Attribute) xpathLinks.selectSingleNode(doc)).getValue();
-        } catch (JDOMException e) {
-            throw new CrosswalkException("JDOM exception occurred while ingesting the ORE", e);
-        }
+        XPathExpression<Attribute> xpathAltHref =
+            XPathFactory.instance()
+                        .compile("/atom:entry/atom:link[@rel='alternate']/@href",
+                                 Filters.attribute(), null, ATOM_NS);
+        entryId = xpathAltHref.evaluateFirst(doc).getValue();
 
         // Next for each resource, create a bitstream
-        XPath xpathDesc;
         NumberFormat nf = NumberFormat.getInstance();
         nf.setGroupingUsed(false);
         nf.setMinimumIntegerDigits(4);
@@ -140,16 +139,12 @@ public class OREIngestionCrosswalk
 
             String bundleName;
             Element desc = null;
-            try {
-                xpathDesc = XPath.newInstance(
-                    "/atom:entry/oreatom:triples/rdf:Description[@rdf:about=\"" + this.encodeForURL(href) + "\"][1]");
-                xpathDesc.addNamespace(ATOM_NS);
-                xpathDesc.addNamespace(ORE_ATOM);
-                xpathDesc.addNamespace(RDF_NS);
-                desc = (Element) xpathDesc.selectSingleNode(doc);
-            } catch (JDOMException e) {
-                log.warn("Could not find description for {}", href, e);
-            }
+            XPathExpression<Element> xpathDesc =
+                XPathFactory.instance()
+                    .compile("/atom:entry/oreatom:triples/rdf:Description[@rdf:about=\"" +
+                                 this.encodeForURL(href) + "\"][1]",
+                             Filters.element(), null, ATOM_NS, ORE_ATOM, RDF_NS);
+            desc = xpathDesc.evaluateFirst(doc);
 
             if (desc != null && desc.getChild("type", RDF_NS).getAttributeValue("resource", RDF_NS)
                                     .equals(DS_NS.getURI() + "DSpaceBitstream")) {
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java
index e4e387a3ec..39b6c8f29c 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java
@@ -30,8 +30,8 @@ import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * PREMIS Crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/ParameterizedDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/ParameterizedDisseminationCrosswalk.java
index 312aed3543..5d9322339d 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/ParameterizedDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/ParameterizedDisseminationCrosswalk.java
@@ -14,7 +14,7 @@ import java.util.Map;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * Translate DSpace native metadata into an external XML format, with parameters.
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
index f3c51a5d46..2fdbaaad00 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
@@ -36,10 +36,10 @@ import org.dspace.core.Context;
 import org.dspace.core.SelfNamedPlugin;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * Configurable QDC Crosswalk
@@ -290,7 +290,7 @@ public class QDCCrosswalk extends SelfNamedPlugin
                 qdc2element.put(qdc, element);
                 element2qdc.put(makeQualifiedTagName(element), qdc);
                 log.debug("Building Maps: qdc=\"" + qdc + "\", element=\"" + element.toString() + "\"");
-            } catch (org.jdom.JDOMException je) {
+            } catch (org.jdom2.JDOMException je) {
                 throw new CrosswalkInternalException(
                     "Failed parsing XML fragment in properties file: \"" + prolog + val + postlog + "\": " + je
                         .toString(), je);
@@ -326,6 +326,7 @@ public class QDCCrosswalk extends SelfNamedPlugin
      * @throws IOException        if IO error
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
+     * @return List of Elements
      */
     @Override
     public List<Element> disseminateList(Context context, DSpaceObject dso)
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/RoleCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/RoleCrosswalk.java
index d36ff3edf5..2c763036ce 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/RoleCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/RoleCrosswalk.java
@@ -26,12 +26,12 @@ import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.workflow.WorkflowException;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
 
 /**
  * Role Crosswalk
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/SimpleDCDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/SimpleDCDisseminationCrosswalk.java
index 22ec68070a..2f91c3aa07 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/SimpleDCDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/SimpleDCDisseminationCrosswalk.java
@@ -24,8 +24,8 @@ import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.SelfNamedPlugin;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
 
 /**
  * Disseminator for Simple Dublin Core metadata in XML format.
@@ -84,6 +84,7 @@ public class SimpleDCDisseminationCrosswalk extends SelfNamedPlugin
      * @throws IOException        if IO error
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
+     * @return List of Elements
      */
     @Override
     public List<Element> disseminateList(Context context, DSpaceObject dso)
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
index d03d2dd887..7b25f69ce3 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
@@ -34,9 +34,9 @@ import org.dspace.core.Context;
 import org.dspace.core.SelfNamedPlugin;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.Verifier;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Verifier;
 
 /**
  * Crosswalk for creating appropriate &lt;meta&gt; elements to appear in the
@@ -90,17 +90,17 @@ public class XHTMLHeadDisseminationCrosswalk
      * Maps DSpace metadata field to name to use in XHTML head element, e.g.
      * dc.creator or dc.description.abstract
      */
-    private Map<String, String> names;
+    private final Map<String, String> names;
 
     /**
      * Maps DSpace metadata field to scheme for that field, if any
      */
-    private Map<String, String> schemes;
+    private final Map<String, String> schemes;
 
     /**
      * Schemas to add -- maps schema.NAME to schema URL
      */
-    private Map<String, String> schemaURLs;
+    private final Map<String, String> schemaURLs;
 
     public XHTMLHeadDisseminationCrosswalk() throws IOException {
         names = new HashMap<>();
@@ -109,17 +109,9 @@ public class XHTMLHeadDisseminationCrosswalk
 
         // Read in configuration
         Properties crosswalkProps = new Properties();
-        FileInputStream fis = new FileInputStream(config);
-        try {
+
+        try (FileInputStream fis = new FileInputStream(config);) {
             crosswalkProps.load(fis);
-        } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException ioe) {
-                    // ignore
-                }
-            }
         }
 
         Enumeration e = crosswalkProps.keys();
@@ -178,6 +170,7 @@ public class XHTMLHeadDisseminationCrosswalk
      * @throws IOException        if IO error
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
+     * @return List of Elements
      */
     @Override
     public List<Element> disseminateList(Context context, DSpaceObject dso) throws CrosswalkException,
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
index 1c85fd82c5..d4ccebf82e 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
@@ -21,7 +21,7 @@ import javax.xml.transform.stream.StreamSource;
 import org.dspace.core.SelfNamedPlugin;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Namespace;
+import org.jdom2.Namespace;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -130,12 +130,6 @@ public abstract class XSLTCrosswalk extends SelfNamedPlugin {
         return aliasList.toArray(new String[aliasList.size()]);
     }
 
-    /**
-     * We need to force this, because some dependency elsewhere interferes.
-     */
-    private static final String TRANSFORMER_FACTORY_CLASS
-        = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
-
     private Transformer transformer = null;
     private File transformFile = null;
     private long transformLastModified = 0;
@@ -181,8 +175,7 @@ public abstract class XSLTCrosswalk extends SelfNamedPlugin {
                 Source transformSource
                     = new StreamSource(new FileInputStream(transformFile));
                 TransformerFactory transformerFactory
-                    = TransformerFactory.newInstance(
-                    TRANSFORMER_FACTORY_CLASS, null);
+                    = TransformerFactory.newInstance();
                 transformer = transformerFactory.newTransformer(transformSource);
                 transformLastModified = transformFile.lastModified();
             } catch (TransformerConfigurationException | FileNotFoundException e) {
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
index 6c30c1b1a4..26371b46aa 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
@@ -18,6 +18,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 
@@ -41,14 +42,15 @@ import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.Verifier;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
-import org.jdom.transform.JDOMResult;
-import org.jdom.transform.JDOMSource;
+import org.jdom2.Content;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Verifier;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
+import org.jdom2.transform.JDOMResult;
+import org.jdom2.transform.JDOMSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -244,6 +246,7 @@ public class XSLTDisseminationCrosswalk
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      * @see DisseminationCrosswalk
+     * @return List of Elements
      */
     @Override
     public List<Element> disseminateList(Context context, DSpaceObject dso)
@@ -268,7 +271,12 @@ public class XSLTDisseminationCrosswalk
         try {
             JDOMResult result = new JDOMResult();
             xform.transform(new JDOMSource(createDIM(dso).getChildren()), result);
-            return result.getResult();
+            List<Content> contentList = result.getResult();
+            // Transform List<Content> into List<Element>
+            List<Element> elementList = contentList.stream()
+                                                   .filter(obj -> obj instanceof Element)
+                                                   .map(Element.class::cast).collect(Collectors.toList());
+            return elementList;
         } catch (TransformerException e) {
             LOG.error("Got error: " + e.toString());
             throw new CrosswalkInternalException("XSL translation failed: " + e.toString(), e);
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTIngestionCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTIngestionCrosswalk.java
index 37a822374d..63ef5f7336 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTIngestionCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTIngestionCrosswalk.java
@@ -12,6 +12,7 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 
@@ -34,13 +35,14 @@ import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
-import org.jdom.transform.JDOMResult;
-import org.jdom.transform.JDOMSource;
+import org.jdom2.Content;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
+import org.jdom2.transform.JDOMResult;
+import org.jdom2.transform.JDOMSource;
 
 /**
  * Configurable XSLT-driven ingestion Crosswalk
@@ -141,7 +143,12 @@ public class XSLTIngestionCrosswalk
         try {
             JDOMResult result = new JDOMResult();
             xform.transform(new JDOMSource(metadata), result);
-            ingestDIM(context, dso, result.getResult(), createMissingMetadataFields);
+            List<Content> contentList = result.getResult();
+            // Transform List<Content> into List<Element>
+            List<Element> elementList = contentList.stream()
+                                                   .filter(obj -> obj instanceof Element)
+                                                   .map(Element.class::cast).collect(Collectors.toList());
+            ingestDIM(context, dso, elementList, createMissingMetadataFields);
         } catch (TransformerException e) {
             log.error("Got error: " + e.toString());
             throw new CrosswalkInternalException("XSL Transformation failed: " + e.toString(), e);
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java b/dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java
index 4c391d973b..86da51e6cc 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java
@@ -32,8 +32,22 @@ public interface ItemDAO extends DSpaceObjectLegacySupportDAO<Item> {
 
     public Iterator<Item> findAll(Context context, boolean archived, int limit, int offset) throws SQLException;
 
+    @Deprecated
     public Iterator<Item> findAll(Context context, boolean archived, boolean withdrawn) throws SQLException;
 
+    /**
+     * Find all items that are:
+     * - NOT in the workspace
+     * - NOT in the workflow
+     * - NOT a template item for e.g. a collection
+     *
+     * This implies that the result also contains older versions of items and withdrawn items.
+     * @param context the DSpace context.
+     * @return iterator over all regular items.
+     * @throws SQLException if database error.
+     */
+    public Iterator<Item> findAllRegularItems(Context context) throws SQLException;
+
     /**
      * Find all Items modified since a Date.
      *
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/ProcessDAO.java b/dspace-api/src/main/java/org/dspace/content/dao/ProcessDAO.java
index 4ef26cffcb..69bac319c6 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/ProcessDAO.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/ProcessDAO.java
@@ -8,8 +8,10 @@
 package org.dspace.content.dao;
 
 import java.sql.SQLException;
+import java.util.Date;
 import java.util.List;
 
+import org.dspace.content.ProcessStatus;
 import org.dspace.core.Context;
 import org.dspace.core.GenericDAO;
 import org.dspace.scripts.Process;
@@ -81,4 +83,18 @@ public interface ProcessDAO extends GenericDAO<Process> {
 
     int countTotalWithParameters(Context context, ProcessQueryParameterContainer processQueryParameterContainer)
         throws SQLException;
+
+    /**
+     * Find all the processes with one of the given status and with a creation time
+     * older than the specified date.
+     *
+     * @param  context      The relevant DSpace context
+     * @param  statuses     the statuses of the processes to search for
+     * @param  date         the creation date to search for
+     * @return              The list of all Processes which match requirements
+     * @throws SQLException If something goes wrong
+     */
+    List<Process> findByStatusAndCreationTimeOlderThan(Context context, List<ProcessStatus> statuses, Date date)
+        throws SQLException;
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java b/dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java
index 57b950a36b..a152b5b902 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java
@@ -14,6 +14,7 @@ import java.util.UUID;
 import org.dspace.content.Item;
 import org.dspace.content.Relationship;
 import org.dspace.content.RelationshipType;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.core.Context;
 import org.dspace.core.GenericDAO;
 
@@ -28,53 +29,38 @@ public interface RelationshipDAO extends GenericDAO<Relationship> {
     /**
      * This method returns a list of Relationship objects that have the given Item object
      * as a leftItem or a rightItem
-     * @param context         The relevant DSpace context
-     * @param item            The item that should be either a leftItem or a rightItem of all
-     *                        the Relationship objects in the returned list
-     * @param excludeTilted   If true, excludes tilted relationships
-     * @return                The list of Relationship objects that contain either a left or a
-     *                        right item that is equal to the given item
-     * @throws SQLException   If something goes wrong
+     * @param context           The relevant DSpace context
+     * @param item              The item that should be either a leftItem or a rightItem of all
+     *                          the Relationship objects in the returned list
+     * @param excludeTilted     If true, excludes tilted relationships
+     * @param excludeNonLatest  If true, excludes all relationships for which the other item has a more recent version
+     *                          that is relevant for this relationship
+     * @return                  The list of Relationship objects that contain either a left or a
+     *                          right item that is equal to the given item
+     * @throws SQLException     If something goes wrong
      */
-    List<Relationship> findByItem(Context context, Item item, boolean excludeTilted) throws SQLException;
+    List<Relationship> findByItem(
+        Context context, Item item, boolean excludeTilted, boolean excludeNonLatest
+    ) throws SQLException;
 
     /**
      * This method returns a list of Relationship objects that have the given Item object
      * as a leftItem or a rightItem
-     * @param context         The relevant DSpace context
-     * @param item            The item that should be either a leftItem or a rightItem of all
-     *                        the Relationship objects in the returned list
-     * @param limit           paging limit
-     * @param offset          paging offset
-     * @param excludeTilted   If true, excludes tilted relationships
-     * @return                The list of Relationship objects that contain either a left or a
-     *                        right item that is equal to the given item
-     * @throws SQLException   If something goes wrong
+     * @param context           The relevant DSpace context
+     * @param item              The item that should be either a leftItem or a rightItem of all
+     *                          the Relationship objects in the returned list
+     * @param limit             paging limit
+     * @param offset            paging offset
+     * @param excludeTilted     If true, excludes tilted relationships
+     * @param excludeNonLatest  If true, excludes all relationships for which the other item has a more recent version
+     *                          that is relevant for this relationship
+     * @return                  The list of Relationship objects that contain either a left or a
+     *                          right item that is equal to the given item
+     * @throws SQLException     If something goes wrong
      */
-    List<Relationship> findByItem(Context context, Item item, Integer limit, Integer offset, boolean excludeTilted)
-            throws SQLException;
-
-    /**
-     * This method returns the next leftplace integer to use for a relationship with this item as the leftItem
-     *
-     * @param context   The relevant DSpace context
-     * @param item      The item to be matched on leftItem
-     * @return          The next integer to be used for the leftplace of a relationship with the given item
-     *                  as a left item
-     * @throws SQLException If something goes wrong
-     */
-    int findNextLeftPlaceByLeftItem(Context context, Item item) throws SQLException;
-
-    /**
-     * This method returns the next rightplace integer to use for a relationship with this item as the rightItem
-     *
-     * @param context   The relevant DSpace context
-     * @param item      The item to be matched on rightItem
-     * @return          The next integer to be used for the rightplace of a relationship with the given item
-     *                  as a right item
-     * @throws SQLException If something goes wrong
-     */
-    int findNextRightPlaceByRightItem(Context context, Item item) throws SQLException;
+    List<Relationship> findByItem(
+        Context context, Item item, Integer limit, Integer offset, boolean excludeTilted, boolean excludeNonLatest
+    ) throws SQLException;
 
     /**
      * This method returns a list of Relationship objects for the given RelationshipType object.
@@ -108,34 +94,69 @@ public interface RelationshipDAO extends GenericDAO<Relationship> {
      * It will construct a list of all Relationship objects that have the given RelationshipType object
      * as the relationshipType property
      * @param context           The relevant DSpace context
+     * @param item              item to filter by
      * @param relationshipType  The RelationshipType object to be checked on
      * @param limit             paging limit
      * @param offset            paging offset
-     * @param item              item to filter by
+     * @param excludeNonLatest  If true, excludes all relationships for which the other item has a more recent version
+     *                          that is relevant for this relationship
      * @return  A list of Relationship objects that have the given RelationshipType object as the
      *          relationshipType property
      * @throws SQLException If something goes wrong
      */
-    List<Relationship> findByItemAndRelationshipType(Context context, Item item, RelationshipType relationshipType,
-                                                     Integer limit, Integer offset) throws SQLException;
+    List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, Integer limit, Integer offset,
+        boolean excludeNonLatest
+    ) throws SQLException;
 
     /**
      * This method returns a list of Relationship objects for the given RelationshipType object.
      * It will construct a list of all Relationship objects that have the given RelationshipType object
      * as the relationshipType property
      * @param context           The relevant DSpace context
+     * @param item              item to filter by
      * @param relationshipType  The RelationshipType object to be checked on
+     * @param isLeft            Is item left or right
      * @param limit             paging limit
      * @param offset            paging offset
-     * @param item              item to filter by
-     * @param isLeft            Is item left or right
+     * @param excludeNonLatest  If true, excludes all relationships for which the other item has a more recent version
+     *                          that is relevant for this relationship
      * @return  A list of Relationship objects that have the given RelationshipType object as the
      *          relationshipType property
      * @throws SQLException If something goes wrong
      */
-    List<Relationship> findByItemAndRelationshipType(Context context, Item item, RelationshipType relationshipType,
-                                                     boolean isLeft, Integer limit, Integer offset)
-            throws SQLException;
+    List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, Integer limit, Integer offset,
+        boolean excludeNonLatest
+    ) throws SQLException;
+
+    /**
+     * This method returns the UUIDs of all items that have a relationship with the given item, from the perspective
+     * of the other item. In other words, given a relationship with the given item, the given item should have
+     * "latest status" in order for the other item uuid to be returned.
+     *
+     * This method differs from the "excludeNonLatest" property in other methods,
+     * because in this method the current item should have "latest status" to return the other item,
+     * whereas with "excludeNonLatest" the other item should have "latest status" to be returned.
+     *
+     * This method is used to index items in solr; when searching for related items of one of the returned uuids,
+     * the given item should appear as a search result.
+     *
+     * NOTE: This method does not return {@link Relationship}s for performance, because doing so would eagerly fetch
+     *       the items on both sides, which is unnecessary.
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type.
+     * @param context the DSpace context.
+     * @param latestItem the target item; only relationships where this item has "latest status" should be considered.
+     * @param relationshipType the relationship type for which relationships should be selected.
+     * @param isLeft whether the entity type of the item occurs on the left or right side of the relationship type.
+     *               This is redundant in most cases, but necessary because relationship types my have
+     *               the same entity type on both sides.
+     * @return a list containing pairs of relationship ids and item uuids.
+     * @throws SQLException if something goes wrong.
+     */
+    public List<ItemUuidAndRelationshipId> findByLatestItemAndRelationshipType(
+        Context context, Item latestItem, RelationshipType relationshipType, boolean isLeft
+    ) throws SQLException;
 
     /**
      * This method returns a list of Relationship objects for the given typeName
@@ -183,28 +204,34 @@ public interface RelationshipDAO extends GenericDAO<Relationship> {
     /**
      * This method returns a count of Relationship objects that have the given Item object
      * as a leftItem or a rightItem
-     * @param context   The relevant DSpace context
-     * @param item      The item that should be either a leftItem or a rightItem of all
-     *                  the Relationship objects in the returned list
+     * @param context           The relevant DSpace context
+     * @param item              The item that should be either a leftItem or a rightItem of all
+     *                          the Relationship objects in the returned list
+     * @param excludeTilted     if true, excludes tilted relationships
+     * @param excludeNonLatest  if true, exclude relationships for which the opposite item is not the latest version
+     *                          that is relevant
      * @return          The list of Relationship objects that contain either a left or a
      *                  right item that is equal to the given item
      * @throws SQLException If something goes wrong
      */
-    int countByItem(Context context, Item item) throws SQLException;
+    int countByItem(Context context, Item item, boolean excludeTilted, boolean excludeNonLatest) throws SQLException;
 
     /**
      * Count total number of relationships (rows in relationship table) by an item and a relationship type and a boolean
      * indicating whether the item should be the leftItem or the rightItem
      *
-     * @param context context
-     * @param relationshipType relationship type to filter by
-     * @param item item to filter by
-     * @param isLeft Indicating whether the counted Relationships should have the given Item on the left side or not
+     * @param context           context
+     * @param relationshipType  relationship type to filter by
+     * @param item              item to filter by
+     * @param isLeft            indicating whether the counted Relationships should have the given Item on the left side
+     * @param excludeNonLatest  if true, exclude relationships for which the opposite item is not the latest version
+     *                          that is relevant
      * @return total count
      * @throws SQLException if database error
      */
-    int countByItemAndRelationshipType(Context context, Item item, RelationshipType relationshipType, boolean isLeft)
-            throws SQLException;
+    int countByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, boolean excludeNonLatest
+    ) throws SQLException;
 
     /**
      * Count total number of relationships (rows in relationship table) given a typeName
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
index c4125696a8..aad8cf3c50 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
@@ -79,6 +79,20 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
         return iterate(query);
     }
 
+    @Override
+    public Iterator<Item> findAllRegularItems(Context context) throws SQLException {
+        // NOTE: This query includes archived items, withdrawn items and older versions of items.
+        //       It does not include workspace, workflow or template items.
+        Query query = createQuery(
+            context,
+            "SELECT i FROM Item as i " +
+            "LEFT JOIN Version as v ON i = v.item " +
+            "WHERE i.inArchive=true or i.withdrawn=true or (i.inArchive=false and v.id IS NOT NULL) " +
+            "ORDER BY i.id"
+        );
+        return iterate(query);
+    }
+
     @Override
     public Iterator<Item> findAll(Context context, boolean archived,
                                   boolean withdrawn, boolean discoverable, Date lastModified)
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java
index 5c8083a86b..23ce6ce381 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java
@@ -7,7 +7,10 @@
  */
 package org.dspace.content.dao.impl;
 
+import static org.dspace.scripts.Process_.CREATION_TIME;
+
 import java.sql.SQLException;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +20,7 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import org.apache.commons.lang3.StringUtils;
+import org.dspace.content.ProcessStatus;
 import org.dspace.content.dao.ProcessDAO;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
@@ -147,6 +151,23 @@ public class ProcessDAOImpl extends AbstractHibernateDAO<Process> implements Pro
     }
 
 
+    @Override
+    public List<Process> findByStatusAndCreationTimeOlderThan(Context context, List<ProcessStatus> statuses,
+        Date date) throws SQLException {
+
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<Process> criteriaQuery = getCriteriaQuery(criteriaBuilder, Process.class);
+
+        Root<Process> processRoot = criteriaQuery.from(Process.class);
+        criteriaQuery.select(processRoot);
+
+        Predicate creationTimeLessThanGivenDate = criteriaBuilder.lessThan(processRoot.get(CREATION_TIME), date);
+        Predicate statusIn = processRoot.get(Process_.PROCESS_STATUS).in(statuses);
+        criteriaQuery.where(criteriaBuilder.and(creationTimeLessThanGivenDate, statusIn));
+
+        return list(context, criteriaQuery, false, Process.class, -1, -1);
+    }
+
 }
 
 
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java
index 48baf45f23..e2f84bc1cb 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java
@@ -11,17 +11,22 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import javax.persistence.Query;
+import javax.persistence.Tuple;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import org.dspace.content.Item;
+import org.dspace.content.Item_;
 import org.dspace.content.Relationship;
 import org.dspace.content.RelationshipType;
 import org.dspace.content.RelationshipType_;
 import org.dspace.content.Relationship_;
 import org.dspace.content.dao.RelationshipDAO;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.core.AbstractHibernateDAO;
@@ -30,95 +35,152 @@ import org.dspace.core.Context;
 public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> implements RelationshipDAO {
 
     @Override
-    public List<Relationship> findByItem(Context context, Item item, boolean excludeTilted) throws SQLException {
-        return findByItem(context, item, -1, -1, excludeTilted);
+    public List<Relationship> findByItem(
+        Context context, Item item, boolean excludeTilted, boolean excludeNonLatest
+    ) throws SQLException {
+        return findByItem(context, item, -1, -1, excludeTilted, excludeNonLatest);
     }
 
     @Override
-    public List<Relationship> findByItem(Context context, Item item, Integer limit, Integer offset,
-                                         boolean excludeTilted) throws SQLException {
-
+    public List<Relationship> findByItem(
+        Context context, Item item, Integer limit, Integer offset, boolean excludeTilted, boolean excludeNonLatest
+    ) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
+        CriteriaQuery<Relationship> criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
         criteriaQuery.select(relationshipRoot);
-        if (excludeTilted) {
-            // If this item is the left item,
-            //    return relationships for types which are not tilted right (tilted is either left nor null)
-            // If this item is the right item,
-            //    return relationships for types which are not tilted left (tilted is either right nor null)
-            criteriaQuery
-                    .where(criteriaBuilder.or(
-                            criteriaBuilder.and(
-                                    criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), item),
-                                    criteriaBuilder.or(
-                                            criteriaBuilder.isNull(relationshipRoot.get(Relationship_.relationshipType)
-                                                    .get(RelationshipType_.tilted)),
-                                            criteriaBuilder.notEqual(relationshipRoot
-                                                .get(Relationship_.relationshipType)
-                                                .get(RelationshipType_.tilted), RelationshipType.Tilted.RIGHT))),
-                            criteriaBuilder.and(
-                                    criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), item),
-                                    criteriaBuilder.or(
-                                            criteriaBuilder.isNull(relationshipRoot.get(Relationship_.relationshipType)
-                                                    .get(RelationshipType_.tilted)),
-                                            criteriaBuilder.notEqual(relationshipRoot
-                                                    .get(Relationship_.relationshipType)
-                                                    .get(RelationshipType_.tilted), RelationshipType.Tilted.LEFT)))));
-        } else {
-            criteriaQuery
-                    .where(criteriaBuilder.or(criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), item),
-                            criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), item)));
-        }
+
+        criteriaQuery.where(
+            criteriaBuilder.or(
+                getLeftItemPredicate(criteriaBuilder, relationshipRoot, item, excludeTilted, excludeNonLatest),
+                getRightItemPredicate(criteriaBuilder, relationshipRoot, item, excludeTilted, excludeNonLatest)
+            )
+        );
+
         return list(context, criteriaQuery, false, Relationship.class, limit, offset);
     }
 
-    @Override
-    public int countByItem(Context context, Item item)
-            throws SQLException {
+    /**
+     * Get the predicate for a criteria query that selects relationships by their left item.
+     * @param criteriaBuilder   the criteria builder.
+     * @param relationshipRoot  the relationship root.
+     * @param item              the item that is being searched for.
+     * @param excludeTilted     if true, exclude tilted relationships.
+     * @param excludeNonLatest  if true, exclude relationships for which the opposite item is not the latest version
+     *                          that is relevant.
+     * @return a predicate that satisfies the given restrictions.
+     */
+    protected Predicate getLeftItemPredicate(
+        CriteriaBuilder criteriaBuilder, Root<Relationship> relationshipRoot, Item item,
+        boolean excludeTilted, boolean excludeNonLatest
+    ) {
+        List<Predicate> predicates = new ArrayList<>();
 
+        // match relationships based on the left item
+        predicates.add(
+            criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), item)
+        );
+
+        if (excludeTilted) {
+            // if this item is the left item,
+            // return relationships for types which are NOT tilted right (tilted is either left nor null)
+            predicates.add(
+                criteriaBuilder.or(
+                    criteriaBuilder.isNull(
+                        relationshipRoot.get(Relationship_.relationshipType).get(RelationshipType_.tilted)
+                    ),
+                    criteriaBuilder.notEqual(
+                        relationshipRoot.get(Relationship_.relationshipType).get(RelationshipType_.tilted),
+                        RelationshipType.Tilted.RIGHT
+                    )
+                )
+            );
+        }
+
+        if (excludeNonLatest) {
+            // if this item is the left item,
+            // return relationships for which the right item is the "latest" version that is relevant.
+            predicates.add(
+                criteriaBuilder.notEqual(
+                    relationshipRoot.get(Relationship_.LATEST_VERSION_STATUS),
+                    Relationship.LatestVersionStatus.LEFT_ONLY
+                )
+            );
+        }
+
+        return criteriaBuilder.and(predicates.toArray(new Predicate[]{}));
+    }
+
+    /**
+     * Get the predicate for a criteria query that selects relationships by their right item.
+     * @param criteriaBuilder   the criteria builder.
+     * @param relationshipRoot  the relationship root.
+     * @param item              the item that is being searched for.
+     * @param excludeTilted     if true, exclude tilted relationships.
+     * @param excludeNonLatest  if true, exclude relationships for which the opposite item is not the latest version
+     *                          that is relevant.
+     * @return a predicate that satisfies the given restrictions.
+     */
+    protected Predicate getRightItemPredicate(
+        CriteriaBuilder criteriaBuilder, Root<Relationship> relationshipRoot, Item item,
+        boolean excludeTilted, boolean excludeNonLatest
+    ) {
+        List<Predicate> predicates = new ArrayList<>();
+
+        // match relationships based on the right item
+        predicates.add(
+            criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), item)
+        );
+
+        if (excludeTilted) {
+            // if this item is the right item,
+            // return relationships for types which are NOT tilted left (tilted is either right nor null)
+            predicates.add(
+                criteriaBuilder.or(
+                    criteriaBuilder.isNull(
+                        relationshipRoot.get(Relationship_.relationshipType).get(RelationshipType_.tilted)
+                    ),
+                    criteriaBuilder.notEqual(
+                        relationshipRoot.get(Relationship_.relationshipType).get(RelationshipType_.tilted),
+                        RelationshipType.Tilted.LEFT
+                    )
+                )
+            );
+        }
+
+        if (excludeNonLatest) {
+            // if this item is the right item,
+            // return relationships for which the left item is the "latest" version that is relevant.
+            predicates.add(
+                criteriaBuilder.notEqual(
+                    relationshipRoot.get(Relationship_.LATEST_VERSION_STATUS),
+                    Relationship.LatestVersionStatus.RIGHT_ONLY
+                )
+            );
+        }
+
+        return criteriaBuilder.and(predicates.toArray(new Predicate[]{}));
+    }
+
+    @Override
+    public int countByItem(
+        Context context, Item item, boolean excludeTilted, boolean excludeNonLatest
+    ) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
         criteriaQuery.select(relationshipRoot);
-        criteriaQuery
-                .where(criteriaBuilder.or(criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), item),
-                        criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), item)));
+
+        criteriaQuery.where(
+            criteriaBuilder.or(
+                getLeftItemPredicate(criteriaBuilder, relationshipRoot, item, excludeTilted, excludeNonLatest),
+                getRightItemPredicate(criteriaBuilder, relationshipRoot, item, excludeTilted, excludeNonLatest)
+            )
+        );
+
         return count(context, criteriaQuery, criteriaBuilder, relationshipRoot);
     }
 
-    @Override
-    public int findNextLeftPlaceByLeftItem(Context context, Item item) throws SQLException {
-        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
-        Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
-        criteriaQuery.select(relationshipRoot);
-        criteriaQuery.where(criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), item));
-        List<Relationship> list = list(context, criteriaQuery, false, Relationship.class, -1, -1);
-        list.sort((o1, o2) -> o2.getLeftPlace() - o1.getLeftPlace());
-        if (!list.isEmpty()) {
-            return list.get(0).getLeftPlace() + 1;
-        } else {
-            return 0;
-        }
-    }
-
-    @Override
-    public int findNextRightPlaceByRightItem(Context context, Item item) throws SQLException {
-        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
-        Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
-        criteriaQuery.select(relationshipRoot);
-        criteriaQuery.where(criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), item));
-        List<Relationship> list = list(context, criteriaQuery, false, Relationship.class, -1, -1);
-        list.sort((o1, o2) -> o2.getRightPlace() - o1.getRightPlace());
-        if (!list.isEmpty()) {
-            return list.get(0).getRightPlace() + 1;
-        } else {
-            return 0;
-        }
-    }
-
     @Override
     public List<Relationship> findByRelationshipType(Context context, RelationshipType relationshipType)
         throws SQLException {
@@ -140,49 +202,132 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
     }
 
     @Override
-    public List<Relationship> findByItemAndRelationshipType(Context context, Item item,
-                                                            RelationshipType relationshipType, Integer limit,
-                                                            Integer offset)
-            throws SQLException {
-
+    public List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, Integer limit, Integer offset,
+        boolean excludeNonLatest
+    ) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
         criteriaQuery.select(relationshipRoot);
-        criteriaQuery
-                .where(criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType),
-                        relationshipType), criteriaBuilder.or
-                        (criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), item),
-                         criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), item)));
+
+        criteriaQuery.where(
+            criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType), relationshipType),
+            criteriaBuilder.or(
+                getLeftItemPredicate(criteriaBuilder, relationshipRoot, item, false, excludeNonLatest),
+                getRightItemPredicate(criteriaBuilder, relationshipRoot, item, false, excludeNonLatest)
+            )
+        );
+
         return list(context, criteriaQuery, true, Relationship.class, limit, offset);
     }
 
     @Override
-    public List<Relationship> findByItemAndRelationshipType(Context context, Item item,
-                                                            RelationshipType relationshipType, boolean isLeft,
-                                                            Integer limit, Integer offset)
-            throws SQLException {
-
+    public List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, Integer limit, Integer offset,
+        boolean excludeNonLatest
+    ) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
         criteriaQuery.select(relationshipRoot);
+
         if (isLeft) {
-            criteriaQuery
-                    .where(criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType),
-                            relationshipType),
-                           criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), item));
+            criteriaQuery.where(
+                criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType), relationshipType),
+                getLeftItemPredicate(criteriaBuilder, relationshipRoot, item, false, excludeNonLatest)
+            );
             criteriaQuery.orderBy(criteriaBuilder.asc(relationshipRoot.get(Relationship_.leftPlace)));
         } else {
-            criteriaQuery
-                    .where(criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType),
-                            relationshipType),
-                            criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), item));
+            criteriaQuery.where(
+                criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType), relationshipType),
+                getRightItemPredicate(criteriaBuilder, relationshipRoot, item, false, excludeNonLatest)
+            );
             criteriaQuery.orderBy(criteriaBuilder.asc(relationshipRoot.get(Relationship_.rightPlace)));
         }
+
         return list(context, criteriaQuery, true, Relationship.class, limit, offset);
     }
 
+    @Override
+    public List<ItemUuidAndRelationshipId> findByLatestItemAndRelationshipType(
+        Context context, Item latestItem, RelationshipType relationshipType, boolean isLeft
+    ) throws SQLException {
+        final String relationshipIdAlias = "relationshipId";
+        final String itemUuidAlias = "itemUuid";
+
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<Tuple> criteriaQuery = criteriaBuilder.createTupleQuery();
+        Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
+
+        ArrayList<Predicate> predicates = new ArrayList<>();
+
+        // all relationships should have the specified relationship type
+        predicates.add(
+            criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType), relationshipType)
+        );
+
+        if (isLeft) {
+            // match relationships based on the left item
+            predicates.add(
+                criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), latestItem)
+            );
+
+            // the left item has to have "latest status" => accept BOTH and LEFT_ONLY
+            predicates.add(
+                criteriaBuilder.notEqual(
+                    relationshipRoot.get(Relationship_.LATEST_VERSION_STATUS),
+                    Relationship.LatestVersionStatus.RIGHT_ONLY
+                )
+            );
+
+            // return the UUIDs of the right item
+            criteriaQuery.multiselect(
+                relationshipRoot.get(Relationship_.id).alias(relationshipIdAlias),
+                relationshipRoot.get(Relationship_.rightItem).get(Item_.id).alias(itemUuidAlias)
+            );
+        } else {
+            // match relationships based on the right item
+            predicates.add(
+                criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), latestItem)
+            );
+
+            // the right item has to have "latest status" => accept BOTH and RIGHT_ONLY
+            predicates.add(
+                criteriaBuilder.notEqual(
+                    relationshipRoot.get(Relationship_.LATEST_VERSION_STATUS),
+                    Relationship.LatestVersionStatus.LEFT_ONLY
+                )
+            );
+
+            // return the UUIDs of the left item
+            criteriaQuery.multiselect(
+                relationshipRoot.get(Relationship_.id).alias(relationshipIdAlias),
+                relationshipRoot.get(Relationship_.leftItem).get(Item_.id).alias(itemUuidAlias)
+            );
+        }
+
+        // all predicates are chained with the AND operator
+        criteriaQuery.where(predicates.toArray(new Predicate[]{}));
+
+        // deduplicate result
+        criteriaQuery.distinct(true);
+
+        // execute query
+        Query query = this.getHibernateSession(context).createQuery(criteriaQuery);
+        query.setHint("org.hibernate.cacheable", true);
+        List<?> resultList = query.getResultList();
+
+        // convert types
+        return resultList.stream()
+            .map(Tuple.class::cast)
+            .map(t -> new ItemUuidAndRelationshipId(
+                (UUID) t.get(itemUuidAlias),
+                (Integer) t.get(relationshipIdAlias)
+            ))
+            .collect(Collectors.toList());
+    }
+
     @Override
     public List<Relationship> findByTypeName(Context context, String typeName)
             throws SQLException {
@@ -228,24 +373,26 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
     }
 
     @Override
-    public int countByItemAndRelationshipType(Context context, Item item, RelationshipType relationshipType,
-                                              boolean isLeft) throws SQLException {
-
+    public int countByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, boolean excludeNonLatest
+    ) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
         criteriaQuery.select(relationshipRoot);
+
         if (isLeft) {
-            criteriaQuery
-                .where(criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType),
-                                             relationshipType),
-                       criteriaBuilder.equal(relationshipRoot.get(Relationship_.leftItem), item));
+            criteriaQuery.where(
+                criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType), relationshipType),
+                getLeftItemPredicate(criteriaBuilder, relationshipRoot, item, false, excludeNonLatest)
+            );
         } else {
-            criteriaQuery
-                .where(criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType),
-                                             relationshipType),
-                     criteriaBuilder.equal(relationshipRoot.get(Relationship_.rightItem), item));
+            criteriaQuery.where(
+                criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType), relationshipType),
+                getRightItemPredicate(criteriaBuilder, relationshipRoot, item, false, excludeNonLatest)
+            );
         }
+
         return count(context, criteriaQuery, criteriaBuilder, relationshipRoot);
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/pojo/ItemUuidAndRelationshipId.java b/dspace-api/src/main/java/org/dspace/content/dao/pojo/ItemUuidAndRelationshipId.java
new file mode 100644
index 0000000000..6668b0d211
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/dao/pojo/ItemUuidAndRelationshipId.java
@@ -0,0 +1,37 @@
+/**
+ * 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/
+ */
+package org.dspace.content.dao.pojo;
+
+import java.util.UUID;
+
+import org.dspace.content.Relationship;
+import org.dspace.content.dao.RelationshipDAO;
+import org.springframework.lang.NonNull;
+
+/**
+ * Used by {@link RelationshipDAO#findByLatestItemAndRelationshipType} to avoid creating {@link Relationship}s.
+ */
+public class ItemUuidAndRelationshipId {
+
+    private final UUID itemUuid;
+    private final int relationshipId;
+
+    public ItemUuidAndRelationshipId(@NonNull UUID itemUuid, @NonNull int relationshipId) {
+        this.itemUuid = itemUuid;
+        this.relationshipId = relationshipId;
+    }
+
+    public UUID getItemUuid() {
+        return this.itemUuid;
+    }
+
+    public int getRelationshipId() {
+        return this.relationshipId;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java b/dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java
index c0649e9ea2..490c3949ea 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java
@@ -7,7 +7,8 @@
  */
 package org.dspace.content.logic;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 
@@ -21,7 +22,7 @@ import org.dspace.core.Context;
  */
 public class DefaultFilter implements Filter {
     private LogicalStatement statement;
-    private static Logger log = Logger.getLogger(Filter.class);
+    private final static Logger log = LogManager.getLogger();
 
     /**
      * Set statement from Spring configuration in item-filters.xml
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java
index 7a87e13066..0202243265 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java
@@ -12,7 +12,6 @@ import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
-import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.logic.LogicalStatementException;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.ItemService;
@@ -32,10 +31,10 @@ public abstract class AbstractCondition implements Condition {
     private Map<String, Object> parameters;
 
     // Declare and instantiate spring services
-    //@Autowired(required = true)
-    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    //@Autowired(required = true)
-    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
+    @Autowired(required = true)
+    protected ItemService itemService;
+    @Autowired(required = true)
+    protected CollectionService collectionService;
     @Autowired(required = true)
     protected HandleService handleService;
 
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java
index b9c1d15d2a..9f588f9c3b 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java
@@ -10,7 +10,8 @@ package org.dspace.content.logic.condition;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
@@ -26,7 +27,7 @@ import org.dspace.core.Context;
  * @version $Revision$
  */
 public class InCommunityCondition extends AbstractCondition {
-    private static Logger log = Logger.getLogger(InCommunityCondition.class);
+    private final static Logger log = LogManager.getLogger();
 
     /**
      * Return true if item is in one of the specified collections
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java
index 6475ef09e2..6424e6f35f 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java
@@ -7,7 +7,8 @@
  */
 package org.dspace.content.logic.condition;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.content.logic.LogicalStatementException;
 import org.dspace.core.Context;
@@ -19,7 +20,7 @@ import org.dspace.core.Context;
  * @version $Revision$
  */
 public class IsWithdrawnCondition extends AbstractCondition {
-    private static Logger log = Logger.getLogger(IsWithdrawnCondition.class);
+    private final static Logger log = LogManager.getLogger();
 
     /**
      * Return true if item is withdrawn
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java
index d9c774485a..4e30c75a2a 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java
@@ -11,7 +11,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.logic.LogicalStatementException;
@@ -26,7 +27,7 @@ import org.dspace.core.Context;
  */
 public class MetadataValueMatchCondition extends AbstractCondition {
 
-    private static Logger log = Logger.getLogger(MetadataValueMatchCondition.class);
+    private final static Logger log = LogManager.getLogger();
 
     /**
      * Return true if any value for a specified field in the item matches a specified regex pattern
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java
index df9cbfbf1d..74ccfa4ca8 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java
@@ -11,7 +11,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.logic.LogicalStatementException;
@@ -26,7 +27,7 @@ import org.dspace.core.Context;
  */
 public class MetadataValuesMatchCondition extends AbstractCondition {
 
-    private static Logger log = Logger.getLogger(MetadataValuesMatchCondition.class);
+    private final static Logger log = LogManager.getLogger();
 
     /**
      * Return true if any value for a specified field in the item matches any of the specified regex patterns
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java
index e76772803c..65f9925222 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java
@@ -10,7 +10,8 @@ package org.dspace.content.logic.condition;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
@@ -27,7 +28,7 @@ import org.dspace.core.Context;
  * @version $Revision$
  */
 public class ReadableByGroupCondition extends AbstractCondition {
-    private static Logger log = Logger.getLogger(ReadableByGroupCondition.class);
+    private final static Logger log = LogManager.getLogger();
 
     // Authorize service
     AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java b/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java
index 471b9ba27c..685fd9000d 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java
@@ -14,9 +14,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URLEncoder;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -83,10 +81,10 @@ import org.dspace.license.factory.LicenseServiceFactory;
 import org.dspace.license.service.CreativeCommonsService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 
 /**
  * Base class for disseminator of
@@ -328,45 +326,43 @@ public abstract class AbstractMETSDisseminator
         Mets manifest = makeManifest(context, dso, params, extraStreams);
 
         // copy extra (metadata, license, etc) bitstreams into zip, update manifest
-        if (extraStreams != null) {
-            for (Map.Entry<MdRef, InputStream> ment : extraStreams.getMap().entrySet()) {
-                MdRef ref = ment.getKey();
+        for (Map.Entry<MdRef, InputStream> ment : extraStreams.getMap().entrySet()) {
+            MdRef ref = ment.getKey();
 
-                // Both Deposit Licenses & CC Licenses which are referenced as "extra streams" may already be
-                // included in our Package (if their bundles are already included in the <filSec> section of manifest).
-                // So, do a special check to see if we need to link up extra License <mdRef> entries to the bitstream
-                // in the <fileSec>.
-                // (this ensures that we don't accidentally add the same License file to our package twice)
-                linkLicenseRefsToBitstreams(context, params, dso, ref);
+            // Both Deposit Licenses & CC Licenses which are referenced as "extra streams" may already be
+            // included in our Package (if their bundles are already included in the <filSec> section of manifest).
+            // So, do a special check to see if we need to link up extra License <mdRef> entries to the bitstream
+            // in the <fileSec>.
+            // (this ensures that we don't accidentally add the same License file to our package twice)
+            linkLicenseRefsToBitstreams(context, params, dso, ref);
 
-                //If this 'mdRef' is NOT already linked up to a file in the package,
-                // then its file must be missing.  So, we are going to add a new
-                // file to the Zip package.
-                if (ref.getXlinkHref() == null || ref.getXlinkHref().isEmpty()) {
-                    InputStream is = ment.getValue();
+            //If this 'mdRef' is NOT already linked up to a file in the package,
+            // then its file must be missing.  So, we are going to add a new
+            // file to the Zip package.
+            if (ref.getXlinkHref() == null || ref.getXlinkHref().isEmpty()) {
+                InputStream is = ment.getValue();
 
-                    // create a hopefully unique filename within the Zip
-                    String fname = gensym("metadata");
-                    // link up this 'mdRef' to point to that file
-                    ref.setXlinkHref(fname);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Writing EXTRA stream to Zip: " + fname);
-                    }
-                    //actually add the file to the Zip package
-                    ZipEntry ze = new ZipEntry(fname);
-                    if (lmTime != 0) {
-                        ze.setTime(lmTime);
-                    } else {
-                        // Set a default modified date so that checksum of Zip doesn't change if Zip contents are
-                        // unchanged
-                        ze.setTime(DEFAULT_MODIFIED_DATE);
-                    }
-                    zip.putNextEntry(ze);
-                    Utils.copy(is, zip);
-                    zip.closeEntry();
-
-                    is.close();
+                // create a hopefully unique filename within the Zip
+                String fname = gensym("metadata");
+                // link up this 'mdRef' to point to that file
+                ref.setXlinkHref(fname);
+                if (log.isDebugEnabled()) {
+                    log.debug("Writing EXTRA stream to Zip: " + fname);
                 }
+                //actually add the file to the Zip package
+                ZipEntry ze = new ZipEntry(fname);
+                if (lmTime != 0) {
+                    ze.setTime(lmTime);
+                } else {
+                    // Set a default modified date so that checksum of Zip doesn't change if Zip contents are
+                    // unchanged
+                    ze.setTime(DEFAULT_MODIFIED_DATE);
+                }
+                zip.putNextEntry(ze);
+                Utils.copy(is, zip);
+                zip.closeEntry();
+
+                is.close();
             }
         }
 
@@ -467,17 +463,17 @@ public abstract class AbstractMETSDisseminator
                                 Utils.copy(input, zip);
                                 input.close();
                             } else {
-                                log.warn("Adding zero-length file for Bitstream, SID="
-                                             + String.valueOf(bitstream.getSequenceID())
+                                log.warn("Adding zero-length file for Bitstream, uuid="
+                                             + String.valueOf(bitstream.getID())
                                              + ", not authorized for READ.");
                             }
                             zip.closeEntry();
                         } else if (unauth != null && unauth.equalsIgnoreCase("skip")) {
-                            log.warn("Skipping Bitstream, SID=" + String
-                                .valueOf(bitstream.getSequenceID()) + ", not authorized for READ.");
+                            log.warn("Skipping Bitstream, uuid=" + String
+                                .valueOf(bitstream.getID()) + ", not authorized for READ.");
                         } else {
                             throw new AuthorizeException(
-                                "Not authorized to read Bitstream, SID=" + String.valueOf(bitstream.getSequenceID()));
+                                "Not authorized to read Bitstream, uuid=" + String.valueOf(bitstream.getID()));
                         }
                     }
                 }
@@ -898,12 +894,12 @@ public abstract class AbstractMETSDisseminator
                             continue;
                         } else if (!(unauth != null && unauth.equalsIgnoreCase("zero"))) {
                             throw new AuthorizeException(
-                                "Not authorized to read Bitstream, SID=" + String.valueOf(bitstream.getSequenceID()));
+                                "Not authorized to read Bitstream, uuid=" + String.valueOf(bitstream.getID()));
                         }
                     }
 
-                    String sid = String.valueOf(bitstream.getSequenceID());
-                    String fileID = bitstreamIDstart + sid;
+                    String uuid = String.valueOf(bitstream.getID());
+                    String fileID = bitstreamIDstart + uuid;
                     edu.harvard.hul.ois.mets.File file = new edu.harvard.hul.ois.mets.File();
                     file.setID(fileID);
                     file.setSEQ(bitstream.getSequenceID());
@@ -926,7 +922,7 @@ public abstract class AbstractMETSDisseminator
                      * extracted text or a thumbnail, so we use the name to work
                      * out which bitstream to be in the same group as
                      */
-                    String groupID = "GROUP_" + bitstreamIDstart + sid;
+                    String groupID = "GROUP_" + bitstreamIDstart + uuid;
                     if ((bundle.getName() != null)
                         && (bundle.getName().equals("THUMBNAIL") ||
                         bundle.getName().startsWith("TEXT"))) {
@@ -936,7 +932,7 @@ public abstract class AbstractMETSDisseminator
                                                                    bitstream);
                         if (original != null) {
                             groupID = "GROUP_" + bitstreamIDstart
-                                + original.getSequenceID();
+                                + String.valueOf(original.getID());
                         }
                     }
                     file.setGROUPID(groupID);
@@ -1405,7 +1401,7 @@ public abstract class AbstractMETSDisseminator
         // if bare manifest, use external "persistent" URI for bitstreams
         if (params != null && (params.getBooleanProperty("manifestOnly", false))) {
             // Try to build a persistent(-ish) URI for bitstream
-            // Format: {site-base-url}/bitstream/{item-handle}/{sequence-id}/{bitstream-name}
+            // Format: {site-ui-url}/bitstreams/{bitstream-uuid}
             try {
                 // get handle of parent Item of this bitstream, if there is one:
                 String handle = null;
@@ -1416,26 +1412,13 @@ public abstract class AbstractMETSDisseminator
                         handle = bi.get(0).getHandle();
                     }
                 }
-                if (handle != null) {
-                    return configurationService
-                        .getProperty("dspace.ui.url")
-                        + "/bitstream/"
-                        + handle
-                        + "/"
-                        + String.valueOf(bitstream.getSequenceID())
-                        + "/"
-                        + URLEncoder.encode(bitstream.getName(), "UTF-8");
-                } else {   //no Handle assigned, so persistent(-ish) URI for bitstream is
-                    // Format: {site-base-url}/retrieve/{bitstream-internal-id}
-                    return configurationService
-                        .getProperty("dspace.ui.url")
-                        + "/retrieve/"
-                        + String.valueOf(bitstream.getID());
-                }
+                return configurationService
+                    .getProperty("dspace.ui.url")
+                    + "/bitstreams/"
+                    + String.valueOf(bitstream.getID())
+                    + "/download";
             } catch (SQLException e) {
                 log.error("Database problem", e);
-            } catch (UnsupportedEncodingException e) {
-                log.error("Unknown character set", e);
             }
 
             // We should only get here if we failed to build a nice URL above
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java b/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java
index 9a7fffdec5..98277c4f9c 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java
@@ -51,7 +51,7 @@ import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.workflow.WorkflowException;
 import org.dspace.workflow.factory.WorkflowServiceFactory;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * Base class for package ingester of METS (Metadata Encoding and Transmission
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/DSpaceAIPIngester.java b/dspace-api/src/main/java/org/dspace/content/packager/DSpaceAIPIngester.java
index 954a68bfc1..e7be7ab511 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/DSpaceAIPIngester.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/DSpaceAIPIngester.java
@@ -20,7 +20,7 @@ import org.dspace.content.crosswalk.CrosswalkException;
 import org.dspace.content.crosswalk.MetadataValidationException;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * Subclass of the METS packager framework to ingest a DSpace
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSIngester.java b/dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSIngester.java
index da3965534f..380764268c 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSIngester.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSIngester.java
@@ -23,7 +23,7 @@ import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.core.service.PluginService;
-import org.jdom.Element;
+import org.jdom2.Element;
 
 /**
  * Packager plugin to ingest a
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java b/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
index 8fb8172aeb..3399bdf0f0 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
@@ -35,15 +35,17 @@ import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Content;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
-import org.jdom.xpath.XPath;
+import org.jdom2.Content;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
 
 /**
  * <P>
@@ -382,15 +384,12 @@ public class METSManifest {
     public List getMdFiles()
         throws MetadataValidationException {
         if (mdFiles == null) {
-            try {
-                // Use a special namespace with known prefix
-                // so we get the right prefix.
-                XPath xpath = XPath.newInstance("descendant::mets:mdRef");
-                xpath.addNamespace(metsNS);
-                mdFiles = xpath.selectNodes(mets);
-            } catch (JDOMException je) {
-                throw new MetadataValidationException("Failed while searching for mdRef elements in manifest: ", je);
-            }
+            // Use a special namespace with known prefix
+            // so we get the right prefix.
+            XPathExpression<Element> xpath =
+                XPathFactory.instance()
+                            .compile("descendant::mets:mdRef", Filters.element(), null, metsNS);
+            mdFiles = xpath.evaluate(mets);
         }
         return mdFiles;
     }
@@ -414,25 +413,22 @@ public class METSManifest {
             return null;
         }
 
-        try {
-            XPath xpath = XPath.newInstance(
-                "mets:fileSec/mets:fileGrp[@USE=\"CONTENT\"]/mets:file[@GROUPID=\"" + groupID + "\"]");
-            xpath.addNamespace(metsNS);
-            List oFiles = xpath.selectNodes(mets);
-            if (oFiles.size() > 0) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Got ORIGINAL file for derived=" + file.toString());
-                }
-                Element flocat = ((Element) oFiles.get(0)).getChild("FLocat", metsNS);
-                if (flocat != null) {
-                    return flocat.getAttributeValue("href", xlinkNS);
-                }
+        XPathExpression<Element> xpath =
+            XPathFactory.instance()
+                        .compile(
+                            "mets:fileSec/mets:fileGrp[@USE=\"CONTENT\"]/mets:file[@GROUPID=\"" + groupID + "\"]",
+                            Filters.element(), null, metsNS);
+        List<Element> oFiles = xpath.evaluate(mets);
+        if (oFiles.size() > 0) {
+            if (log.isDebugEnabled()) {
+                log.debug("Got ORIGINAL file for derived=" + file.toString());
+            }
+            Element flocat = oFiles.get(0).getChild("FLocat", metsNS);
+            if (flocat != null) {
+                return flocat.getAttributeValue("href", xlinkNS);
             }
-            return null;
-        } catch (JDOMException je) {
-            log.warn("Got exception on XPATH looking for Original file, " + je.toString());
-            return null;
         }
+        return null;
     }
 
     // translate bundle name from METS to DSpace; METS may be "CONTENT"
@@ -888,20 +884,16 @@ public class METSManifest {
     // use only when path varies each time you call it.
     protected Element getElementByXPath(String path, boolean nullOk)
         throws MetadataValidationException {
-        try {
-            XPath xpath = XPath.newInstance(path);
-            xpath.addNamespace(metsNS);
-            xpath.addNamespace(xlinkNS);
-            Object result = xpath.selectSingleNode(mets);
-            if (result == null && nullOk) {
-                return null;
-            } else if (result instanceof Element) {
-                return (Element) result;
-            } else {
-                throw new MetadataValidationException("METSManifest: Failed to resolve XPath, path=\"" + path + "\"");
-            }
-        } catch (JDOMException je) {
-            throw new MetadataValidationException("METSManifest: Failed to resolve XPath, path=\"" + path + "\"", je);
+        XPathExpression<Element> xpath =
+            XPathFactory.instance()
+                        .compile(path, Filters.element(), null, metsNS, xlinkNS);
+        Element result = xpath.evaluateFirst(mets);
+        if (result == null && nullOk) {
+            return null;
+        } else if (result == null && !nullOk) {
+            throw new MetadataValidationException("METSManifest: Failed to resolve XPath, path=\"" + path + "\"");
+        } else {
+            return result;
         }
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java b/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java
index 8643f60f6c..f627779af8 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java
@@ -35,7 +35,7 @@ import org.dspace.eperson.PasswordHash;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
-import org.jdom.Namespace;
+import org.jdom2.Namespace;
 
 /**
  * Plugin to export all Group and EPerson objects in XML, perhaps for reloading.
diff --git a/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java b/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
index 522bdac224..a5b2b7d8d8 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
@@ -33,6 +33,11 @@ import org.dspace.eperson.Group;
 public interface CollectionService
         extends DSpaceObjectService<Collection>, DSpaceObjectLegacySupportService<Collection> {
 
+    /*
+     * Field used to sort community and collection lists at solr
+     */
+    public static final String SOLR_SORT_FIELD = "dc.title_sort";
+
     /**
      * Create a new collection with a new ID.
      * Once created the collection is added to the given community
@@ -46,7 +51,6 @@ public interface CollectionService
     public Collection create(Context context, Community community) throws SQLException,
         AuthorizeException;
 
-
     /**
      * Create a new collection with the supplied handle and with a new ID.
      * Once created the collection is added to the given community
diff --git a/dspace-api/src/main/java/org/dspace/content/service/ItemService.java b/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
index d5e2f67767..8b7badf223 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
@@ -21,6 +21,7 @@ import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
+import org.dspace.content.EntityType;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataValue;
@@ -111,8 +112,22 @@ public interface ItemService
      * @return an iterator over the items in the archive.
      * @throws SQLException if database error
      */
+    @Deprecated
     public Iterator<Item> findAllUnfiltered(Context context) throws SQLException;
 
+    /**
+     * Find all items that are:
+     * - NOT in the workspace
+     * - NOT in the workflow
+     * - NOT a template item for e.g. a collection
+     *
+     * This implies that the result also contains older versions of items and withdrawn items.
+     * @param context the DSpace context.
+     * @return iterator over all regular items.
+     * @throws SQLException if database error.
+     */
+    public Iterator<Item> findAllRegularItems(Context context) throws SQLException;
+
     /**
      * Find all the items in the archive by a given submitter. The order is
      * indeterminate. Only items with the "in archive" flag set are included.
@@ -579,6 +594,37 @@ public interface ItemService
      */
     public boolean canCreateNewVersion(Context context, Item item) throws SQLException;
 
+    /**
+     * Returns an iterator of in archive items possessing the passed metadata field, or only
+     * those matching the passed value, if value is not Item.ANY
+     *
+     * @param context   DSpace context object
+     * @param schema    metadata field schema
+     * @param element   metadata field element
+     * @param qualifier metadata field qualifier
+     * @param value     field value or Item.ANY to match any value
+     * @return an iterator over the items matching that authority value
+     * @throws SQLException       if database error
+     * @throws AuthorizeException if authorization error
+     */
+    public Iterator<Item> findArchivedByMetadataField(Context context, String schema,
+                                                      String element, String qualifier,
+                                                      String value) throws SQLException, AuthorizeException;
+
+    /**
+     * Returns an iterator of in archive items possessing the passed metadata field, or only
+     * those matching the passed value, if value is not Item.ANY
+     *
+     * @param context   DSpace context object
+     * @param metadataField    metadata
+     * @param value     field value or Item.ANY to match any value
+     * @return an iterator over the items matching that authority value
+     * @throws SQLException       if database error
+     * @throws AuthorizeException if authorization error
+     */
+    public Iterator<Item> findArchivedByMetadataField(Context context, String metadataField, String value)
+            throws SQLException, AuthorizeException;
+
     /**
      * Returns an iterator of Items possessing the passed metadata field, or only
      * those matching the passed value, if value is not Item.ANY
@@ -618,7 +664,7 @@ public interface ItemService
      */
     public Iterator<Item> findByAuthorityValue(Context context,
                                                String schema, String element, String qualifier, String value)
-        throws SQLException, AuthorizeException, IOException;
+        throws SQLException, AuthorizeException;
 
 
     public Iterator<Item> findByMetadataFieldAuthority(Context context, String mdString, String authority)
@@ -783,4 +829,19 @@ public interface ItemService
     public List<MetadataValue> getMetadata(Item item, String schema, String element, String qualifier,
                                            String lang, boolean enableVirtualMetadata);
 
+    /**
+     * Retrieve the label of the entity type of the given item.
+     * @param item the item.
+     * @return the label of the entity type, taken from the item metadata, or null if not found.
+     */
+    public String getEntityTypeLabel(Item item);
+
+    /**
+     * Retrieve the entity type of the given item.
+     * @param context the DSpace context.
+     * @param item the item.
+     * @return the entity type of the given item, or null if not found.
+     */
+    public EntityType getEntityType(Context context, Item item) throws SQLException;
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java b/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
index 2e0bb6f2be..719f966e46 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
@@ -14,7 +14,9 @@ import java.util.UUID;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.content.Relationship;
+import org.dspace.content.Relationship.LatestVersionStatus;
 import org.dspace.content.RelationshipType;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.core.Context;
 import org.dspace.service.DSpaceCRUDService;
 
@@ -49,6 +51,25 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
     List<Relationship> findByItem(Context context, Item item, Integer limit, Integer offset, boolean excludeTilted)
             throws SQLException;
 
+    /**
+     * Retrieves the list of Relationships currently in the system for which the given Item is either
+     * a leftItem or a rightItem object
+     * @param context           The relevant DSpace context
+     * @param item              The Item that has to be the left or right item for the relationship to be
+     *                          included in the list
+     * @param limit             paging limit
+     * @param offset            paging offset
+     * @param excludeTilted     If true, excludes tilted relationships
+     * @param excludeNonLatest  If true, excludes all relationships for which the other item has a more recent version
+     *                          that is relevant for this relationship
+     * @return                  The list of relationships for which each relationship adheres to the above
+     *                          listed constraint
+     * @throws SQLException     If something goes wrong
+     */
+    List<Relationship> findByItem(
+        Context context, Item item, Integer limit, Integer offset, boolean excludeTilted, boolean excludeNonLatest
+    ) throws SQLException;
+
     /**
      * Retrieves the full list of relationships currently in the system
      * @param context   The relevant DSpace context
@@ -79,30 +100,54 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
     public Relationship create(Context context, Relationship relationship) throws SQLException, AuthorizeException;
 
     /**
-     * This method returns the next leftplace integer to use for a relationship with this item as the leftItem
+     * Move the given relationship to a new leftPlace and/or rightPlace.
      *
-     * @param context   The relevant DSpace context
-     * @param item      The item that has to be the leftItem of a relationship for it to qualify
-     * @return          The next integer to be used for the leftplace of a relationship with the given item
-     *                  as a left item
-     * @throws SQLException If something goes wrong
+     * This will
+     *   1. verify whether the move is authorized
+     *   2. move the relationship to the specified left/right place
+     *   3. update the left/right place of other relationships and/or metadata in order to resolve the move without
+     *      leaving any gaps
+     *
+     * At least one of the new places should be non-null, otherwise no changes will be made.
+     *
+     * @param context               The relevant DSpace context
+     * @param relationship          The Relationship to move
+     * @param newLeftPlace          The value to set the leftPlace of this Relationship to
+     * @param newRightPlace         The value to set the rightPlace of this Relationship to
+     * @return                      The moved relationship with updated place variables
+     * @throws SQLException         If something goes wrong
+     * @throws AuthorizeException   If the user is not authorized to update the Relationship or its Items
      */
-    int findNextLeftPlaceByLeftItem(Context context, Item item) throws SQLException;
+    Relationship move(Context context, Relationship relationship, Integer newLeftPlace, Integer newRightPlace)
+            throws SQLException, AuthorizeException;
 
     /**
-     * This method returns the next rightplace integer to use for a relationship with this item as the rightItem
+     * Move the given relationship to a new leftItem and/or rightItem.
      *
-     * @param context   The relevant DSpace context
-     * @param item      The item that has to be the rightitem of a relationship for it to qualify
-     * @return          The next integer to be used for the rightplace of a relationship with the given item
-     *                  as a right item
-     * @throws SQLException If something goes wrong
+     * This will
+     *   1. move the relationship to the last place in its current left or right Item. This ensures that we don't leave
+     *      any gaps when moving the relationship to a new Item.
+     *      If only one of the relationship's Items is changed,the order of relationships and metadatain the other
+     *      will not be affected
+     *   2. insert the relationship into the new Item(s)
+     *
+     * At least one of the new Items should be non-null, otherwise no changes will be made.
+     *
+     * @param context               The relevant DSpace context
+     * @param relationship          The Relationship to move
+     * @param newLeftItem           The value to set the leftItem of this Relationship to
+     * @param newRightItem          The value to set the rightItem of this Relationship to
+     * @return                      The moved relationship with updated left/right Items variables
+     * @throws SQLException         If something goes wrong
+     * @throws AuthorizeException   If the user is not authorized to update the Relationship or its Items
      */
-    int findNextRightPlaceByRightItem(Context context, Item item) throws SQLException;
+    Relationship move(Context context, Relationship relationship, Item newLeftItem, Item newRightItem)
+            throws SQLException, AuthorizeException;
 
     /**
      * This method returns a list of Relationships for which the leftItem or rightItem is equal to the given
      * Item object and for which the RelationshipType object is equal to the relationshipType property
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
      * @param context           The relevant DSpace context
      * @param item              The Item object to be matched on the leftItem or rightItem for the relationship
      * @param relationshipType  The RelationshipType object that will be used to check the Relationship on
@@ -117,6 +162,7 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
     /**
      * This method returns a list of Relationships for which the leftItem or rightItem is equal to the given
      * Item object and for which the RelationshipType object is equal to the relationshipType property
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
      * @param context           The relevant DSpace context
      * @param item              The Item object to be matched on the leftItem or rightItem for the relationship
      * @param relationshipType  The RelationshipType object that will be used to check the Relationship on
@@ -131,6 +177,24 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
     /**
      * This method returns a list of Relationships for which the leftItem or rightItem is equal to the given
      * Item object and for which the RelationshipType object is equal to the relationshipType property
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
+     * @param context           The relevant DSpace context
+     * @param item              The Item object to be matched on the leftItem or rightItem for the relationship
+     * @param relationshipType  The RelationshipType object that will be used to check the Relationship on
+     * @param excludeNonLatest  If true, excludes all relationships for which the other item has a more recent version
+     *                          that is relevant for this relationship
+     * @return  The list of Relationship objects that have the given Item object as leftItem or rightItem and
+     *          for which the relationshipType property is equal to the given RelationshipType
+     * @throws SQLException If something goes wrong
+     */
+    public List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, int limit, int offset, boolean excludeNonLatest
+    ) throws SQLException;
+
+    /**
+     * This method returns a list of Relationships for which the leftItem or rightItem is equal to the given
+     * Item object and for which the RelationshipType object is equal to the relationshipType property
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
      * @param context           The relevant DSpace context
      * @param item              The Item object to be matched on the leftItem or rightItem for the relationship
      * @param relationshipType  The RelationshipType object that will be used to check the Relationship on
@@ -145,17 +209,51 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
             throws SQLException;
 
     /**
-     * This method will update the place for the Relationship and all other relationships found by the items and
-     * relationship type of the given Relationship. It will give this Relationship the last place in both the
-     * left and right place determined by querying for the list of leftRelationships and rightRelationships
-     * by the leftItem, rightItem and relationshipType of the given Relationship.
-     * @param context           The relevant DSpace context
-     * @param relationship      The Relationship object that will have it's place updated and that will be used
-     *                          to retrieve the other relationships whose place might need to be updated
-     * @throws SQLException     If something goes wrong
+     * This method returns a list of Relationships for which the leftItem or rightItem is equal to the given
+     * Item object and for which the RelationshipType object is equal to the relationshipType property
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
+     * @param context            The relevant DSpace context
+     * @param item               The Item object to be matched on the leftItem or rightItem for the relationship
+     * @param relationshipType   The RelationshipType object that will be used to check the Relationship on
+     * @param isLeft             Is the item left or right
+     * @param excludeNonLatest   If true, excludes all relationships for which the other item has a more recent version
+     *                           that is relevant for this relationship
+     * @return  The list of Relationship objects that have the given Item object as leftItem or rightItem and
+     *          for which the relationshipType property is equal to the given RelationshipType
+     * @throws SQLException If something goes wrong
      */
-    public void updatePlaceInRelationship(Context context, Relationship relationship)
-            throws SQLException, AuthorizeException;
+    public List<Relationship> findByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, int limit, int offset,
+        boolean excludeNonLatest
+    ) throws SQLException;
+
+    /**
+     * This method returns the UUIDs of all items that have a relationship with the given item, from the perspective
+     * of the other item. In other words, given a relationship with the given item, the given item should have
+     * "latest status" in order for the other item uuid to be returned.
+     *
+     * This method differs from the "excludeNonLatest" property in other methods,
+     * because in this method the current item should have "latest status" to return the other item,
+     * whereas with "excludeNonLatest" the other item should have "latest status" to be returned.
+     *
+     * This method is used to index items in solr; when searching for related items of one of the returned uuids,
+     * the given item should appear as a search result.
+     *
+     * NOTE: This method does not return {@link Relationship}s for performance, because doing so would eagerly fetch
+     *       the items on both sides, which is unnecessary.
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type.
+     * @param context the DSpace context.
+     * @param latestItem the target item; only relationships where this item has "latest status" should be considered.
+     * @param relationshipType the relationship type for which relationships should be selected.
+     * @param isLeft whether the entity type of the item occurs on the left or right side of the relationship type.
+     *               This is redundant in most cases, but necessary because relationship types my have
+     *               the same entity type on both sides.
+     * @return a list containing pairs of relationship ids and item uuids.
+     * @throws SQLException if something goes wrong.
+     */
+    public List<ItemUuidAndRelationshipId> findByLatestItemAndRelationshipType(
+        Context context, Item latestItem, RelationshipType relationshipType, boolean isLeft
+    ) throws SQLException;
 
     /**
      * This method will update the given item's metadata order.
@@ -174,6 +272,7 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
     /**
      * This method returns a list of Relationship objects for which the relationshipType property is equal to the given
      * RelationshipType object
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
      * @param context           The relevant DSpace context
      * @param relationshipType  The RelationshipType object that will be used to check the Relationship on
      * @return  The list of Relationship objects for which the given RelationshipType object is equal
@@ -185,6 +284,7 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
     /**
      * This method returns a list of Relationship objets for which the relationshipType property is equal to the given
      * RelationshipType object
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
      * @param context           The relevant DSpace context
      * @param relationshipType  The RelationshipType object that will be used to check the Relationship on
      * @param limit             paging limit
@@ -198,6 +298,27 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
 
     /**
      * This method is used to construct a Relationship object with all it's variables
+     * @param c                   The relevant DSpace context
+     * @param leftItem            The leftItem Item object for the relationship
+     * @param rightItem           The rightItem Item object for the relationship
+     * @param relationshipType    The RelationshipType object for the relationship
+     * @param leftPlace           The leftPlace integer for the relationship
+     * @param rightPlace          The rightPlace integer for the relationship
+     * @param leftwardValue       The leftwardValue string for the relationship
+     * @param rightwardValue      The rightwardValue string for the relationship
+     * @param latestVersionStatus The latestVersionStatus value for the relationship
+     * @return                    The created Relationship object with the given properties
+     * @throws AuthorizeException   If something goes wrong
+     * @throws SQLException         If something goes wrong
+     */
+    Relationship create(
+        Context c, Item leftItem, Item rightItem, RelationshipType relationshipType, int leftPlace, int rightPlace,
+        String leftwardValue, String rightwardValue, LatestVersionStatus latestVersionStatus
+    ) throws AuthorizeException, SQLException;
+
+    /**
+     * This method is used to construct a Relationship object with all it's variables,
+     * except the latest version status
      * @param c                 The relevant DSpace context
      * @param leftItem          The leftItem Item object for the relationship
      * @param rightItem         The rightItem Item object for the relationship
@@ -210,14 +331,15 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
      * @throws AuthorizeException   If something goes wrong
      * @throws SQLException         If something goes wrong
      */
-    Relationship create(Context c, Item leftItem, Item rightItem, RelationshipType relationshipType,
-                        int leftPlace, int rightPlace, String leftwardValue, String rightwardValue)
-        throws AuthorizeException, SQLException;
+    Relationship create(
+        Context c, Item leftItem, Item rightItem, RelationshipType relationshipType, int leftPlace, int rightPlace,
+        String leftwardValue, String rightwardValue
+    ) throws AuthorizeException, SQLException;
 
 
     /**
      * This method is used to construct a Relationship object with all it's variables,
-     * except the leftward and rightward labels
+     * except the leftward label, rightward label and latest version status
      * @param c                 The relevant DSpace context
      * @param leftItem          The leftItem Item object for the relationship
      * @param rightItem         The rightItem Item object for the relationship
@@ -267,7 +389,7 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
 
     /**
      * Count total number of relationships (rows in relationship table) by a relationship type
-     *
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
      * @param context context
      * @param relationshipType relationship type to filter by
      * @return total count
@@ -287,10 +409,25 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
      */
     int countByItem(Context context, Item item) throws SQLException;
 
+    /**
+     * This method returns a count of Relationship objects that have the given Item object
+     * as a leftItem or a rightItem
+     * @param context           The relevant DSpace context
+     * @param item              The item that should be either a leftItem or a rightItem of all
+     *                          the Relationship objects in the returned list
+     * @param excludeTilted     if true, excludes tilted relationships
+     * @param excludeNonLatest  if true, exclude relationships for which the opposite item is not the latest version
+     *                          that is relevant
+     * @return          The list of Relationship objects that contain either a left or a
+     *                  right item that is equal to the given item
+     * @throws SQLException If something goes wrong
+     */
+    int countByItem(Context context, Item item, boolean excludeTilted, boolean excludeNonLatest) throws SQLException;
+
     /**
      * Count total number of relationships (rows in relationship table) by a relationship type and a boolean indicating
      * whether the relationship should contain the item on the left side or not
-     *
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
      * @param context context
      * @param relationshipType relationship type to filter by
      * @param isLeft Indicating whether the counted Relationships should have the given Item on the left side or not
@@ -300,6 +437,22 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
     int countByItemAndRelationshipType(Context context, Item item, RelationshipType relationshipType, boolean isLeft)
             throws SQLException;
 
+    /**
+     * Count total number of relationships (rows in relationship table) by a relationship type and a boolean indicating
+     * whether the relationship should contain the item on the left side or not
+     * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
+     * @param context           context
+     * @param relationshipType  relationship type to filter by
+     * @param isLeft            Indicating whether the counted Relationships should have the given Item on the left side
+     * @param excludeNonLatest  If true, excludes all relationships for which the other item has a more recent version
+     *                          that is relevant for this relationship
+     * @return total count with the given parameters
+     * @throws SQLException if database error
+     */
+    int countByItemAndRelationshipType(
+        Context context, Item item, RelationshipType relationshipType, boolean isLeft, boolean excludeNonLatest
+    ) throws SQLException;
+
     /**
      * Count total number of relationships (rows in relationship table)
      * by a relationship leftward or rightward typeName
diff --git a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
index 34a04056ce..32ad747d76 100644
--- a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
+++ b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
@@ -155,12 +155,11 @@ public abstract class AbstractHibernateDAO<T> implements GenericDAO<T> {
      * @return A list of distinct results as depicted by the CriteriaQuery and parameters
      * @throws SQLException
      */
-    public List<T> list(Context context, CriteriaQuery criteriaQuery, boolean cacheable, Class<T> clazz, int maxResults,
-                        int offset) throws SQLException {
+    public List<T> list(
+        Context context, CriteriaQuery<T> criteriaQuery, boolean cacheable, Class<T> clazz, int maxResults, int offset
+    ) throws SQLException {
         criteriaQuery.distinct(true);
-        @SuppressWarnings("unchecked")
-        List<T> result = (List<T>) executeCriteriaQuery(context, criteriaQuery, cacheable, maxResults, offset);
-        return result;
+        return executeCriteriaQuery(context, criteriaQuery, cacheable, maxResults, offset);
     }
 
     /**
@@ -183,12 +182,12 @@ public abstract class AbstractHibernateDAO<T> implements GenericDAO<T> {
      * @return A list of results determined by the CriteriaQuery and parameters
      * @throws SQLException
      */
-    public List<T> list(Context context, CriteriaQuery criteriaQuery, boolean cacheable, Class<T> clazz, int maxResults,
-                        int offset, boolean distinct) throws SQLException {
+    public List<T> list(
+        Context context, CriteriaQuery<T> criteriaQuery, boolean cacheable, Class<T> clazz, int maxResults, int offset,
+        boolean distinct
+    ) throws SQLException {
         criteriaQuery.distinct(distinct);
-        @SuppressWarnings("unchecked")
-        List<T> result = (List<T>) executeCriteriaQuery(context, criteriaQuery, cacheable, maxResults, offset);
-        return result;
+        return executeCriteriaQuery(context, criteriaQuery, cacheable, maxResults, offset);
     }
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/core/Context.java b/dspace-api/src/main/java/org/dspace/core/Context.java
index f5edcf2eb0..82b39dd2df 100644
--- a/dspace-api/src/main/java/org/dspace/core/Context.java
+++ b/dspace-api/src/main/java/org/dspace/core/Context.java
@@ -10,6 +10,7 @@ package org.dspace.core;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Deque;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -91,12 +92,12 @@ public class Context implements AutoCloseable {
     /**
      * Group IDs of special groups user is a member of
      */
-    private List<UUID> specialGroups;
+    private Set<UUID> specialGroups;
 
     /**
      * Temporary store for the specialGroups when the current user is temporary switched
      */
-    private List<UUID> specialGroupsPreviousState;
+    private Set<UUID> specialGroupsPreviousState;
 
     /**
      * The currently used authentication method
@@ -183,7 +184,7 @@ public class Context implements AutoCloseable {
         extraLogInfo = "";
         ignoreAuth = false;
 
-        specialGroups = new ArrayList<>();
+        specialGroups = new HashSet<>();
 
         authStateChangeHistory = new ConcurrentLinkedDeque<>();
         authStateClassCallHistory = new ConcurrentLinkedDeque<>();
@@ -537,6 +538,36 @@ public class Context implements AutoCloseable {
         }
     }
 
+    /**
+     * Rollback the current transaction with the database, without persisting any
+     * pending changes. The database connection is not closed and can be reused
+     * afterwards.
+     *
+     * <b>WARNING: After calling this method all previously fetched entities are
+     * "detached" (pending changes are not tracked anymore). You have to reload all
+     * entities you still want to work with manually after this method call (see
+     * {@link Context#reloadEntity(ReloadableEntity)}).</b>
+     *
+     * @throws SQLException When rollbacking the transaction in the database fails.
+     */
+    public void rollback() throws SQLException {
+        // If Context is no longer open/valid, just note that it has already been closed
+        if (!isValid()) {
+            log.info("rollback() was called on a closed Context object. No changes to abort.");
+            return;
+        }
+
+        try {
+            // Rollback ONLY if we have a database transaction, and it is NOT Read Only
+            if (!isReadOnly() && isTransactionAlive()) {
+                dbConnection.rollback();
+                reloadContextBoundEntities();
+            }
+        } finally {
+            events = null;
+        }
+    }
+
     /**
      * Close the context, without committing any of the changes performed using
      * this context. The database connection is freed. No exception is thrown if
@@ -656,6 +687,15 @@ public class Context implements AutoCloseable {
         return myGroups;
     }
 
+    /**
+     * Get a set of all of the special groups uuids that current user is a member of.
+     *
+     * @return list of special groups uuids
+     */
+    public Set<UUID> getSpecialGroupUuids() {
+        return CollectionUtils.isEmpty(specialGroups) ? Set.of() : specialGroups;
+    }
+
     /**
      * Temporary change the user bound to the context, empty the special groups that
      * are retained to allow subsequent restore
@@ -673,12 +713,12 @@ public class Context implements AutoCloseable {
 
         currentUserPreviousState = currentUser;
         specialGroupsPreviousState = specialGroups;
-        specialGroups = new ArrayList<>();
+        specialGroups = new HashSet<>();
         currentUser = newUser;
     }
 
     /**
-     * Restore the user bound to the context and his special groups
+     * Restore the user bound to the context and their special groups
      *
      * @throws IllegalStateException if no switch was performed before
      */
@@ -904,4 +944,11 @@ public class Context implements AutoCloseable {
     public void setAuthenticationMethod(final String authenticationMethod) {
         this.authenticationMethod = authenticationMethod;
     }
+
+    /**
+     * Check if the user of the context is switched.
+     */
+    public boolean isContextUserSwitched() {
+        return currentUserPreviousState != null;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/core/Email.java b/dspace-api/src/main/java/org/dspace/core/Email.java
index c0d191caf5..64da629bcc 100644
--- a/dspace-api/src/main/java/org/dspace/core/Email.java
+++ b/dspace-api/src/main/java/org/dspace/core/Email.java
@@ -152,14 +152,14 @@ public class Email {
     private static final String RESOURCE_REPOSITORY_NAME = "Email";
     private static final Properties VELOCITY_PROPERTIES = new Properties();
     static {
-        VELOCITY_PROPERTIES.put(Velocity.RESOURCE_LOADER, "string");
-        VELOCITY_PROPERTIES.put("string.resource.loader.description",
+        VELOCITY_PROPERTIES.put(Velocity.RESOURCE_LOADERS, "string");
+        VELOCITY_PROPERTIES.put("resource.loader.string.description",
                 "Velocity StringResource loader");
-        VELOCITY_PROPERTIES.put("string.resource.loader.class",
+        VELOCITY_PROPERTIES.put("resource.loader.string.class",
                 StringResourceLoader.class.getName());
-        VELOCITY_PROPERTIES.put("string.resource.loader.repository.name",
+        VELOCITY_PROPERTIES.put("resource.loader.string.repository.name",
                 RESOURCE_REPOSITORY_NAME);
-        VELOCITY_PROPERTIES.put("string.resource.loader.repository.static",
+        VELOCITY_PROPERTIES.put("resource.loader.string.repository.static",
                 "false");
     }
 
@@ -355,7 +355,7 @@ public class Email {
         for (String headerName : config.getArrayProperty("mail.message.headers")) {
             String headerValue = (String) vctx.get(headerName);
             if ("subject".equalsIgnoreCase(headerName)) {
-                if (null != subject) {
+                if (null != headerValue) {
                     subject = headerValue;
                 }
             } else if ("charset".equalsIgnoreCase(headerName)) {
diff --git a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
index a853c3597e..0fc48b908b 100644
--- a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
+++ b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
@@ -346,7 +346,7 @@ public class I18nUtil {
             }
         }
 
-        if (fileNameL != null && !fileFound) {
+        if (!fileFound) {
             File fileTmp = new File(fileNameL + fileType);
             if (fileTmp.exists()) {
                 fileFound = true;
diff --git a/dspace-api/src/main/java/org/dspace/core/LegacyPluginServiceImpl.java b/dspace-api/src/main/java/org/dspace/core/LegacyPluginServiceImpl.java
index 7bbbd91d0a..e92ea137f3 100644
--- a/dspace-api/src/main/java/org/dspace/core/LegacyPluginServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/core/LegacyPluginServiceImpl.java
@@ -10,7 +10,6 @@ package org.dspace.core;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.Serializable;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -173,7 +172,7 @@ public class LegacyPluginServiceImpl implements PluginService {
         throws PluginInstantiationException {
         // cache of config data for Sequence Plugins; format its
         // <interface-name> -> [ <classname>.. ]  (value is Array)
-        Map<String, String[]> sequenceConfig = new HashMap<String, String[]>();
+        Map<String, String[]> sequenceConfig = new HashMap<>();
 
         // cache the configuration for this interface after grovelling it once:
         // format is  prefix.<interface> = <classname>
@@ -220,10 +219,7 @@ public class LegacyPluginServiceImpl implements PluginService {
 
     // Map of named plugin classes, [intfc,name] -> class
     // Also contains intfc -> "marker" to mark when interface has been loaded.
-    private Map<String, String> namedPluginClasses = new HashMap<String, String>();
-
-    // Map of cached (reusable) named plugin instances, [class,name] -> instance
-    private Map<Serializable, Object> namedInstanceCache = new HashMap<Serializable, Object>();
+    private final Map<String, String> namedPluginClasses = new HashMap<>();
 
     // load and cache configuration data for the given interface.
     private void configureNamedPlugin(String iname)
@@ -413,14 +409,14 @@ public class LegacyPluginServiceImpl implements PluginService {
             String iname = interfaceClass.getName();
             configureNamedPlugin(iname);
             String prefix = iname + SEP;
-            ArrayList<String> result = new ArrayList<String>();
+            ArrayList<String> result = new ArrayList<>();
 
             for (String key : namedPluginClasses.keySet()) {
                 if (key.startsWith(prefix)) {
                     result.add(key.substring(prefix.length()));
                 }
             }
-            if (result.size() == 0) {
+            if (result.isEmpty()) {
                 log.error("Cannot find any names for named plugin, interface=" + iname);
             }
 
@@ -508,10 +504,10 @@ public class LegacyPluginServiceImpl implements PluginService {
          */
 
         // tables of config keys for each type of config line:
-        Map<String, String> singleKey = new HashMap<String, String>();
-        Map<String, String> sequenceKey = new HashMap<String, String>();
-        Map<String, String> namedKey = new HashMap<String, String>();
-        Map<String, String> selfnamedKey = new HashMap<String, String>();
+        Map<String, String> singleKey = new HashMap<>();
+        Map<String, String> sequenceKey = new HashMap<>();
+        Map<String, String> namedKey = new HashMap<>();
+        Map<String, String> selfnamedKey = new HashMap<>();
 
         // Find all property keys starting with "plugin."
         List<String> keys = configurationService.getPropertyKeys("plugin.");
@@ -533,7 +529,7 @@ public class LegacyPluginServiceImpl implements PluginService {
         // 2. Build up list of all interfaces and test that they are loadable.
         // don't bother testing that they are "interface" rather than "class"
         // since either one will work for the Plugin Manager.
-        ArrayList<String> allInterfaces = new ArrayList<String>();
+        ArrayList<String> allInterfaces = new ArrayList<>();
         allInterfaces.addAll(singleKey.keySet());
         allInterfaces.addAll(sequenceKey.keySet());
         allInterfaces.addAll(namedKey.keySet());
@@ -547,7 +543,6 @@ public class LegacyPluginServiceImpl implements PluginService {
         //  - each class is loadable.
         //  - plugin.selfnamed values are each  subclass of SelfNamedPlugin
         //  - save classname in allImpls
-        Map<String, String> allImpls = new HashMap<String, String>();
 
         // single plugins - just check that it has a valid impl. class
         ii = singleKey.keySet().iterator();
@@ -558,9 +553,6 @@ public class LegacyPluginServiceImpl implements PluginService {
                 log.error("Single plugin config not found for: " + SINGLE_PREFIX + key);
             } else {
                 val = val.trim();
-                if (checkClassname(val, "implementation class")) {
-                    allImpls.put(val, val);
-                }
             }
         }
 
@@ -571,12 +563,6 @@ public class LegacyPluginServiceImpl implements PluginService {
             String[] vals = configurationService.getArrayProperty(SEQUENCE_PREFIX + key);
             if (vals == null || vals.length == 0) {
                 log.error("Sequence plugin config not found for: " + SEQUENCE_PREFIX + key);
-            } else {
-                for (String val : vals) {
-                    if (checkClassname(val, "implementation class")) {
-                        allImpls.put(val, val);
-                    }
-                }
             }
         }
 
@@ -591,7 +577,6 @@ public class LegacyPluginServiceImpl implements PluginService {
             } else {
                 for (String val : vals) {
                     if (checkClassname(val, "selfnamed implementation class")) {
-                        allImpls.put(val, val);
                         checkSelfNamed(val);
                     }
                 }
@@ -609,15 +594,6 @@ public class LegacyPluginServiceImpl implements PluginService {
                 log.error("Named plugin config not found for: " + NAMED_PREFIX + key);
             } else {
                 checkNames(key);
-                for (String val : vals) {
-                    // each named plugin has two parts to the value, format:
-                    // [classname] = [plugin-name]
-                    String val_split[] = val.split("\\s*=\\s*");
-                    String classname = val_split[0];
-                    if (checkClassname(classname, "implementation class")) {
-                        allImpls.put(classname, classname);
-                    }
-                }
             }
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/curate/CitationPage.java b/dspace-api/src/main/java/org/dspace/ctask/general/CitationPage.java
similarity index 80%
rename from dspace-api/src/main/java/org/dspace/curate/CitationPage.java
rename to dspace-api/src/main/java/org/dspace/ctask/general/CitationPage.java
index dbdd070145..fa630029b8 100644
--- a/dspace-api/src/main/java/org/dspace/curate/CitationPage.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/general/CitationPage.java
@@ -5,8 +5,9 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.curate;
+package org.dspace.ctask.general;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
@@ -17,6 +18,9 @@ import java.util.Map;
 
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.authorize.factory.AuthorizeServiceFactory;
+import org.dspace.authorize.service.ResourcePolicyService;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.DSpaceObject;
@@ -25,6 +29,10 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
 import org.dspace.core.Context;
+import org.dspace.curate.AbstractCurationTask;
+import org.dspace.curate.Curator;
+import org.dspace.curate.Distributive;
+import org.dspace.curate.Mutative;
 import org.dspace.disseminate.factory.DisseminateServiceFactory;
 import org.dspace.disseminate.service.CitationDocumentService;
 
@@ -66,6 +74,10 @@ public class CitationPage extends AbstractCurationTask {
 
     protected BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
     protected BundleService bundleService = ContentServiceFactory.getInstance().getBundleService();
+    protected ResourcePolicyService resourcePolicyService = AuthorizeServiceFactory.getInstance()
+            .getResourcePolicyService();
+
+    private Map<String,Bitstream> displayMap = new HashMap<String,Bitstream>();
 
     /**
      * {@inheritDoc}
@@ -94,13 +106,17 @@ public class CitationPage extends AbstractCurationTask {
     protected void performItem(Item item) throws SQLException {
         //Determine if the DISPLAY bundle exits. If not, create it.
         List<Bundle> dBundles = itemService.getBundles(item, CitationPage.DISPLAY_BUNDLE_NAME);
+        Bundle original = itemService.getBundles(item, "ORIGINAL").get(0);
         Bundle dBundle = null;
         if (dBundles == null || dBundles.isEmpty()) {
             try {
                 dBundle = bundleService.create(Curator.curationContext(), item, CitationPage.DISPLAY_BUNDLE_NAME);
+                // don't inherit now otherwise they will be copied over the moved bitstreams
+                resourcePolicyService.removeAllPolicies(Curator.curationContext(), dBundle);
             } catch (AuthorizeException e) {
-                log.error("User not authroized to create bundle on item \""
-                              + item.getName() + "\": " + e.getMessage());
+                log.error("User not authroized to create bundle on item \"{}\": {}",
+                        item::getName, e::getMessage);
+                return;
             }
         } else {
             dBundle = dBundles.get(0);
@@ -108,7 +124,6 @@ public class CitationPage extends AbstractCurationTask {
 
         //Create a map of the bitstreams in the displayBundle. This is used to
         //check if the bundle being cited is already in the display bundle.
-        Map<String, Bitstream> displayMap = new HashMap<>();
         for (Bitstream bs : dBundle.getBitstreams()) {
             displayMap.put(bs.getName(), bs);
         }
@@ -119,13 +134,15 @@ public class CitationPage extends AbstractCurationTask {
         List<Bundle> pBundles = itemService.getBundles(item, CitationPage.PRESERVATION_BUNDLE_NAME);
         Bundle pBundle = null;
         List<Bundle> bundles = new ArrayList<>();
-        if (pBundles != null && pBundles.size() > 0) {
+        if (pBundles != null && !pBundles.isEmpty()) {
             pBundle = pBundles.get(0);
             bundles.addAll(itemService.getBundles(item, "ORIGINAL"));
             bundles.addAll(pBundles);
         } else {
             try {
                 pBundle = bundleService.create(Curator.curationContext(), item, CitationPage.PRESERVATION_BUNDLE_NAME);
+                // don't inherit now otherwise they will be copied over the moved bitstreams
+                resourcePolicyService.removeAllPolicies(Curator.curationContext(), pBundle);
             } catch (AuthorizeException e) {
                 log.error("User not authroized to create bundle on item \""
                               + item.getName() + "\": " + e.getMessage());
@@ -154,10 +171,14 @@ public class CitationPage extends AbstractCurationTask {
                     try {
                         //Create the cited document
                         InputStream citedInputStream =
-                            citationDocument.makeCitedDocument(Curator.curationContext(), bitstream).getLeft();
+                            new ByteArrayInputStream(
+                                citationDocument.makeCitedDocument(Curator.curationContext(), bitstream).getLeft());
                         //Add the cited document to the approiate bundle
                         this.addCitedPageToItem(citedInputStream, bundle, pBundle,
-                                                dBundle, displayMap, item, bitstream);
+                                                dBundle, item, bitstream);
+                        // now set the policies of the preservation and display bundle
+                        clonePolicies(Curator.curationContext(), original, pBundle);
+                        clonePolicies(Curator.curationContext(), original, dBundle);
                     } catch (Exception e) {
                         //Could be many things, but nothing that should be
                         //expected.
@@ -200,8 +221,6 @@ public class CitationPage extends AbstractCurationTask {
      * @param pBundle The preservation bundle. The original document should be
      * put in here if it is not already.
      * @param dBundle The display bundle. The cited document gets put in here.
-     * @param displayMap The map of bitstream names to bitstreams in the display
-     *                   bundle.
      * @param item       The item containing the bundles being used.
      * @param bitstream  The original source bitstream.
      * @throws SQLException       if database error
@@ -209,7 +228,7 @@ public class CitationPage extends AbstractCurationTask {
      * @throws IOException        if IO error
      */
     protected void addCitedPageToItem(InputStream citedDoc, Bundle bundle, Bundle pBundle,
-                                      Bundle dBundle, Map<String,Bitstream> displayMap, Item item,
+                                      Bundle dBundle, Item item,
                                       Bitstream bitstream) throws SQLException, AuthorizeException, IOException {
         //If we are modifying a file that is not in the
         //preservation bundle then we have to move it there.
@@ -237,7 +256,8 @@ public class CitationPage extends AbstractCurationTask {
         citedBitstream.setName(context, bitstream.getName());
         bitstreamService.setFormat(context, citedBitstream, bitstream.getFormat(Curator.curationContext()));
         citedBitstream.setDescription(context, bitstream.getDescription());
-
+        displayMap.put(bitstream.getName(), citedBitstream);
+        clonePolicies(context, bitstream, citedBitstream);
         this.resBuilder.append(" Added ")
                 .append(citedBitstream.getName())
                 .append(" to the ")
@@ -249,4 +269,16 @@ public class CitationPage extends AbstractCurationTask {
         itemService.update(context, item);
         this.status = Curator.CURATE_SUCCESS;
     }
+
+    private void clonePolicies(Context context, DSpaceObject source,DSpaceObject target)
+            throws SQLException, AuthorizeException {
+        resourcePolicyService.removeAllPolicies(context, target);
+        for (ResourcePolicy rp: source.getResourcePolicies()) {
+            ResourcePolicy newPolicy = resourcePolicyService.clone(context, rp);
+            newPolicy.setdSpaceObject(target);
+            newPolicy.setAction(rp.getAction());
+            resourcePolicyService.update(context, newPolicy);
+        }
+
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/ctask/general/CreateMissingIdentifiers.java b/dspace-api/src/main/java/org/dspace/ctask/general/CreateMissingIdentifiers.java
new file mode 100644
index 0000000000..9639461426
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/ctask/general/CreateMissingIdentifiers.java
@@ -0,0 +1,94 @@
+/**
+ * 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/
+ */
+
+package org.dspace.ctask.general;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.curate.AbstractCurationTask;
+import org.dspace.curate.Curator;
+import org.dspace.identifier.IdentifierException;
+import org.dspace.identifier.IdentifierProvider;
+import org.dspace.identifier.VersionedHandleIdentifierProviderWithCanonicalHandles;
+import org.dspace.identifier.factory.IdentifierServiceFactory;
+import org.dspace.identifier.service.IdentifierService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Ensure that an object has all of the identifiers that it should, minting them
+ * as necessary.
+ *
+ * @author Mark H. Wood {@literal <mwood@iupui.edu>}
+ */
+public class CreateMissingIdentifiers
+        extends AbstractCurationTask {
+    private static final Logger LOG = LogManager.getLogger();
+
+    @Override
+    public int perform(DSpaceObject dso)
+            throws IOException {
+        // Only some kinds of model objects get identifiers
+        if (!(dso instanceof Item)) {
+            return Curator.CURATE_SKIP;
+        }
+
+        // XXX Temporary escape when an incompatible provider is configured.
+        // XXX Remove this when the provider is fixed.
+        boolean compatible = DSpaceServicesFactory
+                .getInstance()
+                .getServiceManager()
+                .getServiceByName(
+                        VersionedHandleIdentifierProviderWithCanonicalHandles.class.getCanonicalName(),
+                        IdentifierProvider.class) == null;
+        if (!compatible) {
+            setResult("This task is not compatible with VersionedHandleIdentifierProviderWithCanonicalHandles");
+            return Curator.CURATE_ERROR;
+        }
+        // XXX End of escape
+
+        String typeText = Constants.typeText[dso.getType()];
+
+        // Get a Context
+        Context context;
+        try {
+            context = Curator.curationContext();
+        } catch (SQLException ex) {
+            report("Could not get the curation Context:  " + ex.getMessage());
+            return Curator.CURATE_ERROR;
+        }
+
+        // Find the IdentifierService implementation
+        IdentifierService identifierService = IdentifierServiceFactory
+                .getInstance()
+                .getIdentifierService();
+
+        // Register any missing identifiers.
+        try {
+            identifierService.register(context, dso);
+        } catch (AuthorizeException | IdentifierException | SQLException ex) {
+            String message = ex.getMessage();
+            report(String.format("Identifier(s) not minted for %s %s:  %s%n",
+                    typeText, dso.getID().toString(), message));
+            LOG.error("Identifier(s) not minted:  {}", message);
+            return Curator.CURATE_ERROR;
+        }
+
+        // Success!
+        report(String.format("%s %s registered.%n",
+                typeText, dso.getID().toString()));
+        return Curator.CURATE_SUCCESS;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/ctask/general/MetadataWebService.java b/dspace-api/src/main/java/org/dspace/ctask/general/MetadataWebService.java
index edeb2a6d02..f7ab18c01e 100644
--- a/dspace-api/src/main/java/org/dspace/ctask/general/MetadataWebService.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/general/MetadataWebService.java
@@ -10,11 +10,13 @@ package org.dspace.ctask.general;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.xml.XMLConstants;
@@ -33,6 +35,7 @@ import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
@@ -60,18 +63,18 @@ import org.xml.sax.SAXException;
  * Intended use: cataloging tool in workflow and general curation.
  * The task uses a URL 'template' to compose the service call, e.g.
  *
- * {@code http://www.sherpa.ac.uk/romeo/api29.php?issn=\{dc.identifier.issn\}}
+ * <p>{@code http://www.sherpa.ac.uk/romeo/api29.php?issn=\{dc.identifier.issn\}}
  *
- * Task will substitute the value of the passed item's metadata field
+ * <p>Task will substitute the value of the passed item's metadata field
  * in the {parameter} position. If multiple values are present in the
  * item field, the first value is used.
  *
- * The task uses another property (the datamap) to determine what data
+ * <p>The task uses another property (the datamap) to determine what data
  * to extract from the service response and how to use it, e.g.
  *
- * {@code //publisher/name=>dc.publisher,//romeocolour}
+ * <p>{@code //publisher/name=>dc.publisher,//romeocolour}
  *
- * Task will evaluate the left-hand side (or entire token) of each
+ * <p>Task will evaluate the left-hand side (or entire token) of each
  * comma-separated token in the property as an XPath 1.0 expression into
  * the response document, and if there is a mapping symbol (e.g. {@code '=>'}) and
  * value, it will assign the response document value(s) to the named
@@ -79,48 +82,52 @@ import org.xml.sax.SAXException;
  * multiple values, they will all be assigned to the item field. The
  * mapping symbol governs the nature of metadata field assignment:
  *
- * {@code '->'} mapping will add to any existing values in the item field
- * {@code '=>'} mapping will replace any existing values in the item field
- * {@code '~>'} mapping will add *only* if item field has no existing values
+ * <ul>
+ * <li>{@code '->'} mapping will add to any existing values in the item field</li>
+ * <li>{@code '=>'} mapping will replace any existing values in the item field</li>
+ * <li>{@code '~>'} mapping will add *only* if item field has no existing values</li>
+ * </ul>
  *
- * Unmapped data (without a mapping symbol) will simply be added to the task
+ * <p>Unmapped data (without a mapping symbol) will simply be added to the task
  * result string, prepended by the XPath expression (a little prettified).
  * Each label/value pair in the result string is separated by a space,
  * unless the optional 'separator' property is defined.
  *
- * A very rudimentary facility for transformation of data is supported, e.g.
+ * <p>A very rudimentary facility for transformation of data is supported, e.g.
  *
- * {@code http://www.crossref.org/openurl/?id=\{doi:dc.relation.isversionof\}&format=unixref}
+ * <p>{@code http://www.crossref.org/openurl/?id=\{doi:dc.relation.isversionof\}&format=unixref}
  *
- * The 'doi:' prefix will cause the task to look for a 'transform' with that
+ * <p>The 'doi:' prefix will cause the task to look for a 'transform' with that
  * name, which is applied to the metadata value before parameter substitution
  * occurs. Transforms are defined in a task property such as the following:
  *
- * {@code transform.doi = match 10. trunc 60}
+ * <p>{@code transform.doi = match 10. trunc 60}
  *
- * This means exclude the value string up to the occurrence of '10.', then
+ * <p>This means exclude the value string up to the occurrence of '10.', then
  * truncate after 60 characters. The only transform functions currently defined:
  *
- * {@code 'cut' <number>} = remove number leading characters
- * {@code 'trunc' <number>} = remove trailing characters after number length
- * {@code 'match' <pattern>} = start match at pattern
- * {@code 'text' <characters>} = append literal characters (enclose in ' ' when whitespace needed)
+ * <ul>
+ * <li>{@code 'cut' <number>} = remove number leading characters</li>
+ * <li>{@code 'trunc' <number>} = remove trailing characters after number length</li>
+ * <li>{@code 'match' <pattern>} = start match at pattern</li>
+ * <li>{@code 'text' <characters>} = append literal characters (enclose in ' ' when whitespace needed)</li>
+ * </ul>
  *
- * If the transform results in an invalid state (e.g. cutting more characters
+ * <p>If the transform results in an invalid state (e.g. cutting more characters
  * than are in the value), the condition will be logged and the
  * un-transformed value used.
  *
- * Transforms may also be used in datamaps, e.g.
+ * <p>Transforms may also be used in datamaps, e.g.
  *
- * {@code //publisher/name=>shorten:dc.publisher,//romeocolour}
+ * <p>{@code //publisher/name=>shorten:dc.publisher,//romeocolour}
  *
- * which would apply the 'shorten' transform to the service response value(s)
+ * <p>which would apply the 'shorten' transform to the service response value(s)
  * prior to metadata field assignment.
  *
- * An optional property 'headers' may be defined to stipulate any HTTP headers
+ * <p>An optional property 'headers' may be defined to stipulate any HTTP headers
  * required in the service call. The property syntax is double-pipe separated headers:
  *
- * {@code Accept: text/xml||Cache-Control: no-cache}
+ * <p>{@code Accept: text/xml||Cache-Control: no-cache}
  *
  * @author richardrodgers
  */
@@ -128,9 +135,9 @@ import org.xml.sax.SAXException;
 @Suspendable
 public class MetadataWebService extends AbstractCurationTask implements NamespaceContext {
     /**
-     * log4j category
+     * logging category
      */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(MetadataWebService.class);
+    private static final Logger log = LogManager.getLogger();
     // transform token parsing pattern
     protected Pattern ttPattern = Pattern.compile("\'([^\']*)\'|(\\S+)");
     // URL of web service with template parameters
@@ -360,42 +367,45 @@ public class MetadataWebService extends AbstractCurationTask implements Namespac
         if (transDef == null) {
             return value;
         }
-        String[] tokens = tokenize(transDef);
+        Queue<String> tokens = tokenize(transDef);
         String retValue = value;
-        for (int i = 0; i < tokens.length; i += 2) {
-            if ("cut".equals(tokens[i]) || "trunc".equals(tokens[i])) {
-                int index = Integer.parseInt(tokens[i + 1]);
+        while (!tokens.isEmpty()) {
+            String function = tokens.poll();
+            if ("cut".equals(function) || "trunc".equals(function)) {
+                String argument = tokens.poll();
+                int index = Integer.parseInt(argument);
                 if (retValue.length() > index) {
-                    if ("cut".equals(tokens[i])) {
+                    if ("cut".equals(function)) {
                         retValue = retValue.substring(index);
                     } else {
                         retValue = retValue.substring(0, index);
                     }
-                } else if ("cut".equals(tokens[i])) {
-                    log.error("requested cut: " + index + " exceeds value length");
+                } else if ("cut".equals(function)) {
+                    log.error("requested cut: {} exceeds value length", index);
                     return value;
                 }
-            } else if ("match".equals(tokens[i])) {
-                int index2 = retValue.indexOf(tokens[i + 1]);
+            } else if ("match".equals(function)) {
+                String argument = tokens.poll();
+                int index2 = retValue.indexOf(argument);
                 if (index2 > 0) {
                     retValue = retValue.substring(index2);
                 } else {
-                    log.error("requested match: " + tokens[i + 1] + " failed");
+                    log.error("requested match: {} failed", argument);
                     return value;
                 }
-            } else if ("text".equals(tokens[i])) {
-                retValue = retValue + tokens[i + 1];
+            } else if ("text".equals(function)) {
+                retValue = retValue + tokens.poll();
             } else {
-                log.error(" unknown transform operation: " + tokens[i]);
+                log.error(" unknown transform operation: " + function);
                 return value;
             }
         }
         return retValue;
     }
 
-    protected String[] tokenize(String text) {
-        List<String> list = new ArrayList<>();
+    protected Queue<String> tokenize(String text) {
         Matcher m = ttPattern.matcher(text);
+        Queue<String> list = new ArrayDeque<>(m.groupCount());
         while (m.find()) {
             if (m.group(1) != null) {
                 list.add(m.group(1));
@@ -403,7 +413,7 @@ public class MetadataWebService extends AbstractCurationTask implements Namespac
                 list.add(m.group(2));
             }
         }
-        return list.toArray(new String[0]);
+        return list;
     }
 
     protected int getMapIndex(String mapping) {
diff --git a/dspace-api/src/main/java/org/dspace/curate/Curation.java b/dspace-api/src/main/java/org/dspace/curate/Curation.java
index a01c731189..b3af072a32 100644
--- a/dspace-api/src/main/java/org/dspace/curate/Curation.java
+++ b/dspace-api/src/main/java/org/dspace/curate/Curation.java
@@ -189,7 +189,7 @@ public class Curation extends DSpaceRunnable<CurationScriptConfiguration> {
      * @throws FileNotFoundException If file of command line variable -r reporter is not found
      */
     private Curator initCurator() throws FileNotFoundException {
-        Curator curator = new Curator();
+        Curator curator = new Curator(handler);
         OutputStream reporterStream;
         if (null == this.reporter) {
             reporterStream = new NullOutputStream();
@@ -259,12 +259,19 @@ public class Curation extends DSpaceRunnable<CurationScriptConfiguration> {
                 super.handler.logError("EPerson not found: " + currentUserUuid);
                 throw new IllegalArgumentException("Unable to find a user with uuid: " + currentUserUuid);
             }
+            assignSpecialGroupsInContext();
             this.context.setCurrentUser(eperson);
         } catch (SQLException e) {
             handler.handleException("Something went wrong trying to fetch eperson for uuid: " + currentUserUuid, e);
         }
     }
 
+    protected void assignSpecialGroupsInContext() throws SQLException {
+        for (UUID uuid : handler.getSpecialGroups()) {
+            context.setSpecialGroup(uuid);
+        }
+    }
+
     /**
      * Fills in some optional command line options.
      * Checks if there are missing required options or invalid values for options.
diff --git a/dspace-api/src/main/java/org/dspace/curate/CurationCliScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/curate/CurationCliScriptConfiguration.java
index 5e1d014873..eaa04f4778 100644
--- a/dspace-api/src/main/java/org/dspace/curate/CurationCliScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/curate/CurationCliScriptConfiguration.java
@@ -19,7 +19,6 @@ public class CurationCliScriptConfiguration extends CurationScriptConfiguration<
     public Options getOptions() {
         options = super.getOptions();
         options.addOption("e", "eperson", true, "email address of curating eperson");
-        options.getOption("e").setType(String.class);
         options.getOption("e").setRequired(true);
         return options;
     }
diff --git a/dspace-api/src/main/java/org/dspace/curate/Curator.java b/dspace-api/src/main/java/org/dspace/curate/Curator.java
index aa6cb14fda..4076fab519 100644
--- a/dspace-api/src/main/java/org/dspace/curate/Curator.java
+++ b/dspace-api/src/main/java/org/dspace/curate/Curator.java
@@ -9,6 +9,7 @@ package org.dspace.curate;
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30,6 +31,7 @@ import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.scripts.handler.DSpaceRunnableHandler;
 
 /**
  * Curator orchestrates and manages the application of a one or more curation
@@ -90,6 +92,17 @@ public class Curator {
     protected CommunityService communityService;
     protected ItemService itemService;
     protected HandleService handleService;
+    protected DSpaceRunnableHandler handler;
+
+    /**
+     * constructor that uses an handler for logging
+     * 
+     * @param handler {@code DSpaceRunnableHandler} used to logs infos
+     */
+    public Curator(DSpaceRunnableHandler handler) {
+        this();
+        this.handler = handler;
+    }
 
     /**
      * No-arg constructor
@@ -338,7 +351,7 @@ public class Curator {
      */
     public void report(String message) {
         if (null == reporter) {
-            log.warn("report called with no Reporter set:  {}", message);
+            logWarning("report called with no Reporter set:  {}", message);
             return;
         }
 
@@ -435,7 +448,7 @@ public class Curator {
             // Site-wide Tasks really should have an EPerson performer associated with them,
             // otherwise they are run as an "anonymous" user with limited access rights.
             if (ctx.getCurrentUser() == null && !ctx.ignoreAuthorization()) {
-                log.warn("You are running one or more Site-Wide curation tasks in ANONYMOUS USER mode," +
+                logWarning("You are running one or more Site-Wide curation tasks in ANONYMOUS USER mode," +
                              " as there is no EPerson 'performer' associated with this task. To associate an EPerson " +
                              "'performer' " +
                              " you should ensure tasks are called via the Curator.curate(Context, ID) method.");
@@ -546,7 +559,7 @@ public class Curator {
                 }
                 statusCode = task.perform(dso);
                 String id = (dso.getHandle() != null) ? dso.getHandle() : "workflow item: " + dso.getID();
-                log.info(logMessage(id));
+                logInfo(logMessage(id));
                 visit(dso);
                 return !suspend(statusCode);
             } catch (IOException ioe) {
@@ -562,7 +575,7 @@ public class Curator {
                     throw new IOException("Context or identifier is null");
                 }
                 statusCode = task.perform(c, id);
-                log.info(logMessage(id));
+                logInfo(logMessage(id));
                 visit(null);
                 return !suspend(statusCode);
             } catch (IOException ioe) {
@@ -604,5 +617,51 @@ public class Curator {
             }
             return mb.toString();
         }
+
+        /**
+         * Proxy method for logging with INFO level
+         * 
+         * @param message that needs to be logged
+         */
+        protected void logInfo(String message) {
+            if (handler == null) {
+                log.info(message);
+            } else {
+                handler.logInfo(message);
+            }
+        }
+
+    }
+
+    /**
+     * Proxt method for logging with WARN level
+     * 
+     * @param message
+     */
+    protected void logWarning(String message) {
+        logWarning(message, null);
+    }
+
+    /**
+     * Proxy method for logging with WARN level and a {@code Messageformatter}
+     * that generates the final log.
+     * 
+     * @param message Target message to format or print
+     * @param object  Object to use inside the message, or null
+     */
+    protected void logWarning(String message, Object object) {
+        if (handler == null) {
+            if (object != null) {
+                log.warn(message, object);
+            } else {
+                log.warn(message);
+            }
+        } else {
+            if (object != null) {
+                handler.logWarning(MessageFormat.format(message, object));
+            } else {
+                handler.logWarning(message);
+            }
+        }
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java b/dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java
index 62357bd95f..74d9ba0c3a 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java
@@ -74,25 +74,17 @@ public enum IndexClientOptions {
 
         options
             .addOption("r", "remove", true, "remove an Item, Collection or Community from index based on its handle");
-        options.getOption("r").setType(String.class);
         options.addOption("i", "index", true,
                           "add or update an Item, Collection or Community based on its handle or uuid");
-        options.getOption("i").setType(boolean.class);
         options.addOption("c", "clean", false,
                           "clean existing index removing any documents that no longer exist in the db");
-        options.getOption("c").setType(boolean.class);
         options.addOption("d", "delete", false,
                 "delete all records from existing index");
-        options.getOption("d").setType(boolean.class);
         options.addOption("b", "build", false, "(re)build index, wiping out current one if it exists");
-        options.getOption("b").setType(boolean.class);
         options.addOption("s", "spellchecker", false, "Rebuild the spellchecker, can be combined with -b and -f.");
-        options.getOption("s").setType(boolean.class);
         options.addOption("f", "force", false,
                           "if updating existing index, force each handle to be reindexed even if uptodate");
-        options.getOption("f").setType(boolean.class);
         options.addOption("h", "help", false, "print this help message");
-        options.getOption("h").setType(boolean.class);
         return options;
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
index 5f1f8b0b0e..4ff1f31344 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.discovery;
 
+import java.sql.SQLException;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -37,6 +38,8 @@ public class IndexEventConsumer implements Consumer {
 
     // collect Items, Collections, Communities that need indexing
     private Set<IndexableObject> objectsToUpdate = new HashSet<>();
+    // collect freshly created Items that need indexing (requires pre-db status)
+    private Set<IndexableObject> createdItemsToUpdate = new HashSet<>();
 
     // unique search IDs to delete
     private Set<String> uniqueIdsToDelete = new HashSet<>();
@@ -65,6 +68,7 @@ public class IndexEventConsumer implements Consumer {
         if (objectsToUpdate == null) {
             objectsToUpdate = new HashSet<>();
             uniqueIdsToDelete = new HashSet<>();
+            createdItemsToUpdate = new HashSet<>();
         }
 
         int st = event.getSubjectType();
@@ -143,6 +147,7 @@ public class IndexEventConsumer implements Consumer {
                         String detail = indexableObjectService.getType() + "-" + event.getSubjectID().toString();
                         uniqueIdsToDelete.add(detail);
                     }
+
                     objectsToUpdate.addAll(indexObjectServiceFactory.getIndexableObjects(ctx, subject));
                 }
                 break;
@@ -162,7 +167,7 @@ public class IndexEventConsumer implements Consumer {
                     // also update the object in order to index mapped/unmapped Items
                     if (subject != null &&
                         subject.getType() == Constants.COLLECTION && object.getType() == Constants.ITEM) {
-                        objectsToUpdate.addAll(indexObjectServiceFactory.getIndexableObjects(ctx, object));
+                        createdItemsToUpdate.addAll(indexObjectServiceFactory.getIndexableObjects(ctx, object));
                     }
                 }
                 break;
@@ -209,23 +214,11 @@ public class IndexEventConsumer implements Consumer {
             }
             // update the changed Items not deleted because they were on create list
             for (IndexableObject iu : objectsToUpdate) {
-                /* we let all types through here and
-                 * allow the search indexer to make
-                 * decisions on indexing and/or removal
-                 */
-                iu.setIndexedObject(ctx.reloadEntity(iu.getIndexedObject()));
-                String uniqueIndexID = iu.getUniqueIndexID();
-                if (uniqueIndexID != null) {
-                    try {
-                        indexer.indexContent(ctx, iu, true, false);
-                        log.debug("Indexed "
-                                + iu.getTypeText()
-                                + ", id=" + iu.getID()
-                                + ", unique_id=" + uniqueIndexID);
-                    } catch (Exception e) {
-                        log.error("Failed while indexing object: ", e);
-                    }
-                }
+                indexObject(ctx, iu, false);
+            }
+            // update the created Items with a pre-db status
+            for (IndexableObject iu : createdItemsToUpdate) {
+                indexObject(ctx, iu, true);
             }
         } finally {
             if (!objectsToUpdate.isEmpty() || !uniqueIdsToDelete.isEmpty()) {
@@ -235,6 +228,27 @@ public class IndexEventConsumer implements Consumer {
                 // "free" the resources
                 objectsToUpdate.clear();
                 uniqueIdsToDelete.clear();
+                createdItemsToUpdate.clear();
+            }
+        }
+    }
+
+    private void indexObject(Context ctx, IndexableObject iu, boolean preDb) throws SQLException {
+        /* we let all types through here and
+         * allow the search indexer to make
+         * decisions on indexing and/or removal
+         */
+        iu.setIndexedObject(ctx.reloadEntity(iu.getIndexedObject()));
+        String uniqueIndexID = iu.getUniqueIndexID();
+        if (uniqueIndexID != null) {
+            try {
+                indexer.indexContent(ctx, iu, true, false, preDb);
+                log.debug("Indexed "
+                        + iu.getTypeText()
+                        + ", id=" + iu.getID()
+                        + ", unique_id=" + uniqueIndexID);
+            } catch (Exception e) {
+                log.error("Failed while indexing object: ", e);
             }
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java b/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java
index db0329dd67..2ef5affa47 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java
@@ -9,7 +9,9 @@ package org.dspace.discovery;
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.Map;
 
+import org.apache.solr.client.solrj.SolrServerException;
 import org.dspace.core.Context;
 
 /**
@@ -30,6 +32,17 @@ public interface IndexingService {
     void indexContent(Context context, IndexableObject dso,
                       boolean force, boolean commit) throws SQLException, SearchServiceException;
 
+    /**
+     * Index a given DSO
+     * @param context   The DSpace Context
+     * @param dso       The DSpace Object to index
+     * @param force     Force update even if not stale
+     * @param commit    Commit the changes
+     * @param preDb     Add a "preDB" status to the index (only applicable to Items)
+     */
+    void indexContent(Context context, IndexableObject dso,
+                      boolean force, boolean commit, boolean preDb) throws SQLException, SearchServiceException;
+
     void unIndexContent(Context context, IndexableObject dso)
         throws SQLException, IOException;
 
@@ -62,4 +75,15 @@ public interface IndexingService {
     void optimize() throws SearchServiceException;
 
     void buildSpellCheck() throws SearchServiceException, IOException;
+
+    /**
+     * Atomically update the index of a single field for an object
+     * @param context       The DSpace context
+     * @param uniqueIndexId The unqiue index ID of the object to update the index for
+     * @param field         The field to update
+     * @param fieldModifier The modifiers for the field to update. More information on how to atomically update a solr
+     *                      field using a field modifier can be found here: https://yonik.com/solr/atomic-updates/
+     */
+    void atomicUpdate(Context context, String uniqueIndexId, String field, Map<String,Object> fieldModifier)
+            throws SolrServerException, IOException;
 }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SearchService.java b/dspace-api/src/main/java/org/dspace/discovery/SearchService.java
index 9b6ac0109d..cb945648e7 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SearchService.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SearchService.java
@@ -8,6 +8,7 @@
 package org.dspace.discovery;
 
 import java.sql.SQLException;
+import java.util.Iterator;
 import java.util.List;
 
 import org.dspace.content.Item;
@@ -38,6 +39,7 @@ public interface SearchService {
     DiscoverResult search(Context context, DiscoverQuery query)
         throws SearchServiceException;
 
+
     /**
      * Convenient method to call @see #search(Context, DSpaceObject,
      * DiscoverQuery, boolean) with includeWithdrawn=false
@@ -52,9 +54,22 @@ public interface SearchService {
     DiscoverResult search(Context context, IndexableObject dso, DiscoverQuery query)
         throws SearchServiceException;
 
+    /**
+     * Convenience method to call @see #search(Context, DSpaceObject, DiscoverQuery) and getting an iterator for the
+     * results
+     *
+     * @param context   DSpace context object
+     * @param dso       a DSpace object to use as a scope of the search
+     * @param query     the discovery query object
+     * @return          an iterator iterating over all results from the search
+     * @throws SearchServiceException   if search error
+     */
+    Iterator<Item> iteratorSearch(Context context, IndexableObject dso, DiscoverQuery query)
+        throws SearchServiceException;
+
 
     List<IndexableObject> search(Context context, String query, String orderfield, boolean ascending, int offset,
-            int max, String... filterquery);
+                                 int max, String... filterquery);
 
     /**
      * Transforms the given string field and value into a filter query
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SearchUtils.java b/dspace-api/src/main/java/org/dspace/discovery/SearchUtils.java
index 90afb09eca..f14ca124f4 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SearchUtils.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SearchUtils.java
@@ -20,6 +20,7 @@ import org.dspace.content.Item;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.discovery.configuration.DiscoveryConfiguration;
 import org.dspace.discovery.configuration.DiscoveryConfigurationService;
+import org.dspace.discovery.utils.DiscoverQueryBuilder;
 import org.dspace.kernel.ServiceManager;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.workflow.WorkflowItem;
@@ -51,6 +52,9 @@ public class SearchUtils {
      */
     private SearchUtils() { }
 
+    /**
+     * Return an instance of the {@link SearchService}.
+     */
     public static SearchService getSearchService() {
         if (searchService == null) {
             org.dspace.kernel.ServiceManager manager = DSpaceServicesFactory.getInstance().getServiceManager();
@@ -59,6 +63,16 @@ public class SearchUtils {
         return searchService;
     }
 
+    /**
+     * Clear the cached {@link SearchService} instance, forcing it to be retrieved from the service manager again
+     * next time {@link SearchUtils#getSearchService} is called.
+     * In practice, this is only necessary for integration tests in some environments
+     * where the cached version may no longer be up to date between tests.
+     */
+    public static void clearCachedSearchService() {
+        searchService = null;
+    }
+
     public static DiscoveryConfiguration getDiscoveryConfiguration() {
         return getDiscoveryConfiguration(null, null);
     }
@@ -170,4 +184,10 @@ public class SearchUtils {
         DiscoveryConfiguration configurationExtra = getDiscoveryConfigurationByName(confName);
         result.add(configurationExtra);
     }
+
+    public static DiscoverQueryBuilder getQueryBuilder() {
+        ServiceManager manager = DSpaceServicesFactory.getInstance().getServiceManager();
+        return manager
+            .getServiceByName(DiscoverQueryBuilder.class.getName(), DiscoverQueryBuilder.class);
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrSearchCore.java b/dspace-api/src/main/java/org/dspace/discovery/SolrSearchCore.java
index b430a0c973..f31feab612 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrSearchCore.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrSearchCore.java
@@ -21,7 +21,6 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.dspace.discovery.indexobject.IndexableItem;
 import org.dspace.service.impl.HttpConnectionPoolService;
 import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.storage.rdbms.DatabaseUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -75,14 +74,13 @@ public class SolrSearchCore {
      */
     protected void initSolr() {
         if (solr == null) {
-            String solrService = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                      .getProperty("discovery.search.server");
+            String solrService = configurationService.getProperty("discovery.search.server");
 
             UrlValidator urlValidator = new UrlValidator(UrlValidator.ALLOW_LOCAL_URLS);
             if (urlValidator.isValid(solrService) || configurationService
                 .getBooleanProperty("discovery.solr.url.validation.enabled", true)) {
                 try {
-                    log.debug("Solr URL: " + solrService);
+                    log.debug("Solr URL: {}", solrService);
                     HttpSolrClient solrServer = new HttpSolrClient.Builder(solrService)
                             .withHttpClient(httpConnectionPoolService.getClient())
                             .build();
@@ -103,10 +101,13 @@ public class SolrSearchCore {
 
                     solr = solrServer;
                 } catch (SolrServerException | IOException e) {
-                    log.error("Error while initializing solr server", e);
+                    log.error("Error while initializing solr server {}",
+                            solrService, e);
+                    throw new RuntimeException("Failed to contact Solr at " + solrService
+                            + " :  " + e.getMessage());
                 }
             } else {
-                log.error("Error while initializing solr, invalid url: " + solrService);
+                log.error("Error while initializing solr, invalid url: {}", solrService);
             }
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
index f894553e5d..383121072d 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
@@ -8,6 +8,8 @@
 package org.dspace.discovery;
 
 import static java.util.stream.Collectors.joining;
+import static org.dspace.discovery.indexobject.ItemIndexFactoryImpl.STATUS_FIELD;
+import static org.dspace.discovery.indexobject.ItemIndexFactoryImpl.STATUS_FIELD_PREDB;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -118,8 +120,6 @@ public class SolrServiceImpl implements SearchService, IndexingService {
 
     }
 
-
-
     /**
      * If the handle for the "dso" already exists in the index, and the "dso"
      * has a lastModified timestamp that is newer than the document in the index
@@ -166,6 +166,24 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         indexableObjectService.writeDocument(context, indexableObject, solrInputDocument);
     }
 
+    /**
+     * Update the given indexable object using a given service
+     * @param context                   The DSpace Context
+     * @param indexableObjectService    The service to index the object with
+     * @param indexableObject           The object to index
+     * @param preDB                     Add a "preDB" status to the document
+     */
+    protected void update(Context context, IndexFactory indexableObjectService, IndexableObject indexableObject,
+                          boolean preDB) throws IOException, SQLException, SolrServerException {
+        if (preDB) {
+            final SolrInputDocument solrInputDocument =
+                    indexableObjectService.buildNewDocument(context, indexableObject);
+            indexableObjectService.writeDocument(context, indexableObject, solrInputDocument);
+        } else {
+            update(context, indexableObjectService, indexableObject);
+        }
+    }
+
     /**
      * unIndex removes an Item, Collection, or Community
      *
@@ -454,6 +472,16 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         }
     }
 
+    @Override
+    public void atomicUpdate(Context context, String uniqueIndexId, String field, Map<String, Object> fieldModifier)
+            throws SolrServerException, IOException {
+        SolrInputDocument solrInputDocument = new SolrInputDocument();
+        solrInputDocument.addField(SearchUtils.RESOURCE_UNIQUE_ID, uniqueIndexId);
+        solrInputDocument.addField(field, fieldModifier);
+
+        solrSearchCore.getSolr().add(solrInputDocument);
+    }
+
     // //////////////////////////////////
     // Private
     // //////////////////////////////////
@@ -710,16 +738,21 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                 discoveryQuery.addFilterQueries("location:l" + dso.getID());
             } else if (dso instanceof IndexableItem) {
                 discoveryQuery.addFilterQueries(SearchUtils.RESOURCE_UNIQUE_ID + ":" + dso.
-                        getUniqueIndexID());
+                    getUniqueIndexID());
             }
         }
         return search(context, discoveryQuery);
 
     }
 
+    @Override
+    public Iterator<Item> iteratorSearch(Context context, IndexableObject dso, DiscoverQuery query)
+        throws SearchServiceException {
+        return new SearchIterator(context, dso, query);
+    }
 
     @Override
-    public DiscoverResult search(Context context, DiscoverQuery discoveryQuery )
+    public DiscoverResult search(Context context, DiscoverQuery discoveryQuery)
         throws SearchServiceException {
         try {
             if (solrSearchCore.getSolr() == null) {
@@ -733,6 +766,72 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         }
     }
 
+    /**
+     * This class implements an iterator over items that is specifically used to iterate over search results
+     */
+    private class SearchIterator implements Iterator<Item> {
+        private Context context;
+        private DiscoverQuery discoverQuery;
+        private DiscoverResult discoverResult;
+        private IndexableObject dso;
+        private int absoluteCursor;
+        private int relativeCursor;
+        private int pagesize;
+
+        SearchIterator(Context context, DiscoverQuery discoverQuery) throws SearchServiceException {
+            this.context = context;
+            this.discoverQuery = discoverQuery;
+            this.absoluteCursor = discoverQuery.getStart();
+            initialise();
+        }
+
+        SearchIterator(Context context, IndexableObject dso, DiscoverQuery discoverQuery)
+            throws SearchServiceException {
+            this.context = context;
+            this.dso = dso;
+            this.discoverQuery = discoverQuery;
+            initialise();
+        }
+
+        private void initialise() throws SearchServiceException {
+            this.relativeCursor = 0;
+            if (discoverQuery.getMaxResults() != -1) {
+                pagesize = discoverQuery.getMaxResults();
+            } else {
+                pagesize = 10;
+            }
+            discoverQuery.setMaxResults(pagesize);
+            this.discoverResult = search(context, dso, discoverQuery);
+        }
+
+        @Override
+        public boolean hasNext() {
+            return absoluteCursor < discoverResult.getTotalSearchResults();
+        }
+
+        @Override
+        public Item next() {
+            //paginate getting results from the discoverquery.
+            if (relativeCursor == pagesize) {
+                //  get a new page of results when the last element of the previous page has been read
+                int offset = absoluteCursor;
+                // reset the position counter for getting element relativecursor on a page
+                relativeCursor = 0;
+                discoverQuery.setStart(offset);
+                try {
+                    discoverResult = search(context, dso, discoverQuery);
+                } catch (SearchServiceException e) {
+                    log.error("error while getting search results", e);
+                }
+            }
+            // get the element at position relativecursor on a page
+            IndexableObject res = discoverResult.getIndexableObjects().get(relativeCursor);
+            relativeCursor++;
+            absoluteCursor++;
+            return (Item) res.getIndexedObject();
+        }
+    }
+
     protected SolrQuery resolveToSolrQuery(Context context, DiscoverQuery discoveryQuery)
         throws SearchServiceException {
         SolrQuery solrQuery = new SolrQuery();
@@ -753,6 +852,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         solrQuery.addField(SearchUtils.RESOURCE_TYPE_FIELD);
         solrQuery.addField(SearchUtils.RESOURCE_ID_FIELD);
         solrQuery.addField(SearchUtils.RESOURCE_UNIQUE_ID);
+        solrQuery.addField(STATUS_FIELD);
 
         if (discoveryQuery.isSpellCheck()) {
             solrQuery.setParam(SpellingParams.SPELLCHECK_Q, query);
@@ -879,7 +979,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             // if we found stale objects we can decide to skip execution of the remaining code to improve performance
             boolean skipLoadingResponse = false;
             // use zombieDocs to collect stale found objects
-            List<String> zombieDocs = new ArrayList<String>();
+            List<String> zombieDocs = new ArrayList<>();
             QueryResponse solrQueryResponse = solrSearchCore.getSolr().query(solrQuery,
                           solrSearchCore.REQUEST_METHOD);
             if (solrQueryResponse != null) {
@@ -903,11 +1003,14 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                         // Enables solr to remove documents related to items not on database anymore (Stale)
                         // if maxAttemps is greater than 0 cleanup the index on each step
                         if (maxAttempts >= 0) {
-                            zombieDocs.add((String) doc.getFirstValue(SearchUtils.RESOURCE_UNIQUE_ID));
-                            // avoid to process the response except if we are in the last allowed execution.
-                            // When maxAttempts is 0 this will be just the first and last run as the
-                            // executionCount is increased at the start of the loop it will be equals to 1
-                            skipLoadingResponse = maxAttempts + 1 != executionCount;
+                            Object statusObj = doc.getFirstValue(STATUS_FIELD);
+                            if (!(statusObj instanceof String && statusObj.equals(STATUS_FIELD_PREDB))) {
+                                zombieDocs.add((String) doc.getFirstValue(SearchUtils.RESOURCE_UNIQUE_ID));
+                                // avoid to process the response except if we are in the last allowed execution.
+                                // When maxAttempts is 0 this will be just the first and last run as the
+                                // executionCount is increased at the start of the loop it will be equals to 1
+                                skipLoadingResponse = maxAttempts + 1 != executionCount;
+                            }
                         }
                         continue;
                     }
@@ -930,12 +1033,6 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                                 //We need to remove all the "_hl" appendix strings from our keys
                                 Map<String, List<String>> resultMap = new HashMap<>();
                                 for (String key : highlightedFields.keySet()) {
-                                    List<String> highlightOriginalValue = highlightedFields.get(key);
-                                    List<String[]> resultHighlightOriginalValue = new ArrayList<>();
-                                    for (String highlightValue : highlightOriginalValue) {
-                                        String[] splitted = highlightValue.split("###");
-                                        resultHighlightOriginalValue.add(splitted);
-                                    }
                                     resultMap.put(key.substring(0, key.lastIndexOf("_hl")), highlightedFields.get(key));
                                 }
 
@@ -951,7 +1048,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             // If any stale entries are found in the current page of results,
             // we remove those stale entries and rerun the same query again.
             // Otherwise, the query is valid and the results are returned.
-            if (zombieDocs.size() != 0) {
+            if (!zombieDocs.isEmpty()) {
                 log.info("Cleaning " + zombieDocs.size() + " stale objects from Discovery Index");
                 log.info("ZombieDocs ");
                 zombieDocs.forEach(log::info);
@@ -1174,7 +1271,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                 //DO NOT ESCAPE RANGE QUERIES !
                 if (!value.matches("\\[.*TO.*\\]")) {
                     value = ClientUtils.escapeQueryChars(value);
-                    filterQuery.append("(").append(value).append(")");
+                    filterQuery.append("\"").append(value).append("\"");
                 } else {
                     filterQuery.append(value);
                 }
@@ -1389,6 +1486,28 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         }
     }
 
+    @Override
+    public void indexContent(Context context, IndexableObject indexableObject, boolean force,
+                             boolean commit, boolean preDb) throws SearchServiceException, SQLException {
+        if (preDb) {
+            try {
+                final IndexFactory indexableObjectFactory = indexObjectServiceFactory.
+                        getIndexableObjectFactory(indexableObject);
+                if (force || requiresIndexing(indexableObject.getUniqueIndexID(), indexableObject.getLastModified())) {
+                    update(context, indexableObjectFactory, indexableObject, true);
+                    log.info(LogHelper.getHeader(context, "indexed_object", indexableObject.getUniqueIndexID()));
+                }
+            } catch (IOException | SQLException | SolrServerException | SearchServiceException e) {
+                log.error(e.getMessage(), e);
+            }
+        } else {
+            indexContent(context, indexableObject, force);
+        }
+        if (commit) {
+            commit();
+        }
+    }
+
     @Override
     public void commit() throws SearchServiceException {
         try {
@@ -1442,4 +1561,5 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         }
         return null;
     }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
index 8660bbebc7..55c99b168e 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
@@ -70,10 +70,20 @@ public abstract class IndexFactoryImpl<T extends IndexableObject, S> implements
         return doc;
     }
 
+    @Override
+    public SolrInputDocument buildNewDocument(Context context, T indexableObject) throws SQLException, IOException {
+        return buildDocument(context, indexableObject);
+    }
+
     @Override
     public void writeDocument(Context context, T indexableObject, SolrInputDocument solrInputDocument)
             throws SQLException, IOException, SolrServerException {
-        writeDocument(solrInputDocument, null);
+        try {
+            writeDocument(solrInputDocument, null);
+        } catch (Exception e) {
+            log.error("Error occurred while writing SOLR document for {} object {}",
+                      indexableObject.getType(), indexableObject.getID(), e);
+        }
     }
 
     /**
@@ -95,7 +105,6 @@ public abstract class IndexFactoryImpl<T extends IndexableObject, S> implements
                                                                            100000);
 
                 // Use Tika's Text parser as the streams are always from the TEXT bundle (i.e. already extracted text)
-                // TODO: We may wish to consider using Tika to extract the text in the future.
                 TextAndCSVParser tikaParser = new TextAndCSVParser();
                 BodyContentHandler tikaHandler = new BodyContentHandler(charLimit);
                 Metadata tikaMetadata = new Metadata();
@@ -114,9 +123,11 @@ public abstract class IndexFactoryImpl<T extends IndexableObject, S> implements
                         log.info("Full text is larger than the configured limit (discovery.solr.fulltext.charLimit)."
                                      + " Only the first {} characters were indexed.", charLimit);
                     } else {
+                        log.error("Tika parsing error. Could not index full text.", saxe);
                         throw new IOException("Tika parsing error. Could not index full text.", saxe);
                     }
                 } catch (TikaException ex) {
+                    log.error("Tika parsing error. Could not index full text.", ex);
                     throw new IOException("Tika parsing error. Could not index full text.", ex);
                 }
 
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
index e9f18ae949..15a74b45d1 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
@@ -10,7 +10,6 @@ package org.dspace.discovery.indexobject;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -43,7 +42,6 @@ import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
 import org.dspace.discovery.FullTextContentStreams;
-import org.dspace.discovery.IndexableObject;
 import org.dspace.discovery.SearchUtils;
 import org.dspace.discovery.configuration.DiscoveryConfiguration;
 import org.dspace.discovery.configuration.DiscoveryConfigurationParameters;
@@ -64,6 +62,9 @@ import org.dspace.handle.service.HandleService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.util.MultiFormatDateParser;
 import org.dspace.util.SolrUtils;
+import org.dspace.versioning.Version;
+import org.dspace.versioning.VersionHistory;
+import org.dspace.versioning.service.VersionHistoryService;
 import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.dspace.xmlworkflow.storedcomponents.service.XmlWorkflowItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +79,8 @@ public class ItemIndexFactoryImpl extends DSpaceObjectIndexFactoryImpl<Indexable
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemIndexFactoryImpl.class);
     public static final String VARIANTS_STORE_SEPARATOR = "###";
     public static final String STORE_SEPARATOR = "\n|||\n";
+    public static final String STATUS_FIELD = "database_status";
+    public static final String STATUS_FIELD_PREDB = "predb";
 
 
     @Autowired
@@ -96,11 +99,13 @@ public class ItemIndexFactoryImpl extends DSpaceObjectIndexFactoryImpl<Indexable
     protected WorkflowItemIndexFactory workflowItemIndexFactory;
     @Autowired
     protected WorkspaceItemIndexFactory workspaceItemIndexFactory;
+    @Autowired
+    protected VersionHistoryService versionHistoryService;
 
 
     @Override
     public Iterator<IndexableItem> findAll(Context context) throws SQLException {
-        Iterator<Item> items = itemService.findAllUnfiltered(context);
+        Iterator<Item> items = itemService.findAllRegularItems(context);
         return new Iterator<IndexableItem>() {
             @Override
             public boolean hasNext() {
@@ -139,6 +144,7 @@ public class ItemIndexFactoryImpl extends DSpaceObjectIndexFactoryImpl<Indexable
         doc.addField("withdrawn", item.isWithdrawn());
         doc.addField("discoverable", item.isDiscoverable());
         doc.addField("lastModified", SolrUtils.getDateFormatter().format(item.getLastModified()));
+        doc.addField("latestVersion", isLatestVersion(context, item));
 
         EPerson submitter = item.getSubmitter();
         if (submitter != null) {
@@ -169,6 +175,51 @@ public class ItemIndexFactoryImpl extends DSpaceObjectIndexFactoryImpl<Indexable
         return doc;
     }
 
+    /**
+     * Check whether the given item is the latest version.
+     * If the latest item cannot be determined, because either the version history or the latest version is not present,
+     * assume the item is latest.
+     * @param context the DSpace context.
+     * @param item the item that should be checked.
+     * @return true if the item is the latest version, false otherwise.
+     */
+    protected boolean isLatestVersion(Context context, Item item) throws SQLException {
+        VersionHistory history = versionHistoryService.findByItem(context, item);
+        if (history == null) {
+            // not all items have a version history
+            // if an item does not have a version history, it is by definition the latest version
+            return true;
+        }
+
+        // start with the very latest version of the given item (may still be in workspace)
+        Version latestVersion = versionHistoryService.getLatestVersion(context, history);
+
+        // find the latest version of the given item that is archived
+        while (latestVersion != null && !latestVersion.getItem().isArchived()) {
+            latestVersion = versionHistoryService.getPrevious(context, history, latestVersion);
+        }
+
+        // could not find an archived version of the given item
+        if (latestVersion == null) {
+            // this scenario should never happen, but let's err on the side of showing too many items vs. to little
+            // (see discovery.xml, a lot of discovery configs filter out all items that are not the latest version)
+            return true;
+        }
+
+        // sanity check
+        assert latestVersion.getItem().isArchived();
+
+        return item.equals(latestVersion.getItem());
+    }
+
+    @Override
+    public SolrInputDocument buildNewDocument(Context context, IndexableItem indexableItem)
+            throws SQLException, IOException {
+        SolrInputDocument doc = buildDocument(context, indexableItem);
+        doc.addField(STATUS_FIELD, STATUS_FIELD_PREDB);
+        return doc;
+    }
+
     @Override
     public void addDiscoveryFields(SolrInputDocument doc, Context context, Item item,
                                    List<DiscoveryConfiguration> discoveryConfigurations)
@@ -713,26 +764,31 @@ public class ItemIndexFactoryImpl extends DSpaceObjectIndexFactoryImpl<Indexable
     }
 
     @Override
-    public List getIndexableObjects(Context context, Item object) throws SQLException {
-        List<IndexableObject> results = new ArrayList<>();
-        if (object.isArchived() || object.isWithdrawn()) {
-            // We only want to index an item as an item if it is not in workflow
-            results.addAll(Arrays.asList(new IndexableItem(object)));
-        } else {
-            // Check if we have a workflow / workspace item
-            final WorkspaceItem workspaceItem = workspaceItemService.findByItem(context, object);
-            if (workspaceItem != null) {
-                results.addAll(workspaceItemIndexFactory.getIndexableObjects(context, workspaceItem));
-            } else {
-                // Check if we a workflow item
-                final XmlWorkflowItem xmlWorkflowItem = xmlWorkflowItemService.findByItem(context, object);
-                if (xmlWorkflowItem != null) {
-                    results.addAll(workflowItemIndexFactory.getIndexableObjects(context, xmlWorkflowItem));
-                }
-            }
+    public List getIndexableObjects(Context context, Item item) throws SQLException {
+        if (item.isArchived() || item.isWithdrawn()) {
+            // we only want to index an item as an item if it is not in workflow
+            return List.of(new IndexableItem(item));
         }
 
-        return results;
+        final WorkspaceItem workspaceItem = workspaceItemService.findByItem(context, item);
+        if (workspaceItem != null) {
+            // a workspace item is linked to the given item
+            return List.copyOf(workspaceItemIndexFactory.getIndexableObjects(context, workspaceItem));
+        }
+
+        final XmlWorkflowItem xmlWorkflowItem = xmlWorkflowItemService.findByItem(context, item);
+        if (xmlWorkflowItem != null) {
+            // a workflow item is linked to the given item
+            return List.copyOf(workflowItemIndexFactory.getIndexableObjects(context, xmlWorkflowItem));
+        }
+
+        if (!isLatestVersion(context, item)) {
+            // the given item is an older version of another item
+            return List.of(new IndexableItem(item));
+        }
+
+        // nothing to index
+        return List.of();
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/factory/IndexFactory.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/factory/IndexFactory.java
index 6644da248d..7946311796 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/factory/IndexFactory.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/factory/IndexFactory.java
@@ -46,6 +46,14 @@ public interface IndexFactory<T extends IndexableObject, S> {
      */
     SolrInputDocument buildDocument(Context context, T indexableObject) throws SQLException, IOException;
 
+    /**
+     * Create solr document with all the shared fields initialized.
+     * Can contain special fields required for "new" documents vs regular buildDocument
+     * @param indexableObject   the indexableObject that we want to index
+     * @return                  initialized solr document
+     */
+    SolrInputDocument buildNewDocument(Context context, T indexableObject) throws SQLException, IOException;
+
     /**
      * Write the provided document to the solr core
      * @param context               DSpace context object
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DiscoverQueryBuilder.java b/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
similarity index 58%
rename from dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DiscoverQueryBuilder.java
rename to dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
index add7cb45ed..fa5cc32813 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DiscoverQueryBuilder.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.rest.utils;
+package org.dspace.discovery.utils;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
@@ -19,10 +19,6 @@ import java.util.Objects;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
-import org.dspace.app.rest.converter.query.SearchQueryConverter;
-import org.dspace.app.rest.exception.DSpaceBadRequestException;
-import org.dspace.app.rest.exception.InvalidSearchRequestException;
-import org.dspace.app.rest.parameter.SearchFilter;
 import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
 import org.dspace.discovery.DiscoverFacetField;
@@ -32,6 +28,7 @@ import org.dspace.discovery.DiscoverQuery;
 import org.dspace.discovery.FacetYearRange;
 import org.dspace.discovery.IndexableObject;
 import org.dspace.discovery.SearchService;
+import org.dspace.discovery.SearchServiceException;
 import org.dspace.discovery.configuration.DiscoveryConfiguration;
 import org.dspace.discovery.configuration.DiscoveryConfigurationParameters;
 import org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration;
@@ -40,17 +37,11 @@ import org.dspace.discovery.configuration.DiscoverySearchFilterFacet;
 import org.dspace.discovery.configuration.DiscoverySortConfiguration;
 import org.dspace.discovery.configuration.DiscoverySortFieldConfiguration;
 import org.dspace.discovery.indexobject.factory.IndexFactory;
+import org.dspace.discovery.utils.parameter.QueryBuilderSearchFilter;
 import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Component;
 
-/**
- * This class builds the queries for the /search and /facet endpoints.
- */
-@Component
 public class DiscoverQueryBuilder implements InitializingBean {
 
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(DiscoverQueryBuilder.class);
@@ -74,51 +65,60 @@ public class DiscoverQueryBuilder implements InitializingBean {
     /**
      * Build a discovery query
      *
-     * @param context                   the DSpace context
-     * @param scope                     the scope for this discovery query
-     * @param discoveryConfiguration    the discovery configuration for this discovery query
-     * @param query                     the query string for this discovery query
-     * @param searchFilters             the search filters for this discovery query
-     * @param dsoType                   only include search results with this type
-     * @param page                      the pageable for this discovery query
+     * @param context                the DSpace context
+     * @param scope                  the scope for this discovery query
+     * @param discoveryConfiguration the discovery configuration for this discovery query
+     * @param query                  the query string for this discovery query
+     * @param searchFilters          the search filters for this discovery query
+     * @param dsoType                only include search results with this type
+     * @param pageSize               the page size for this discovery query
+     * @param offset                 the offset for this discovery query
+     * @param sortProperty           the sort property for this discovery query
+     * @param sortDirection          the sort direction for this discovery query
      */
     public DiscoverQuery buildQuery(Context context, IndexableObject scope,
                                     DiscoveryConfiguration discoveryConfiguration,
-                                    String query, List<SearchFilter> searchFilters,
-                                    String dsoType, Pageable page)
-        throws DSpaceBadRequestException {
+                                    String query, List<QueryBuilderSearchFilter> searchFilters,
+                                    String dsoType, Integer pageSize, Long offset, String sortProperty,
+                                    String sortDirection) throws SearchServiceException {
 
         List<String> dsoTypes = dsoType != null ? singletonList(dsoType) : emptyList();
 
-        return buildQuery(context, scope, discoveryConfiguration, query, searchFilters, dsoTypes, page);
+        return buildQuery(context, scope, discoveryConfiguration, query, searchFilters, dsoTypes, pageSize, offset,
+                          sortProperty, sortDirection);
     }
 
+
     /**
      * Build a discovery query
      *
-     * @param context                   the DSpace context
-     * @param scope                     the scope for this discovery query
-     * @param discoveryConfiguration    the discovery configuration for this discovery query
-     * @param query                     the query string for this discovery query
-     * @param searchFilters             the search filters for this discovery query
-     * @param dsoTypes                  only include search results with one of these types
-     * @param page                      the pageable for this discovery query
+     * @param context                the DSpace context
+     * @param scope                  the scope for this discovery query
+     * @param discoveryConfiguration the discovery configuration for this discovery query
+     * @param query                  the query string for this discovery query
+     * @param searchFilters          the search filters for this discovery query
+     * @param dsoTypes               only include search results with one of these types
+     * @param pageSize               the page size for this discovery query
+     * @param offset                 the offset for this discovery query
+     * @param sortProperty           the sort property for this discovery query
+     * @param sortDirection          the sort direction for this discovery query
      */
     public DiscoverQuery buildQuery(Context context, IndexableObject scope,
                                     DiscoveryConfiguration discoveryConfiguration,
-                                    String query, List<SearchFilter> searchFilters,
-                                    List<String> dsoTypes, Pageable page)
-        throws DSpaceBadRequestException {
+                                    String query, List<QueryBuilderSearchFilter> searchFilters,
+                                    List<String> dsoTypes, Integer pageSize, Long offset, String sortProperty,
+                                    String sortDirection)
+            throws IllegalArgumentException, SearchServiceException {
 
         DiscoverQuery queryArgs = buildCommonDiscoverQuery(context, discoveryConfiguration, query, searchFilters,
-                dsoTypes);
+                                                           dsoTypes);
 
         //When all search criteria are set, configure facet results
         addFaceting(context, scope, queryArgs, discoveryConfiguration);
 
         //Configure pagination and sorting
-        configurePagination(page, queryArgs);
-        configureSorting(page, queryArgs, discoveryConfiguration.getSearchSortConfiguration());
+        configurePagination(pageSize, offset, queryArgs);
+        configureSorting(sortProperty, sortDirection, queryArgs, discoveryConfiguration.getSearchSortConfiguration());
 
         addDiscoveryHitHighlightFields(discoveryConfiguration, queryArgs);
         return queryArgs;
@@ -128,11 +128,11 @@ public class DiscoverQueryBuilder implements InitializingBean {
                                                 DiscoverQuery queryArgs) {
         if (discoveryConfiguration.getHitHighlightingConfiguration() != null) {
             List<DiscoveryHitHighlightFieldConfiguration> metadataFields = discoveryConfiguration
-                .getHitHighlightingConfiguration().getMetadataFields();
+                    .getHitHighlightingConfiguration().getMetadataFields();
             for (DiscoveryHitHighlightFieldConfiguration fieldConfiguration : metadataFields) {
                 queryArgs.addHitHighlightingField(
-                    new DiscoverHitHighlightingField(fieldConfiguration.getField(), fieldConfiguration.getMaxSize(),
-                                                     fieldConfiguration.getSnippets()));
+                        new DiscoverHitHighlightingField(fieldConfiguration.getField(), fieldConfiguration.getMaxSize(),
+                                                         fieldConfiguration.getSnippets()));
             }
         }
     }
@@ -140,92 +140,97 @@ public class DiscoverQueryBuilder implements InitializingBean {
     /**
      * Create a discovery facet query.
      *
-     * @param context                   the DSpace context
-     * @param scope                     the scope for this discovery query
-     * @param discoveryConfiguration    the discovery configuration for this discovery query
-     * @param prefix                    limit the facets results to those starting with the given prefix.
-     * @param query                     the query string for this discovery query
-     * @param searchFilters             the search filters for this discovery query
-     * @param dsoType                   only include search results with this type
-     * @param page                      the pageable for this discovery query
-     * @param facetName                 the facet field
+     * @param context                the DSpace context
+     * @param scope                  the scope for this discovery query
+     * @param discoveryConfiguration the discovery configuration for this discovery query
+     * @param prefix                 limit the facets results to those starting with the given prefix.
+     * @param query                  the query string for this discovery query
+     * @param searchFilters          the search filters for this discovery query
+     * @param dsoType                only include search results with this type
+     * @param pageSize               the page size for this discovery query
+     * @param offset                 the offset for this discovery query
+     * @param facetName              the facet field
      */
     public DiscoverQuery buildFacetQuery(Context context, IndexableObject scope,
                                          DiscoveryConfiguration discoveryConfiguration,
-                                         String prefix, String query, List<SearchFilter> searchFilters,
-                                         String dsoType, Pageable page, String facetName)
-        throws DSpaceBadRequestException {
+                                         String prefix, String query, List<QueryBuilderSearchFilter> searchFilters,
+                                         String dsoType, Integer pageSize, Long offset, String facetName)
+            throws IllegalArgumentException {
 
         List<String> dsoTypes = dsoType != null ? singletonList(dsoType) : emptyList();
 
         return buildFacetQuery(
-                context, scope, discoveryConfiguration, prefix, query, searchFilters, dsoTypes, page, facetName);
+                context, scope, discoveryConfiguration, prefix, query, searchFilters, dsoTypes, pageSize, offset,
+                facetName);
     }
 
     /**
      * Create a discovery facet query.
      *
-     * @param context                   the DSpace context
-     * @param scope                     the scope for this discovery query
-     * @param discoveryConfiguration    the discovery configuration for this discovery query
-     * @param prefix                    limit the facets results to those starting with the given prefix.
-     * @param query                     the query string for this discovery query
-     * @param searchFilters             the search filters for this discovery query
-     * @param dsoTypes                  only include search results with one of these types
-     * @param page                      the pageable for this discovery query
-     * @param facetName                 the facet field
+     * @param context                the DSpace context
+     * @param scope                  the scope for this discovery query
+     * @param discoveryConfiguration the discovery configuration for this discovery query
+     * @param prefix                 limit the facets results to those starting with the given prefix.
+     * @param query                  the query string for this discovery query
+     * @param searchFilters          the search filters for this discovery query
+     * @param dsoTypes               only include search results with one of these types
+     * @param pageSize               the page size for this discovery query
+     * @param offset                 the offset for this discovery query
+     * @param facetName              the facet field
      */
     public DiscoverQuery buildFacetQuery(Context context, IndexableObject scope,
                                          DiscoveryConfiguration discoveryConfiguration,
-                                         String prefix, String query, List<SearchFilter> searchFilters,
-                                         List<String> dsoTypes, Pageable page, String facetName)
-        throws DSpaceBadRequestException {
+                                         String prefix, String query, List<QueryBuilderSearchFilter> searchFilters,
+                                         List<String> dsoTypes, Integer pageSize, Long offset, String facetName)
+            throws IllegalArgumentException {
 
         DiscoverQuery queryArgs = buildCommonDiscoverQuery(context, discoveryConfiguration, query, searchFilters,
                                                            dsoTypes);
 
         //When all search criteria are set, configure facet results
-        addFacetingForFacets(context, scope, prefix, queryArgs, discoveryConfiguration, facetName, page);
+        addFacetingForFacets(context, scope, prefix, queryArgs, discoveryConfiguration, facetName, pageSize);
 
         //We don' want any search results, we only want facet values
         queryArgs.setMaxResults(0);
 
         //Configure pagination
-        configurePaginationForFacets(page, queryArgs);
+        configurePaginationForFacets(offset, queryArgs);
 
         return queryArgs;
     }
 
-    private void configurePaginationForFacets(Pageable page, DiscoverQuery queryArgs) {
-        if (page != null) {
-            queryArgs.setFacetOffset(Math.toIntExact(page.getOffset()));
+    private void configurePaginationForFacets(Long offset, DiscoverQuery queryArgs) {
+        if (offset != null) {
+            queryArgs.setFacetOffset(Math.toIntExact(offset));
         }
     }
 
     private DiscoverQuery addFacetingForFacets(Context context, IndexableObject scope, String prefix,
-            DiscoverQuery queryArgs, DiscoveryConfiguration discoveryConfiguration, String facetName, Pageable page)
-            throws DSpaceBadRequestException {
+                                               DiscoverQuery queryArgs, DiscoveryConfiguration discoveryConfiguration,
+                                               String facetName, Integer pageSize)
+            throws IllegalArgumentException {
 
         DiscoverySearchFilterFacet facet = discoveryConfiguration.getSidebarFacet(facetName);
         if (facet != null) {
             queryArgs.setFacetMinCount(1);
-            int pageSize = Math.min(pageSizeLimit, page.getPageSize());
+
+            pageSize = pageSize != null ? Math.min(pageSizeLimit, pageSize) : pageSizeLimit;
 
             fillFacetIntoQueryArgs(context, scope, prefix, queryArgs, facet, pageSize);
 
         } else {
-            throw new DSpaceBadRequestException(facetName + " is not a valid search facet");
+            throw new IllegalArgumentException(facetName + " is not a valid search facet");
         }
 
         return queryArgs;
     }
 
     private void fillFacetIntoQueryArgs(Context context, IndexableObject scope, String prefix,
-            DiscoverQuery queryArgs, DiscoverySearchFilterFacet facet, final int pageSize) {
+                                        DiscoverQuery queryArgs, DiscoverySearchFilterFacet facet, final int pageSize) {
         if (facet.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)) {
             try {
                 FacetYearRange facetYearRange =
-                    searchService.getFacetYearRange(context, scope, facet, queryArgs.getFilterQueries(), queryArgs);
+                        searchService.getFacetYearRange(context, scope, facet, queryArgs.getFilterQueries(), queryArgs);
 
                 queryArgs.addYearRangeFacet(facet, facetYearRange);
 
@@ -240,19 +245,20 @@ public class DiscoverQueryBuilder implements InitializingBean {
             // "show more" url
             int facetLimit = pageSize + 1;
             //This should take care of the sorting for us
+            prefix = StringUtils.isNotBlank(prefix) ? prefix.toLowerCase() : null;
             queryArgs.addFacetField(new DiscoverFacetField(facet.getIndexFieldName(), facet.getType(), facetLimit,
-                    facet.getSortOrderSidebar(), StringUtils.trimToNull(prefix)));
+                                                           facet.getSortOrderSidebar(),
+                                                           StringUtils.trimToNull(prefix)));
         }
     }
 
     private DiscoverQuery buildCommonDiscoverQuery(Context context, DiscoveryConfiguration discoveryConfiguration,
                                                    String query,
-                                                   List<SearchFilter> searchFilters, List<String> dsoTypes)
-        throws DSpaceBadRequestException {
+                                                   List<QueryBuilderSearchFilter> searchFilters, List<String> dsoTypes)
+            throws IllegalArgumentException {
         DiscoverQuery queryArgs = buildBaseQueryForConfiguration(discoveryConfiguration);
 
-        //Add search filters
-        queryArgs.addFilterQueries(convertFilters(context, discoveryConfiguration, searchFilters));
+        queryArgs.addFilterQueries(convertFiltersToString(context, discoveryConfiguration, searchFilters));
 
         //Set search query
         if (StringUtils.isNotBlank(query)) {
@@ -274,30 +280,17 @@ public class DiscoverQueryBuilder implements InitializingBean {
         queryArgs.setDiscoveryConfigurationName(discoveryConfiguration.getId());
         queryArgs.addFilterQueries(discoveryConfiguration.getDefaultFilterQueries()
                                                          .toArray(
-                                                             new String[discoveryConfiguration.getDefaultFilterQueries()
-                                                                                              .size()]));
+                                                                 new String[discoveryConfiguration
+                                                                         .getDefaultFilterQueries()
+                                                                         .size()]));
         return queryArgs;
     }
 
-    private void configureSorting(Pageable page, DiscoverQuery queryArgs,
-                                  DiscoverySortConfiguration searchSortConfiguration) throws DSpaceBadRequestException {
-        String sortBy = null;
-        String sortOrder = null;
-
-        //Read the Pageable object if there is one
-        if (page != null) {
-            Sort sort = page.getSort();
-            if (sort != null && sort.iterator().hasNext()) {
-                Sort.Order order = sort.iterator().next();
-                sortBy = order.getProperty();
-                sortOrder = order.getDirection().name();
-            }
-        }
-
-        if (StringUtils.isNotBlank(sortBy) && !isConfigured(sortBy, searchSortConfiguration)) {
-            throw new InvalidSearchRequestException(
-                         "The field: " + sortBy + "is not configured for the configuration!");
-        }
+    private void configureSorting(String sortProperty, String sortDirection, DiscoverQuery queryArgs,
+                                  DiscoverySortConfiguration searchSortConfiguration)
+            throws IllegalArgumentException, SearchServiceException {
+        String sortBy = sortProperty;
+        String sortOrder = sortDirection;
 
         //Load defaults if we did not receive values
         if (sortBy == null) {
@@ -307,24 +300,30 @@ public class DiscoverQueryBuilder implements InitializingBean {
             sortOrder = getDefaultSortDirection(searchSortConfiguration, sortOrder);
         }
 
+        if (StringUtils.isNotBlank(sortBy) && !isConfigured(sortBy, searchSortConfiguration)) {
+            throw new SearchServiceException(
+                    "The field: " + sortBy + "is not configured for the configuration!");
+        }
+
+
         //Update Discovery query
         DiscoverySortFieldConfiguration sortFieldConfiguration = searchSortConfiguration
-            .getSortFieldConfiguration(sortBy);
+                .getSortFieldConfiguration(sortBy);
 
         if (sortFieldConfiguration != null) {
             String sortField = searchService
-                .toSortFieldIndex(sortFieldConfiguration.getMetadataField(), sortFieldConfiguration.getType());
+                    .toSortFieldIndex(sortFieldConfiguration.getMetadataField(), sortFieldConfiguration.getType());
 
             if ("asc".equalsIgnoreCase(sortOrder)) {
                 queryArgs.setSortField(sortField, DiscoverQuery.SORT_ORDER.asc);
             } else if ("desc".equalsIgnoreCase(sortOrder)) {
                 queryArgs.setSortField(sortField, DiscoverQuery.SORT_ORDER.desc);
             } else {
-                throw new DSpaceBadRequestException(sortOrder + " is not a valid sort order");
+                throw new IllegalArgumentException(sortOrder + " is not a valid sort order");
             }
 
         } else {
-            throw new DSpaceBadRequestException(sortBy + " is not a valid sort field");
+            throw new IllegalArgumentException(sortBy + " is not a valid sort field");
         }
     }
 
@@ -334,7 +333,7 @@ public class DiscoverQueryBuilder implements InitializingBean {
 
     private String getDefaultSortDirection(DiscoverySortConfiguration searchSortConfiguration, String sortOrder) {
         if (Objects.nonNull(searchSortConfiguration.getSortFields()) &&
-            !searchSortConfiguration.getSortFields().isEmpty()) {
+                !searchSortConfiguration.getSortFields().isEmpty()) {
             sortOrder = searchSortConfiguration.getSortFields().get(0).getDefaultSortOrder().name();
         }
         return sortOrder;
@@ -344,7 +343,7 @@ public class DiscoverQueryBuilder implements InitializingBean {
         String sortBy;// Attempt to find the default one, if none found we use SCORE
         sortBy = "score";
         if (Objects.nonNull(searchSortConfiguration.getSortFields()) &&
-            !searchSortConfiguration.getSortFields().isEmpty()) {
+                !searchSortConfiguration.getSortFields().isEmpty()) {
             DiscoverySortFieldConfiguration defaultSort = searchSortConfiguration.getSortFields().get(0);
             if (StringUtils.isBlank(defaultSort.getMetadataField())) {
                 return sortBy;
@@ -354,66 +353,31 @@ public class DiscoverQueryBuilder implements InitializingBean {
         return sortBy;
     }
 
-    private void configurePagination(Pageable page, DiscoverQuery queryArgs) {
-        if (page != null) {
-            queryArgs.setMaxResults(Math.min(pageSizeLimit, page.getPageSize()));
-            queryArgs.setStart(Math.toIntExact(page.getOffset()));
-        } else {
-            queryArgs.setMaxResults(pageSizeLimit);
-            queryArgs.setStart(0);
-        }
+    private void configurePagination(Integer size, Long offset, DiscoverQuery queryArgs) {
+        queryArgs.setMaxResults(size != null ? Math.min(pageSizeLimit, size) : pageSizeLimit);
+        queryArgs.setStart(offset != null ? Math.toIntExact(offset) : 0);
     }
 
-    private String getDsoType(String dsoType) throws DSpaceBadRequestException {
+    private String getDsoType(String dsoType) throws IllegalArgumentException {
         for (IndexFactory indexFactory : indexableFactories) {
             if (StringUtils.equalsIgnoreCase(indexFactory.getType(), dsoType)) {
                 return indexFactory.getType();
             }
         }
-        throw new DSpaceBadRequestException(dsoType + " is not a valid DSpace Object type");
+        throw new IllegalArgumentException(dsoType + " is not a valid DSpace Object type");
     }
 
     public void setIndexableFactories(List<IndexFactory> indexableFactories) {
         this.indexableFactories = indexableFactories;
     }
 
-    private String[] convertFilters(Context context, DiscoveryConfiguration discoveryConfiguration,
-                                    List<SearchFilter> searchFilters) throws DSpaceBadRequestException {
-        ArrayList<String> filterQueries = new ArrayList<>(CollectionUtils.size(searchFilters));
-
-        SearchQueryConverter searchQueryConverter = new SearchQueryConverter();
-        List<SearchFilter> transformedFilters = searchQueryConverter.convert(searchFilters);
-        try {
-            for (SearchFilter searchFilter : CollectionUtils.emptyIfNull(transformedFilters)) {
-                DiscoverySearchFilter filter = discoveryConfiguration.getSearchFilter(searchFilter.getName());
-                if (filter == null) {
-                    throw new DSpaceBadRequestException(searchFilter.getName() + " is not a valid search filter");
-                }
-
-                DiscoverFilterQuery filterQuery = searchService.toFilterQuery(context,
-                                                                              filter.getIndexFieldName(),
-                                                                              searchFilter.getOperator(),
-                                                                              searchFilter.getValue(),
-                                                                              discoveryConfiguration);
-
-                if (filterQuery != null) {
-                    filterQueries.add(filterQuery.getFilterQuery());
-                }
-            }
-        } catch (SQLException e) {
-            throw new DSpaceBadRequestException("There was a problem parsing the search filters.", e);
-        }
-
-        return filterQueries.toArray(new String[filterQueries.size()]);
-    }
-
     private DiscoverQuery addFaceting(Context context, IndexableObject scope, DiscoverQuery queryArgs,
                                       DiscoveryConfiguration discoveryConfiguration) {
 
         List<DiscoverySearchFilterFacet> facets = discoveryConfiguration.getSidebarFacets();
 
         log.debug("facets for configuration " + discoveryConfiguration.getId() + ": " + (facets != null ? facets
-            .size() : null));
+                .size() : null));
 
         if (facets != null) {
             queryArgs.setFacetMinCount(1);
@@ -427,4 +391,34 @@ public class DiscoverQueryBuilder implements InitializingBean {
         return queryArgs;
     }
 
+    private String[] convertFiltersToString(Context context, DiscoveryConfiguration discoveryConfiguration,
+                                            List<QueryBuilderSearchFilter> searchFilters)
+            throws IllegalArgumentException {
+        ArrayList<String> filterQueries = new ArrayList<>(CollectionUtils.size(searchFilters));
+
+        try {
+            for (QueryBuilderSearchFilter searchFilter : CollectionUtils.emptyIfNull(searchFilters)) {
+                DiscoverySearchFilter filter = discoveryConfiguration.getSearchFilter(searchFilter.getName());
+                if (filter == null) {
+                    throw new IllegalArgumentException(searchFilter.getName() + " is not a valid search filter");
+                }
+
+                DiscoverFilterQuery filterQuery = searchService.toFilterQuery(context,
+                                                                              filter.getIndexFieldName(),
+                                                                              searchFilter.getOperator(),
+                                                                              searchFilter.getValue(),
+                                                                              discoveryConfiguration);
+
+                if (filterQuery != null) {
+                    filterQueries.add(filterQuery.getFilterQuery());
+                }
+            }
+        } catch (SQLException e) {
+            throw new IllegalArgumentException("There was a problem parsing the search filters.", e);
+        }
+
+        return filterQueries.toArray(new String[filterQueries.size()]);
+    }
+
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/utils/parameter/QueryBuilderSearchFilter.java b/dspace-api/src/main/java/org/dspace/discovery/utils/parameter/QueryBuilderSearchFilter.java
new file mode 100644
index 0000000000..f1d16070de
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/utils/parameter/QueryBuilderSearchFilter.java
@@ -0,0 +1,70 @@
+/**
+ * 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/
+ */
+package org.dspace.discovery.utils.parameter;
+
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Representation for a Discovery search filter
+ */
+public class QueryBuilderSearchFilter {
+
+    private String name;
+    private String operator;
+    private String value;
+
+    public QueryBuilderSearchFilter(final String name, final String operator, final String value) {
+        this.name = name;
+        this.operator = operator;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String toString() {
+        return "QueryBuilderSearchFilter{" +
+                "name='" + name + '\'' +
+                ", operator='" + operator + '\'' +
+                ", value='" + value + '\'' +
+                '}';
+    }
+
+    public boolean equals(Object object) {
+        if (object instanceof QueryBuilderSearchFilter) {
+            QueryBuilderSearchFilter obj = (QueryBuilderSearchFilter) object;
+
+            if (!StringUtils.equals(obj.getName(), getName())) {
+                return false;
+            }
+            if (!StringUtils.equals(obj.getOperator(), getOperator())) {
+                return false;
+            }
+            if (!StringUtils.equals(obj.getValue(), getValue())) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public int hashCode() {
+        return Objects.hash(name, operator, value);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/disseminate/CitationDocumentServiceImpl.java b/dspace-api/src/main/java/org/dspace/disseminate/CitationDocumentServiceImpl.java
index d51a3dfc7f..c20961db75 100644
--- a/dspace-api/src/main/java/org/dspace/disseminate/CitationDocumentServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/disseminate/CitationDocumentServiceImpl.java
@@ -8,7 +8,6 @@
 package org.dspace.disseminate;
 
 import java.awt.Color;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -297,7 +296,7 @@ public class CitationDocumentServiceImpl implements CitationDocumentService, Ini
     }
 
     @Override
-    public Pair<InputStream, Long> makeCitedDocument(Context context, Bitstream bitstream)
+    public Pair<byte[], Long> makeCitedDocument(Context context, Bitstream bitstream)
             throws IOException, SQLException, AuthorizeException {
         PDDocument document = new PDDocument();
         PDDocument sourceDocument = new PDDocument();
@@ -318,7 +317,7 @@ public class CitationDocumentServiceImpl implements CitationDocumentService, Ini
                 document.save(out);
 
                 byte[] data = out.toByteArray();
-                return Pair.of(new ByteArrayInputStream(data), Long.valueOf(data.length));
+                return Pair.of(data, Long.valueOf(data.length));
             }
 
         } finally {
diff --git a/dspace-api/src/main/java/org/dspace/disseminate/service/CitationDocumentService.java b/dspace-api/src/main/java/org/dspace/disseminate/service/CitationDocumentService.java
index 4a59de3f5f..0566fc525c 100644
--- a/dspace-api/src/main/java/org/dspace/disseminate/service/CitationDocumentService.java
+++ b/dspace-api/src/main/java/org/dspace/disseminate/service/CitationDocumentService.java
@@ -8,7 +8,6 @@
 package org.dspace.disseminate.service;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.tuple.Pair;
@@ -84,7 +83,7 @@ public interface CitationDocumentService {
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public Pair<InputStream, Long> makeCitedDocument(Context context, Bitstream bitstream)
+    public Pair<byte[], Long> makeCitedDocument(Context context, Bitstream bitstream)
             throws IOException, SQLException, AuthorizeException;
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
index 25c61f511a..d873d7230c 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
@@ -12,7 +12,6 @@ import java.sql.SQLException;
 import java.util.Locale;
 import javax.mail.MessagingException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
@@ -178,14 +177,6 @@ public class AccountServiceImpl implements AccountService {
         registrationDataService.deleteByToken(context, token);
     }
 
-    @Override
-    public boolean verifyPasswordStructure(String password) {
-        if (StringUtils.length(password) < 6) {
-            return false;
-        }
-        return true;
-    }
-
     /**
      * THIS IS AN INTERNAL METHOD. THE SEND PARAMETER ALLOWS IT TO BE USED FOR
      * TESTING PURPOSES.
diff --git a/dspace-api/src/main/java/org/dspace/eperson/CaptchaServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/CaptchaServiceImpl.java
new file mode 100644
index 0000000000..0ab66aea5c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/CaptchaServiceImpl.java
@@ -0,0 +1,125 @@
+/**
+ * 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/
+ */
+package org.dspace.eperson;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import javax.annotation.PostConstruct;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.eperson.service.CaptchaService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+
+/**
+ * Basic services implementation for the Captcha.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class CaptchaServiceImpl implements CaptchaService {
+
+    private static final Logger log = LogManager.getLogger(CaptchaServiceImpl.class);
+
+    private static Pattern RESPONSE_PATTERN = Pattern.compile("[A-Za-z0-9_-]+");
+
+    private CaptchaSettings captchaSettings;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @PostConstruct
+    public void init() {
+        captchaSettings = new CaptchaSettings();
+        captchaSettings.setSite(configurationService.getProperty("google.recaptcha.key.site"));
+        captchaSettings.setSecret(configurationService.getProperty("google.recaptcha.key.secret"));
+        captchaSettings.setSiteVerify(configurationService.getProperty("google.recaptcha.site-verify"));
+        captchaSettings.setCaptchaVersion(configurationService.getProperty("google.recaptcha.version", "v2"));
+        captchaSettings.setThreshold(Float.parseFloat(
+                                     configurationService.getProperty("google.recaptcha.key.threshold", "0.5")));
+    }
+
+    @Override
+    public void processResponse(String response, String action) throws InvalidReCaptchaException {
+
+        if (!responseSanityCheck(response)) {
+            throw new InvalidReCaptchaException("Response contains invalid characters");
+        }
+
+        URI verifyUri = URI.create(captchaSettings.getSiteVerify());
+
+        List<NameValuePair> params = new ArrayList<NameValuePair>(3);
+        params.add(new BasicNameValuePair("secret", captchaSettings.getSecret()));
+        params.add(new BasicNameValuePair("response", response));
+        params.add(new BasicNameValuePair("remoteip", ""));
+
+        HttpPost httpPost = new HttpPost(verifyUri);
+        try {
+            httpPost.addHeader("Accept", "application/json");
+            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded");
+            httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+        HttpClient httpClient = HttpClientBuilder.create().build();
+        HttpResponse httpResponse;
+        GoogleCaptchaResponse googleResponse;
+        final ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            httpResponse = httpClient.execute(httpPost);
+            googleResponse = objectMapper.readValue(httpResponse.getEntity().getContent(), GoogleCaptchaResponse.class);
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException("Error during verify google recaptcha site", e);
+        }
+        validateGoogleResponse(googleResponse, action);
+    }
+
+    private boolean responseSanityCheck(String response) {
+        return StringUtils.hasLength(response) && RESPONSE_PATTERN.matcher(response).matches();
+    }
+
+    private void validateGoogleResponse(GoogleCaptchaResponse googleResponse, String action) {
+        if (Objects.isNull(googleResponse)) {
+            log.error("Google reCaptcha response was empty. ReCaptcha could not be validated.");
+            throw new InvalidReCaptchaException("reCaptcha was not successfully validated");
+        }
+
+        if ("v2".equals(captchaSettings.getCaptchaVersion())) {
+            if (!googleResponse.isSuccess()) {
+                log.error("Google reCaptcha v2 returned an unsuccessful response. ReCaptcha was not validated.");
+                throw new InvalidReCaptchaException("reCaptcha was not successfully validated");
+            }
+        } else {
+            if (!googleResponse.isSuccess() || !googleResponse.getAction().equals(action)
+                || googleResponse.getScore() < captchaSettings.getThreshold()) {
+                log.error("Google reCaptcha v3 returned an unsuccessful response with"
+                        + " action {" + googleResponse.getAction() + "} and score {" + googleResponse.getScore() + "}."
+                        + " ReCaptcha was not validated.");
+                throw new InvalidReCaptchaException("reCaptcha was not successfully validated");
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/eperson/CaptchaSettings.java b/dspace-api/src/main/java/org/dspace/eperson/CaptchaSettings.java
new file mode 100644
index 0000000000..e1fe41f9a6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/CaptchaSettings.java
@@ -0,0 +1,62 @@
+/**
+ * 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/
+ */
+package org.dspace.eperson;
+
+/**
+ * This model class represent reCaptcha Google credentials
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
+ */
+public class CaptchaSettings {
+
+    private String site;
+    private String secret;
+    private float threshold;
+    private String siteVerify;
+    private String captchaVersion;
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public float getThreshold() {
+        return threshold;
+    }
+
+    public void setThreshold(float threshold) {
+        this.threshold = threshold;
+    }
+
+    public String getSiteVerify() {
+        return siteVerify;
+    }
+
+    public void setSiteVerify(String siteVerify) {
+        this.siteVerify = siteVerify;
+    }
+
+    public String getCaptchaVersion() {
+        return captchaVersion;
+    }
+
+    public void setCaptchaVersion(String captchaVersion) {
+        this.captchaVersion = captchaVersion;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPerson.java b/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
index def7697632..da83a1cafd 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
@@ -446,4 +446,8 @@ public class EPerson extends DSpaceObject implements DSpaceObjectLegacySupport {
         return previousActive;
     }
 
+    public boolean hasPasswordSet() {
+        return StringUtils.isNotBlank(getPassword());
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java b/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
index 5e81b8ee01..feefe65717 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
@@ -7,10 +7,12 @@
  */
 package org.dspace.eperson;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.UUID;
 import javax.mail.MessagingException;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
@@ -30,16 +32,17 @@ import org.dspace.services.factory.DSpaceServicesFactory;
  * Recommended filter:  EPerson+Create
  *
  * @author Stuart Lewis
- * @version $Revision$
  */
 public class EPersonConsumer implements Consumer {
     /**
      * log4j logger
      */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(EPersonConsumer.class);
+    private static final Logger log
+            = org.apache.logging.log4j.LogManager.getLogger(EPersonConsumer.class);
 
     protected EPersonService ePersonService
             = EPersonServiceFactory.getInstance().getEPersonService();
+
     protected ConfigurationService configurationService
             = DSpaceServicesFactory.getInstance().getConfigurationService();
 
@@ -74,6 +77,7 @@ public class EPersonConsumer implements Consumer {
                 if (et == Event.CREATE) {
                     // Notify of new user registration
                     String notifyRecipient = configurationService.getProperty("registration.notify");
+                    EPerson eperson = ePersonService.find(context, id);
                     if (notifyRecipient == null) {
                         notifyRecipient = "";
                     }
@@ -81,7 +85,6 @@ public class EPersonConsumer implements Consumer {
 
                     if (!notifyRecipient.equals("")) {
                         try {
-                            EPerson eperson = ePersonService.find(context, id);
                             Email adminEmail = Email
                                 .getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(), "registration_notify"));
                             adminEmail.addRecipient(notifyRecipient);
@@ -103,6 +106,26 @@ public class EPersonConsumer implements Consumer {
                                                           "error_emailing_administrator", ""), me);
                         }
                     }
+
+                    // If enabled, send a "welcome" message to the new EPerson.
+                    if (configurationService.getBooleanProperty("mail.welcome.enabled", false)) {
+                        String addressee = eperson.getEmail();
+                        if (StringUtils.isNotBlank(addressee)) {
+                            log.debug("Sending welcome email to {}", addressee);
+                            try {
+                                Email message = Email.getEmail(
+                                        I18nUtil.getEmailFilename(context.getCurrentLocale(), "welcome"));
+                                message.addRecipient(addressee);
+                                message.send();
+                            } catch (IOException | MessagingException ex) {
+                                log.warn("Welcome message not sent to {}:  {}",
+                                        addressee, ex.getMessage());
+                            }
+                        } else {
+                            log.warn("Welcome message not sent to EPerson {} because it has no email address.",
+                                    eperson.getID().toString());
+                        }
+                    }
                 } else if (et == Event.DELETE) {
                     // TODO: Implement this if required
                 }
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
index 004334e92d..61477995c7 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
@@ -7,6 +7,8 @@
  */
 package org.dspace.eperson;
 
+import static org.dspace.content.Item.ANY;
+
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -30,6 +32,7 @@ import org.dspace.authorize.service.ResourcePolicyService;
 import org.dspace.content.DSpaceObjectServiceImpl;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataField;
+import org.dspace.content.MetadataValue;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
@@ -43,6 +46,8 @@ import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.eperson.service.SubscribeService;
 import org.dspace.event.Event;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.util.UUIDUtils;
 import org.dspace.versioning.Version;
 import org.dspace.versioning.VersionHistory;
 import org.dspace.versioning.dao.VersionDAO;
@@ -96,6 +101,8 @@ public class EPersonServiceImpl extends DSpaceObjectServiceImpl<EPerson> impleme
     protected VersionDAO versionDAO;
     @Autowired(required = true)
     protected ClaimedTaskService claimedTaskService;
+    @Autowired
+    protected OrcidTokenService orcidTokenService;
 
     protected EPersonServiceImpl() {
         super();
@@ -379,6 +386,8 @@ public class EPersonServiceImpl extends DSpaceObjectServiceImpl<EPerson> impleme
             group.getMembers().remove(ePerson);
         }
 
+        orcidTokenService.deleteByEPerson(context, ePerson);
+
         // Remove any subscriptions
         subscribeService.deleteByEPerson(context, ePerson);
 
@@ -569,4 +578,18 @@ public class EPersonServiceImpl extends DSpaceObjectServiceImpl<EPerson> impleme
     public int countTotal(Context context) throws SQLException {
         return ePersonDAO.countRows(context);
     }
+
+    @Override
+    public EPerson findByProfileItem(Context context, Item profile) throws SQLException {
+        List<MetadataValue> owners = itemService.getMetadata(profile, "dspace", "object", "owner", ANY);
+        if (CollectionUtils.isEmpty(owners)) {
+            return null;
+        }
+        return find(context, UUIDUtils.fromString(owners.get(0).getAuthority()));
+    }
+
+    @Override
+    public String getName(EPerson dso) {
+        return dso.getName();
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/eperson/GoogleCaptchaResponse.java b/dspace-api/src/main/java/org/dspace/eperson/GoogleCaptchaResponse.java
new file mode 100644
index 0000000000..30817f243c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/GoogleCaptchaResponse.java
@@ -0,0 +1,142 @@
+/**
+ * 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/
+ */
+package org.dspace.eperson;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * This model class represent the response for validation of reCaptcha token
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonPropertyOrder({
+    "success",
+    "score",
+    "action",
+    "challenge_ts",
+    "hostname",
+    "error-codes"
+})
+public class GoogleCaptchaResponse {
+
+    @JsonProperty("success")
+    private boolean success;
+
+    @JsonProperty("score")
+    private float score;
+
+    @JsonProperty("action")
+    private String action;
+
+    @JsonProperty("challenge_ts")
+    private String challengeTs;
+
+    @JsonProperty("hostname")
+    private String hostname;
+
+    @JsonProperty("error-codes")
+    private ErrorCode[] errorCodes;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public float getScore() {
+        return score;
+    }
+
+    public void setScore(float score) {
+        this.score = score;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getChallengeTs() {
+        return challengeTs;
+    }
+
+    public void setChallengeTs(String challengeTs) {
+        this.challengeTs = challengeTs;
+    }
+
+    public String getHostname() {
+        return hostname;
+    }
+
+    public void setHostname(String hostname) {
+        this.hostname = hostname;
+    }
+
+    public ErrorCode[] getErrorCodes() {
+        return errorCodes;
+    }
+
+    public void setErrorCodes(ErrorCode[] errorCodes) {
+        this.errorCodes = errorCodes;
+    }
+
+    @JsonIgnore
+    public boolean hasClientError() {
+        ErrorCode[] errors = getErrorCodes();
+        if (errors == null) {
+            return false;
+        }
+        for (ErrorCode error : errors) {
+            switch (error) {
+                case InvalidResponse:
+                case MissingResponse:
+                    return true;
+                default: break;
+            }
+        }
+        return false;
+    }
+
+    static enum ErrorCode {
+
+        MissingSecret,
+        InvalidSecret,
+        MissingResponse,
+        InvalidResponse;
+
+        private static Map<String, ErrorCode> errorsMap = new HashMap<>(4);
+
+        static {
+            errorsMap.put("missing-input-secret",   MissingSecret);
+            errorsMap.put("invalid-input-secret",   InvalidSecret);
+            errorsMap.put("missing-input-response", MissingResponse);
+            errorsMap.put("invalid-input-response", InvalidResponse);
+        }
+
+        @JsonCreator
+        public static ErrorCode forValue(String value) {
+            return errorsMap.get(value.toLowerCase());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/eperson/Group.java b/dspace-api/src/main/java/org/dspace/eperson/Group.java
index 09b5ce189b..b2d3964895 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/Group.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/Group.java
@@ -201,7 +201,7 @@ public class Group extends DSpaceObject implements DSpaceObjectLegacySupport {
     void setName(String name) throws SQLException {
         if (!StringUtils.equals(this.name, name) && !isPermanent()) {
             this.name = name;
-            groupsChanged = true;
+            setMetadataModified();
         }
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
index be81cd9bd8..2b23ecfeef 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
@@ -22,6 +22,8 @@ import java.util.UUID;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeConfiguration;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.ResourcePolicy;
@@ -52,8 +54,6 @@ import org.dspace.xmlworkflow.storedcomponents.PoolTask;
 import org.dspace.xmlworkflow.storedcomponents.service.ClaimedTaskService;
 import org.dspace.xmlworkflow.storedcomponents.service.CollectionRoleService;
 import org.dspace.xmlworkflow.storedcomponents.service.PoolTaskService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -64,7 +64,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author kevinvandevelde at atmire.com
  */
 public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements GroupService {
-    private static final Logger log = LoggerFactory.getLogger(GroupServiceImpl.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired(required = true)
     protected GroupDAO groupDAO;
@@ -473,7 +473,7 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
     @Override
     public void delete(Context context, Group group) throws SQLException {
         if (group.isPermanent()) {
-            log.error("Attempt to delete permanent Group $", group.getName());
+            log.error("Attempt to delete permanent Group {}", group::getName);
             throw new SQLException("Attempt to delete a permanent Group");
         }
 
@@ -715,7 +715,7 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
                     // if the group is used for one or more roles on a single collection,
                     // admins can eventually manage it
                     List<CollectionRole> collectionRoles = collectionRoleService.findByGroup(context, group);
-                    if (collectionRoles != null && collectionRoles.size() > 0) {
+                    if (collectionRoles != null && !collectionRoles.isEmpty()) {
                         Set<Collection> colls = new HashSet<>();
                         for (CollectionRole cr : collectionRoles) {
                             colls.add(cr.getCollection());
@@ -829,4 +829,9 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
                                            final MetadataField metadataField) throws SQLException {
         return groupDAO.findByMetadataField(context, searchValue, metadataField);
     }
+
+    @Override
+    public String getName(Group dso) {
+        return dso.getName();
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/eperson/InvalidReCaptchaException.java b/dspace-api/src/main/java/org/dspace/eperson/InvalidReCaptchaException.java
new file mode 100644
index 0000000000..3d6584057f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/InvalidReCaptchaException.java
@@ -0,0 +1,28 @@
+/**
+ * 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/
+ */
+package org.dspace.eperson;
+
+/**
+ * This class provides an exception to be used when trying to register a new EPerson
+ * and Captcha validations failed.
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class InvalidReCaptchaException extends RuntimeException {
+
+    private static final long serialVersionUID = -5328794674744121744L;
+
+    public InvalidReCaptchaException(String message) {
+        super(message);
+    }
+
+    public InvalidReCaptchaException(String message, Exception cause) {
+        super(message, cause);
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/GroupDAO.java b/dspace-api/src/main/java/org/dspace/eperson/dao/GroupDAO.java
index ab37aa4047..2cc77129f0 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/GroupDAO.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/GroupDAO.java
@@ -45,7 +45,7 @@ public interface GroupDAO extends DSpaceObjectDAO<Group>, DSpaceObjectLegacySupp
      * Find all groups ordered by the specified metadata fields ascending
      *
      * @param context            The DSpace context
-     * @param sortMetadataFields The metadata fields to sort on
+     * @param metadataSortFields The metadata fields to sort on
      * @param pageSize           how many results return
      * @param offset             the position of the first result to return
      * @return A list of all groups, ordered by metadata fields
diff --git a/dspace-api/src/main/java/org/dspace/eperson/service/AccountService.java b/dspace-api/src/main/java/org/dspace/eperson/service/AccountService.java
index 45fa6d26b1..c8ecb0cc67 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/service/AccountService.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/service/AccountService.java
@@ -46,11 +46,4 @@ public interface AccountService {
 
     public void deleteToken(Context context, String token)
         throws SQLException;
-
-    /**
-     * This method verifies that a certain String adheres to the password rules for DSpace
-     * @param password  The String to be checked
-     * @return          A boolean indicating whether or not the given String adheres to the password rules
-     */
-    public boolean verifyPasswordStructure(String password);
 }
diff --git a/dspace-api/src/main/java/org/dspace/eperson/service/CaptchaService.java b/dspace-api/src/main/java/org/dspace/eperson/service/CaptchaService.java
new file mode 100644
index 0000000000..da417facc6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/service/CaptchaService.java
@@ -0,0 +1,30 @@
+/**
+ * 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/
+ */
+package org.dspace.eperson.service;
+
+import org.dspace.eperson.InvalidReCaptchaException;
+
+/**
+ * This service for validate the reCaptcha token
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
+ */
+public interface CaptchaService {
+
+    public String REGISTER_ACTION = "register_email";
+
+    /**
+     * validate the entered reCaptcha token
+     *
+     * @param response reCaptcha token to be validated
+     * @param action action of reCaptcha
+     * @throws InvalidReCaptchaException if reCaptcha was not successfully validated
+     */
+    public void processResponse(String response, String action) throws InvalidReCaptchaException;
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java b/dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java
index 6d2dd67d76..c5c9801c16 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java
@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
 import org.dspace.content.service.DSpaceObjectLegacySupportService;
 import org.dspace.content.service.DSpaceObjectService;
@@ -263,4 +264,16 @@ public interface EPersonService extends DSpaceObjectService<EPerson>, DSpaceObje
      * @throws SQLException An exception that provides information on a database access error or other errors.
      */
     int countTotal(Context context) throws SQLException;
+
+    /**
+     * Find the EPerson related to the given profile item. If the given item is not
+     * a profile item, null is returned.
+     *
+     * @param  context      The relevant DSpace Context.
+     * @param  profile      the profile item to search for
+     * @return              the EPerson, if any
+     * @throws SQLException An exception that provides information on a database
+     *                      access error or other errors.
+     */
+    EPerson findByProfileItem(Context context, Item profile) throws SQLException;
 }
diff --git a/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java b/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java
index 5e45d6324d..b0aa4aba13 100644
--- a/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java
+++ b/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java
@@ -335,7 +335,7 @@ public class OpenAIRERestConnector {
     /**
      * tokenUsage true to enable the usage of an access token
      * 
-     * @param tokenUsage
+     * @param tokenEnabled true/false
      */
     @Autowired(required = false)
     public void setTokenEnabled(boolean tokenEnabled) {
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/impl/LiveImportDataProvider.java b/dspace-api/src/main/java/org/dspace/external/provider/impl/LiveImportDataProvider.java
index 962183fa6f..2e934462c9 100644
--- a/dspace-api/src/main/java/org/dspace/external/provider/impl/LiveImportDataProvider.java
+++ b/dspace-api/src/main/java/org/dspace/external/provider/impl/LiveImportDataProvider.java
@@ -57,7 +57,7 @@ public class LiveImportDataProvider extends AbstractExternalDataProvider {
 
     /**
      * This method set the MetadataSource for the ExternalDataProvider
-     * @param metadataSource {@link org.dspace.importer.external.service.components.MetadataSource} implementation used to process the input data
+     * @param querySource Source {@link org.dspace.importer.external.service.components.QuerySource} implementation used to process the input data
      */
     public void setMetadataSource(QuerySource querySource) {
         this.querySource = querySource;
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/impl/OpenAIREFundingDataProvider.java b/dspace-api/src/main/java/org/dspace/external/provider/impl/OpenAIREFundingDataProvider.java
index 3dcd7d16a6..8ca5b7c0ea 100644
--- a/dspace-api/src/main/java/org/dspace/external/provider/impl/OpenAIREFundingDataProvider.java
+++ b/dspace-api/src/main/java/org/dspace/external/provider/impl/OpenAIREFundingDataProvider.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -33,6 +34,7 @@ import org.dspace.content.dto.MetadataValueDTO;
 import org.dspace.external.OpenAIRERestConnector;
 import org.dspace.external.model.ExternalDataObject;
 import org.dspace.external.provider.AbstractExternalDataProvider;
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -40,13 +42,9 @@ import org.springframework.beans.factory.annotation.Autowired;
  * will deal with the OpenAIRE External Data lookup
  * 
  * @author paulo-graca
- *
  */
 public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
 
-    /**
-     * log4j logger
-     */
     private static Logger log = org.apache.logging.log4j.LogManager.getLogger(OpenAIREFundingDataProvider.class);
 
     /**
@@ -54,6 +52,16 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
      */
     protected static final String PREFIX = "info:eu-repo/grantAgreement";
 
+    private static final String TITLE = "dcTitle";
+    private static final String SUBJECT = "dcSubject";
+    private static final String AWARD_URI = "awardURI";
+    private static final String FUNDER_NAME = "funderName";
+    private static final String SPATIAL = "coverageSpatial";
+    private static final String AWARD_NUMBER = "awardNumber";
+    private static final String FUNDER_ID = "funderIdentifier";
+    private static final String FUNDING_STREAM = "fundingStream";
+    private static final String TITLE_ALTERNATIVE = "titleAlternative";
+
     /**
      * rows default limit
      */
@@ -69,11 +77,9 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
      */
     protected OpenAIRERestConnector connector;
 
-    /**
-     * required method
-     */
-    public void init() throws IOException {
-    }
+    protected Map<String, MetadataFieldConfig> metadataFields;
+
+    public void init() throws IOException {}
 
     @Override
     public String getSourceIdentifier() {
@@ -266,14 +272,22 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
         }
     }
 
+    public Map<String, MetadataFieldConfig> getMetadataFields() {
+        return metadataFields;
+    }
+
+    public void setMetadataFields(Map<String, MetadataFieldConfig> metadataFields) {
+        this.metadataFields = metadataFields;
+    }
+
     /**
      * OpenAIRE Funding External Data Builder Class
      * 
      * @author pgraca
-     *
      */
-    public static class ExternalDataObjectBuilder {
-        ExternalDataObject externalDataObject;
+    public class ExternalDataObjectBuilder {
+
+        private ExternalDataObject externalDataObject;
 
         public ExternalDataObjectBuilder(Project project) {
             String funderIdPrefix = "urn:openaire:";
@@ -283,46 +297,42 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
             for (FundingTreeType fundingTree : projectHelper.getFundingTreeTypes()) {
                 FunderType funder = fundingTree.getFunder();
                 // Funder name
-                this.addFunderName(funder.getName());
+                this.addMetadata(metadataFields.get(FUNDER_NAME), funder.getName());
                 // Funder Id - convert it to an urn
-                this.addFunderID(funderIdPrefix + funder.getId());
+                this.addMetadata(metadataFields.get(FUNDER_ID), funderIdPrefix + funder.getId());
                 // Jurisdiction
-                this.addFunderJuristiction(funder.getJurisdiction());
+                this.addMetadata(metadataFields.get(SPATIAL), funder.getJurisdiction());
 
                 FundingHelper fundingHelper = new FundingHelper(
-                        fundingTree.getFundingLevel2OrFundingLevel1OrFundingLevel0());
+                              fundingTree.getFundingLevel2OrFundingLevel1OrFundingLevel0());
 
                 // Funding description
                 for (FundingType funding : fundingHelper.getFirstAvailableFunding()) {
-                    this.addFundingStream(funding.getDescription());
+                    this.addMetadata(metadataFields.get(FUNDING_STREAM), funding.getDescription());
                 }
             }
 
             // Title
             for (String title : projectHelper.getTitles()) {
-                this.addAwardTitle(title);
+                this.addMetadata(metadataFields.get(TITLE), title);
                 this.setDisplayValue(title);
                 this.setValue(title);
             }
-
             // Code
             for (String code : projectHelper.getCodes()) {
-                this.addAwardNumber(code);
+                this.addMetadata(metadataFields.get(AWARD_NUMBER), code);
             }
-
             // Website url
             for (String url : projectHelper.getWebsiteUrls()) {
-                this.addAwardURI(url);
+                this.addMetadata(metadataFields.get(AWARD_URI), url);
             }
-
             // Acronyms
             for (String acronym : projectHelper.getAcronyms()) {
-                this.addFundingItemAcronym(acronym);
+                this.addMetadata(metadataFields.get(TITLE_ALTERNATIVE), acronym);
             }
-
             // Keywords
             for (String keyword : projectHelper.getKeywords()) {
-                this.addSubject(keyword);
+                this.addMetadata(metadataFields.get(SUBJECT), keyword);
             }
         }
 
@@ -366,7 +376,6 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
          * @return ExternalDataObjectBuilder
          */
         public ExternalDataObjectBuilder setId(String id) {
-
             // we use base64 encoding in order to use slashes / and other
             // characters that must be escaped for the <:entry-id>
             String base64Id = Base64.getEncoder().encodeToString(id.getBytes());
@@ -374,128 +383,10 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
             return this;
         }
 
-        /**
-         * Add metadata dc.identifier
-         * 
-         * @param metadata identifier
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addIdentifier(String identifier) {
-            this.externalDataObject.addMetadata(new MetadataValueDTO("dc", "identifier", null, null, identifier));
-            return this;
-        }
-
-        /**
-         * Add metadata project.funder.name
-         * 
-         * @param metadata funderName
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addFunderName(String funderName) {
-            this.externalDataObject.addMetadata(new MetadataValueDTO("project", "funder", "name", null, funderName));
-            return this;
-        }
-
-        /**
-         * Add metadata project.funder.identifier
-         * 
-         * @param metadata funderId
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addFunderID(String funderID) {
-            this.externalDataObject
-                    .addMetadata(new MetadataValueDTO("project", "funder", "identifier", null, funderID));
-            return this;
-        }
-
-        /**
-         * Add metadata dc.title
-         * 
-         * @param metadata awardTitle
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addAwardTitle(String awardTitle) {
-            this.externalDataObject.addMetadata(new MetadataValueDTO("dc", "title", null, null, awardTitle));
-            return this;
-        }
-
-        /**
-         * Add metadata oaire.fundingStream
-         * 
-         * @param metadata fundingStream
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addFundingStream(String fundingStream) {
-            this.externalDataObject
-                    .addMetadata(new MetadataValueDTO("oaire", "fundingStream", null, null, fundingStream));
-            return this;
-        }
-
-        /**
-         * Add metadata oaire.awardNumber
-         * 
-         * @param metadata awardNumber
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addAwardNumber(String awardNumber) {
-            this.externalDataObject.addMetadata(new MetadataValueDTO("oaire", "awardNumber", null, null, awardNumber));
-            return this;
-        }
-
-        /**
-         * Add metadata oaire.awardURI
-         * 
-         * @param metadata websiteUrl
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addAwardURI(String websiteUrl) {
-            this.externalDataObject.addMetadata(new MetadataValueDTO("oaire", "awardURI", null, null, websiteUrl));
-            return this;
-        }
-
-        /**
-         * Add metadata dc.title.alternative
-         * 
-         * @param metadata fundingItemAcronym
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addFundingItemAcronym(String fundingItemAcronym) {
-            this.externalDataObject
-                    .addMetadata(new MetadataValueDTO("dc", "title", "alternative", null, fundingItemAcronym));
-            return this;
-        }
-
-        /**
-         * Add metadata dc.coverage.spatial
-         * 
-         * @param metadata funderJuristiction
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addFunderJuristiction(String funderJuristiction) {
-            this.externalDataObject
-                    .addMetadata(new MetadataValueDTO("dc", "coverage", "spatial", null, funderJuristiction));
-            return this;
-        }
-
-        /**
-         * Add metadata dc.description
-         * 
-         * @param metadata description
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addDescription(String description) {
-            this.externalDataObject.addMetadata(new MetadataValueDTO("dc", "description", null, null, description));
-            return this;
-        }
-
-        /**
-         * Add metadata dc.subject
-         * 
-         * @param metadata subject
-         * @return ExternalDataObjectBuilder
-         */
-        public ExternalDataObjectBuilder addSubject(String subject) {
-            this.externalDataObject.addMetadata(new MetadataValueDTO("dc", "subject", null, null, subject));
+        public ExternalDataObjectBuilder addMetadata(MetadataFieldConfig metadataField, String value) {
+            this.externalDataObject.addMetadata(new MetadataValueDTO(metadataField.getSchema(),
+                                                                     metadataField.getElement(),
+                                                                     metadataField.getQualifier(), null, value));
             return this;
         }
 
@@ -508,4 +399,5 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
             return this.externalDataObject;
         }
     }
-}
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidPublicationDataProvider.java b/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidPublicationDataProvider.java
new file mode 100644
index 0000000000..4fdf15a8a3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidPublicationDataProvider.java
@@ -0,0 +1,547 @@
+/**
+ * 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/
+ */
+package org.dspace.external.provider.impl;
+
+import static java.util.Collections.emptyList;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.reverseOrder;
+import static java.util.Optional.ofNullable;
+import static org.apache.commons.collections4.ListUtils.partition;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.orcid.jaxb.model.common.CitationType.FORMATTED_UNSPECIFIED;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataFieldName;
+import org.dspace.content.dto.MetadataValueDTO;
+import org.dspace.core.Context;
+import org.dspace.external.model.ExternalDataObject;
+import org.dspace.external.provider.AbstractExternalDataProvider;
+import org.dspace.external.provider.ExternalDataProvider;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.dspace.importer.external.service.ImportService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.model.OrcidWorkFieldMapping;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.web.ContextUtil;
+import org.orcid.jaxb.model.common.ContributorRole;
+import org.orcid.jaxb.model.common.WorkType;
+import org.orcid.jaxb.model.v3.release.common.Contributor;
+import org.orcid.jaxb.model.v3.release.common.ContributorAttributes;
+import org.orcid.jaxb.model.v3.release.common.PublicationDate;
+import org.orcid.jaxb.model.v3.release.common.Subtitle;
+import org.orcid.jaxb.model.v3.release.common.Title;
+import org.orcid.jaxb.model.v3.release.record.Citation;
+import org.orcid.jaxb.model.v3.release.record.ExternalIDs;
+import org.orcid.jaxb.model.v3.release.record.SourceAware;
+import org.orcid.jaxb.model.v3.release.record.Work;
+import org.orcid.jaxb.model.v3.release.record.WorkBulk;
+import org.orcid.jaxb.model.v3.release.record.WorkContributors;
+import org.orcid.jaxb.model.v3.release.record.WorkTitle;
+import org.orcid.jaxb.model.v3.release.record.summary.WorkGroup;
+import org.orcid.jaxb.model.v3.release.record.summary.WorkSummary;
+import org.orcid.jaxb.model.v3.release.record.summary.Works;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link ExternalDataProvider} that search for all the works
+ * of the profile with the given orcid id that hava a source other than DSpace.
+ * The id of the external data objects returned by the methods of this class is
+ * the concatenation of the orcid id and the put code associated with the
+ * publication, separated by :: (example 0000-0000-0123-4567::123456)
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidPublicationDataProvider extends AbstractExternalDataProvider {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(OrcidPublicationDataProvider.class);
+
+    /**
+     * Examples of valid ORCID IDs:
+     * <ul>
+     * <li>0000-0002-1825-0097</li>
+     * <li>0000-0001-5109-3700</li>
+     * <li>0000-0002-1694-233X</li>
+     * </ul>
+     */
+    private final static Pattern ORCID_ID_PATTERN = Pattern.compile("(\\d{4}-){3}\\d{3}(\\d|X)");
+
+    private final static int MAX_PUT_CODES_SIZE = 100;
+
+    @Autowired
+    private OrcidClient orcidClient;
+
+    @Autowired
+    private OrcidConfiguration orcidConfiguration;
+
+    @Autowired
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    @Autowired
+    private ImportService importService;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    private OrcidWorkFieldMapping fieldMapping;
+
+    private String sourceIdentifier;
+
+    private String readPublicAccessToken;
+
+    @Override
+    public Optional<ExternalDataObject> getExternalDataObject(String id) {
+
+        if (isInvalidIdentifier(id)) {
+            throw new IllegalArgumentException("Invalid identifier '" + id + "', expected <orcid-id>::<put-code>");
+        }
+
+        String[] idSections = id.split("::");
+        String orcid = idSections[0];
+        String putCode = idSections[1];
+
+        validateOrcidId(orcid);
+
+        return getWork(orcid, putCode)
+            .filter(work -> hasDifferentSourceClientId(work))
+            .filter(work -> work.getPutCode() != null)
+            .map(work -> convertToExternalDataObject(orcid, work));
+    }
+
+    @Override
+    public List<ExternalDataObject> searchExternalDataObjects(String orcid, int start, int limit) {
+
+        validateOrcidId(orcid);
+
+        return findWorks(orcid, start, limit).stream()
+            .map(work -> convertToExternalDataObject(orcid, work))
+            .collect(Collectors.toList());
+    }
+
+    private boolean isInvalidIdentifier(String id) {
+        return StringUtils.isBlank(id) || id.split("::").length != 2;
+    }
+
+    private void validateOrcidId(String orcid) {
+        if (!ORCID_ID_PATTERN.matcher(orcid).matches()) {
+            throw new IllegalArgumentException("The given ORCID ID is not valid: " + orcid);
+        }
+    }
+
+    /**
+     * Returns all the works related to the given ORCID in the range from start and
+     * limit.
+     *
+     * @param  orcid the ORCID ID of the author to search for works
+     * @param  start the start index
+     * @param  limit the limit index
+     * @return       the list of the works
+     */
+    private List<Work> findWorks(String orcid, int start, int limit) {
+        List<WorkSummary> workSummaries = findWorkSummaries(orcid, start, limit);
+        return findWorks(orcid, workSummaries);
+    }
+
+    /**
+     * Returns all the works summaries related to the given ORCID in the range from
+     * start and limit.
+     *
+     * @param  orcid the ORCID ID of the author to search for works summaries
+     * @param  start the start index
+     * @param  limit the limit index
+     * @return       the list of the works summaries
+     */
+    private List<WorkSummary> findWorkSummaries(String orcid, int start, int limit) {
+        return getWorks(orcid).getWorkGroup().stream()
+            .filter(workGroup -> allWorkSummariesHaveDifferentSourceClientId(workGroup))
+            .map(workGroup -> getPreferredWorkSummary(workGroup))
+            .flatMap(Optional::stream)
+            .skip(start)
+            .limit(limit > 0 ? limit : Long.MAX_VALUE)
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * Returns all the works related to the given ORCID ID and work summaries (a
+     * work has more details than a work summary).
+     *
+     * @param  orcid         the ORCID id of the author to search for works
+     * @param  workSummaries the work summaries used to search the related works
+     * @return               the list of the works
+     */
+    private List<Work> findWorks(String orcid, List<WorkSummary> workSummaries) {
+
+        List<String> workPutCodes = getPutCodes(workSummaries);
+
+        if (CollectionUtils.isEmpty(workPutCodes)) {
+            return emptyList();
+        }
+
+        if (workPutCodes.size() == 1) {
+            return getWork(orcid, workPutCodes.get(0)).stream().collect(Collectors.toList());
+        }
+
+        return partition(workPutCodes, MAX_PUT_CODES_SIZE).stream()
+            .map(putCodes -> getWorkBulk(orcid, putCodes))
+            .flatMap(workBulk -> getWorks(workBulk).stream())
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * Search a work by ORCID id and putcode, using API or PUBLIC urls based on
+     * whether the ORCID API keys are configured or not.
+     *
+     * @param  orcid   the ORCID ID
+     * @param  putCode the work's identifier on ORCID
+     * @return         the work, if any
+     */
+    private Optional<Work> getWork(String orcid, String putCode) {
+        if (orcidConfiguration.isApiConfigured()) {
+            String accessToken = getAccessToken(orcid);
+            return orcidClient.getObject(accessToken, orcid, putCode, Work.class);
+        } else {
+            return orcidClient.getObject(orcid, putCode, Work.class);
+        }
+    }
+
+    /**
+     * Returns all the works related to the given ORCID.
+     *
+     * @param  orcid the ORCID ID of the author to search for works
+     * @return       the list of the works
+     */
+    private Works getWorks(String orcid) {
+        if (orcidConfiguration.isApiConfigured()) {
+            String accessToken = getAccessToken(orcid);
+            return orcidClient.getWorks(accessToken, orcid);
+        } else {
+            return orcidClient.getWorks(orcid);
+        }
+    }
+
+    /**
+     * Returns all the works related to the given ORCID by the given putCodes.
+     *
+     * @param  orcid    the ORCID ID of the author to search for works
+     * @param  putCodes the work's put codes to search
+     * @return          the list of the works
+     */
+    private WorkBulk getWorkBulk(String orcid, List<String> putCodes) {
+        if (orcidConfiguration.isApiConfigured()) {
+            String accessToken = getAccessToken(orcid);
+            return orcidClient.getWorkBulk(accessToken, orcid, putCodes);
+        } else {
+            return orcidClient.getWorkBulk(orcid, putCodes);
+        }
+    }
+
+    private String getAccessToken(String orcid) {
+        List<Item> items = orcidSynchronizationService.findProfilesByOrcid(new Context(), orcid);
+        return Optional.ofNullable(items.isEmpty() ? null : items.get(0))
+            .flatMap(item -> getAccessToken(item))
+            .orElseGet(() -> getReadPublicAccessToken());
+    }
+
+    private Optional<String> getAccessToken(Item item) {
+        return ofNullable(orcidTokenService.findByProfileItem(getContext(), item))
+            .map(OrcidToken::getAccessToken);
+    }
+
+    private String getReadPublicAccessToken() {
+        if (readPublicAccessToken != null) {
+            return readPublicAccessToken;
+        }
+
+        OrcidTokenResponseDTO accessTokenResponse = orcidClient.getReadPublicAccessToken();
+        readPublicAccessToken = accessTokenResponse.getAccessToken();
+
+        return readPublicAccessToken;
+    }
+
+    private List<Work> getWorks(WorkBulk workBulk) {
+        return workBulk.getBulk().stream()
+            .filter(bulkElement -> (bulkElement instanceof Work))
+            .map(bulkElement -> ((Work) bulkElement))
+            .collect(Collectors.toList());
+
+    }
+
+    private List<String> getPutCodes(List<WorkSummary> workSummaries) {
+        return workSummaries.stream()
+            .map(WorkSummary::getPutCode)
+            .map(String::valueOf)
+            .collect(Collectors.toList());
+    }
+
+    private Optional<WorkSummary> getPreferredWorkSummary(WorkGroup workGroup) {
+        return workGroup.getWorkSummary().stream()
+            .filter(work -> work.getPutCode() != null)
+            .filter(work -> NumberUtils.isCreatable(work.getDisplayIndex()))
+            .sorted(comparing(work -> Integer.valueOf(work.getDisplayIndex()), reverseOrder()))
+            .findFirst();
+    }
+
+    private ExternalDataObject convertToExternalDataObject(String orcid, Work work) {
+        ExternalDataObject externalDataObject = new ExternalDataObject(sourceIdentifier);
+        externalDataObject.setId(orcid + "::" + work.getPutCode().toString());
+
+        String title = getWorkTitle(work);
+        externalDataObject.setDisplayValue(title);
+        externalDataObject.setValue(title);
+
+        addMetadataValue(externalDataObject, fieldMapping.getTitleField(), () -> title);
+        addMetadataValue(externalDataObject, fieldMapping.getTypeField(), () -> getWorkType(work));
+        addMetadataValue(externalDataObject, fieldMapping.getPublicationDateField(), () -> getPublicationDate(work));
+        addMetadataValue(externalDataObject, fieldMapping.getJournalTitleField(), () -> getJournalTitle(work));
+        addMetadataValue(externalDataObject, fieldMapping.getSubTitleField(), () -> getSubTitleField(work));
+        addMetadataValue(externalDataObject, fieldMapping.getShortDescriptionField(), () -> getDescription(work));
+        addMetadataValue(externalDataObject, fieldMapping.getLanguageField(), () -> getLanguage(work));
+
+        for (String contributorField : fieldMapping.getContributorFields().keySet()) {
+            ContributorRole role = fieldMapping.getContributorFields().get(contributorField);
+            addMetadataValues(externalDataObject, contributorField, () -> getContributors(work, role));
+        }
+
+        for (String externalIdField : fieldMapping.getExternalIdentifierFields().keySet()) {
+            String type = fieldMapping.getExternalIdentifierFields().get(externalIdField);
+            addMetadataValues(externalDataObject, externalIdField, () -> getExternalIds(work, type));
+        }
+
+        try {
+            addMetadataValuesFromCitation(externalDataObject, work.getWorkCitation());
+        } catch (Exception e) {
+            LOGGER.error("An error occurs reading the following citation: " + work.getWorkCitation().getCitation(), e);
+        }
+
+        return externalDataObject;
+    }
+
+    private boolean allWorkSummariesHaveDifferentSourceClientId(WorkGroup workGroup) {
+        return workGroup.getWorkSummary().stream().allMatch(this::hasDifferentSourceClientId);
+    }
+
+    @SuppressWarnings("deprecation")
+    private boolean hasDifferentSourceClientId(SourceAware sourceAware) {
+        return Optional.ofNullable(sourceAware.getSource())
+            .map(source -> source.getSourceClientId())
+            .map(sourceClientId -> sourceClientId.getPath())
+            .map(clientId -> !StringUtils.equals(orcidConfiguration.getClientId(), clientId))
+            .orElse(true);
+    }
+
+    private void addMetadataValues(ExternalDataObject externalData, String metadata, Supplier<List<String>> values) {
+
+        if (StringUtils.isBlank(metadata)) {
+            return;
+        }
+
+        MetadataFieldName field = new MetadataFieldName(metadata);
+        for (String value : values.get()) {
+            externalData.addMetadata(new MetadataValueDTO(field.schema, field.element, field.qualifier, null, value));
+        }
+    }
+
+    private void addMetadataValue(ExternalDataObject externalData, String metadata, Supplier<String> valueSupplier) {
+        addMetadataValues(externalData, metadata, () -> {
+            String value = valueSupplier.get();
+            return isNotBlank(value) ? List.of(value) : emptyList();
+        });
+    }
+
+    private String getWorkTitle(Work work) {
+        WorkTitle workTitle = work.getWorkTitle();
+        if (workTitle == null) {
+            return null;
+        }
+        Title title = workTitle.getTitle();
+        return title != null ? title.getContent() : null;
+    }
+
+    private String getWorkType(Work work) {
+        WorkType workType = work.getWorkType();
+        return workType != null ? fieldMapping.convertType(workType.value()) : null;
+    }
+
+    private String getPublicationDate(Work work) {
+        PublicationDate publicationDate = work.getPublicationDate();
+        if (publicationDate == null) {
+            return null;
+        }
+
+        StringBuilder builder = new StringBuilder(publicationDate.getYear().getValue());
+        if (publicationDate.getMonth() != null) {
+            builder.append("-");
+            builder.append(publicationDate.getMonth().getValue());
+        }
+
+        if (publicationDate.getDay() != null) {
+            builder.append("-");
+            builder.append(publicationDate.getDay().getValue());
+        }
+
+        return builder.toString();
+    }
+
+    private String getJournalTitle(Work work) {
+        Title journalTitle = work.getJournalTitle();
+        return journalTitle != null ? journalTitle.getContent() : null;
+    }
+
+    private String getSubTitleField(Work work) {
+        WorkTitle workTitle = work.getWorkTitle();
+        if (workTitle == null) {
+            return null;
+        }
+        Subtitle subTitle = workTitle.getSubtitle();
+        return subTitle != null ? subTitle.getContent() : null;
+    }
+
+    private String getDescription(Work work) {
+        return work.getShortDescription();
+    }
+
+    private String getLanguage(Work work) {
+        return work.getLanguageCode() != null ? fieldMapping.convertLanguage(work.getLanguageCode()) : null;
+    }
+
+    private List<String> getContributors(Work work, ContributorRole role) {
+        WorkContributors workContributors = work.getWorkContributors();
+        if (workContributors == null) {
+            return emptyList();
+        }
+
+        return workContributors.getContributor().stream()
+            .filter(contributor -> hasRole(contributor, role))
+            .map(contributor -> getContributorName(contributor))
+            .flatMap(Optional::stream)
+            .collect(Collectors.toList());
+    }
+
+    private void addMetadataValuesFromCitation(ExternalDataObject externalDataObject, Citation citation)
+        throws Exception {
+
+        if (citation == null || citation.getWorkCitationType() == FORMATTED_UNSPECIFIED) {
+            return;
+        }
+
+        getImportRecord(citation).ifPresent(importRecord -> enrichExternalDataObject(externalDataObject, importRecord));
+
+    }
+
+    private Optional<ImportRecord> getImportRecord(Citation citation) throws Exception {
+        File citationFile = File.createTempFile("temp", "." + citation.getWorkCitationType().value());
+        try (FileOutputStream outputStream = new FileOutputStream(citationFile)) {
+            IOUtils.write(citation.getCitation(), new FileOutputStream(citationFile), Charset.defaultCharset());
+            return Optional.ofNullable(importService.getRecord(citationFile, citationFile.getName()));
+        } finally {
+            citationFile.delete();
+        }
+    }
+
+    private void enrichExternalDataObject(ExternalDataObject externalDataObject, ImportRecord importRecord) {
+        importRecord.getValueList().stream()
+            .filter(metadata -> doesNotContains(externalDataObject, metadata))
+            .forEach(metadata -> addMetadata(externalDataObject, metadata));
+    }
+
+    private void addMetadata(ExternalDataObject externalDataObject, MetadatumDTO metadata) {
+        externalDataObject.addMetadata(new MetadataValueDTO(metadata.getSchema(), metadata.getElement(),
+            metadata.getQualifier(), null, metadata.getValue()));
+    }
+
+    private boolean doesNotContains(ExternalDataObject externalDataObject, MetadatumDTO metadata) {
+        return externalDataObject.getMetadata().stream()
+            .filter(metadataValue -> StringUtils.equals(metadataValue.getSchema(), metadata.getSchema()))
+            .filter(metadataValue -> StringUtils.equals(metadataValue.getElement(), metadata.getElement()))
+            .filter(metadataValue -> StringUtils.equals(metadataValue.getQualifier(), metadata.getQualifier()))
+            .findAny().isEmpty();
+    }
+
+    private boolean hasRole(Contributor contributor, ContributorRole role) {
+        ContributorAttributes attributes = contributor.getContributorAttributes();
+        return attributes != null ? role.equals(attributes.getContributorRole()) : false;
+    }
+
+    private Optional<String> getContributorName(Contributor contributor) {
+        return Optional.ofNullable(contributor.getCreditName())
+            .map(creditName -> creditName.getContent());
+    }
+
+    private List<String> getExternalIds(Work work, String type) {
+        ExternalIDs externalIdentifiers = work.getExternalIdentifiers();
+        if (externalIdentifiers == null) {
+            return emptyList();
+        }
+
+        return externalIdentifiers.getExternalIdentifier().stream()
+            .filter(externalId -> type.equals(externalId.getType()))
+            .map(externalId -> externalId.getValue())
+            .collect(Collectors.toList());
+    }
+
+    private Context getContext() {
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        return context != null ? context : new Context();
+    }
+
+    @Override
+    public boolean supports(String source) {
+        return StringUtils.equals(sourceIdentifier, source);
+    }
+
+    @Override
+    public int getNumberOfResults(String orcid) {
+        return findWorkSummaries(orcid, 0, -1).size();
+    }
+
+    public void setSourceIdentifier(String sourceIdentifier) {
+        this.sourceIdentifier = sourceIdentifier;
+    }
+
+    @Override
+    public String getSourceIdentifier() {
+        return sourceIdentifier;
+    }
+
+    public void setFieldMapping(OrcidWorkFieldMapping fieldMapping) {
+        this.fieldMapping = fieldMapping;
+    }
+
+    public void setReadPublicAccessToken(String readPublicAccessToken) {
+        this.readPublicAccessToken = readPublicAccessToken;
+    }
+
+    public OrcidClient getOrcidClient() {
+        return orcidClient;
+    }
+
+    public void setOrcidClient(OrcidClient orcidClient) {
+        this.orcidClient = orcidClient;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidV3AuthorDataProvider.java b/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidV3AuthorDataProvider.java
index 0653ee758d..125da8f7c6 100644
--- a/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidV3AuthorDataProvider.java
+++ b/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidV3AuthorDataProvider.java
@@ -140,7 +140,7 @@ public class OrcidV3AuthorDataProvider extends AbstractExternalDataProvider {
                             new MetadataValueDTO("person", "identifier", "orcid", null, person.getName().getPath()));
             externalDataObject
                     .addMetadata(new MetadataValueDTO("dc", "identifier", "uri", null,
-                                                      orcidUrl + person.getName().getPath()));
+                                                      orcidUrl + "/" + person.getName().getPath()));
             if (!StringUtils.isBlank(lastName) && !StringUtils.isBlank(firstName)) {
                 externalDataObject.setDisplayValue(lastName + ", " + firstName);
                 externalDataObject.setValue(lastName + ", " + firstName);
diff --git a/dspace-api/src/main/java/org/dspace/google/GoogleAnalyticsEvent.java b/dspace-api/src/main/java/org/dspace/google/GoogleAnalyticsEvent.java
index 9e9751337c..50da0e5283 100644
--- a/dspace-api/src/main/java/org/dspace/google/GoogleAnalyticsEvent.java
+++ b/dspace-api/src/main/java/org/dspace/google/GoogleAnalyticsEvent.java
@@ -7,134 +7,93 @@
  */
 package org.dspace.google;
 
+import java.util.Objects;
+
+import org.springframework.util.Assert;
+
 /**
  * This is a dataholder class for an individual event to be sent to Google Analaytics
  *
  * @author April Herron
  */
-public class GoogleAnalyticsEvent {
+public final class GoogleAnalyticsEvent {
 
-    private String cid;
-    private String uip;
-    private String ua;
-    private String dr;
-    private String dp;
-    private String dt;
-    private long time;
+    private final String clientId;
+    private final String userIp;
+    private final String userAgent;
+    private final String documentReferrer;
+    private final String documentPath;
+    private final String documentTitle;
+    private final long time;
 
-    GoogleAnalyticsEvent(String cid, String uip, String ua, String dr, String dp, String dt, long time) {
-        this.cid = cid;
-        this.uip = uip;
-        this.ua = ua;
-        this.dr = dr;
-        this.dp = dp;
-        this.dt = dt;
-        this.time = time;
+    public GoogleAnalyticsEvent(String clientId, String userIp, String userAgent, String documentReferrer,
+        String documentPath, String documentTitle) {
+        Assert.notNull(clientId, "A client id is required to create a Google Analytics event");
+        this.clientId = clientId;
+        this.userIp = userIp;
+        this.userAgent = userAgent;
+        this.documentReferrer = documentReferrer;
+        this.documentPath = documentPath;
+        this.documentTitle = documentTitle;
+        this.time = System.currentTimeMillis();
     }
 
-    /**
-     * Return Client ID
-     */
-    public String getCid() {
-        return cid;
+    public String getClientId() {
+        return clientId;
     }
 
-    /**
-     * Set Client ID
-     */
-    public void setCid(String cid) {
-        this.cid = cid;
+    public String getUserIp() {
+        return userIp;
     }
 
-    /**
-     * Return User IP
-     */
-    public String getUip() {
-        return uip;
+    public String getUserAgent() {
+        return userAgent != null ? userAgent : "";
     }
 
-    /**
-     * Set User IP
-     */
-    public void setUip(String uip) {
-        this.uip = uip;
+    public String getDocumentReferrer() {
+        return documentReferrer != null ? documentReferrer : "";
     }
 
-    /**
-     * Returns User Agent
-     */
-    public String getUa() {
-        if (ua == null) {
-            return "";
-        } else {
-            return ua;
-        }
+    public String getDocumentPath() {
+        return documentPath;
     }
 
-    /**
-     * Set User Agent
-     */
-    public void setUa(String ua) {
-        this.ua = ua;
+    public String getDocumentTitle() {
+        return documentTitle;
     }
 
-    /**
-     * Return Document Referrer
-     */
-    public String getDr() {
-        if (dr == null) {
-            return "";
-        } else {
-            return dr;
-        }
-    }
-
-    /**
-     * Set Document Referrer
-     */
-    public void setDr(String dr) {
-        this.dr = dr;
-    }
-
-    /**
-     * Return Document Path
-     */
-    public String getDp() {
-        return dp;
-    }
-
-    /**
-     * Set Document Path
-     */
-    public void setDp(String dp) {
-        this.dp = dp;
-    }
-
-    /**
-     * Return Document Title
-     */
-    public String getDt() {
-        return dt;
-    }
-
-    /**
-     * Set Document Title
-     */
-    public void setDt(String dt) {
-        this.dt = dt;
-    }
-
-    /**
-     * Return Time of event
-     */
     public long getTime() {
         return time;
     }
 
-    /**
-     * Set Time of event
-     */
-    public void setTime(long time) {
-        this.time = time;
+    @Override
+    public int hashCode() {
+        return Objects.hash(clientId, documentPath, documentReferrer, documentTitle, time, userAgent, userIp);
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        GoogleAnalyticsEvent other = (GoogleAnalyticsEvent) obj;
+        return Objects.equals(clientId, other.clientId) && Objects.equals(documentPath, other.documentPath)
+            && Objects.equals(documentReferrer, other.documentReferrer)
+            && Objects.equals(documentTitle, other.documentTitle) && time == other.time
+            && Objects.equals(userAgent, other.userAgent) && Objects.equals(userIp, other.userIp);
+    }
+
+    @Override
+    public String toString() {
+        return "GoogleAnalyticsEvent [clientId=" + clientId + ", userIp=" + userIp + ", userAgent=" + userAgent
+            + ", documentReferrer=" + documentReferrer + ", documentPath=" + documentPath + ", documentTitle="
+            + documentTitle + ", time=" + time + "]";
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/google/GoogleAsyncEventListener.java b/dspace-api/src/main/java/org/dspace/google/GoogleAsyncEventListener.java
index cf5c40976d..c169e4712f 100644
--- a/dspace-api/src/main/java/org/dspace/google/GoogleAsyncEventListener.java
+++ b/dspace-api/src/main/java/org/dspace/google/GoogleAsyncEventListener.java
@@ -7,34 +7,25 @@
  */
 package org.dspace.google;
 
-import java.io.IOException;
-import java.net.URLEncoder;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import javax.servlet.http.HttpServletRequest;
 
-import com.google.common.base.Throwables;
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.BufferUtils;
 import org.apache.commons.collections.buffer.CircularFifoBuffer;
 import org.apache.commons.lang.StringUtils;
-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;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.google.client.GoogleAnalyticsClient;
 import org.dspace.service.ClientInfoService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.model.Event;
@@ -42,96 +33,173 @@ import org.dspace.usage.AbstractUsageEventListener;
 import org.dspace.usage.UsageEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 
-
 /**
  * Notifies Google Analytics of Bitstream VIEW events. These events are stored in memory and then
  * asynchronously processed by a single seperate thread.
  *
  * @author April Herron
+ * @author Luca Giamminonni
  */
 public class GoogleAsyncEventListener extends AbstractUsageEventListener {
 
-    private static final int MAX_TIME_SINCE_EVENT = 14400000;
     // 20 is the event max set by the GA API
-    private static final int GA_MAX_EVENTS = 20;
-    private static final String ANALYTICS_BATCH_ENDPOINT = "https://www.google-analytics.com/batch";
-    private static Logger log = Logger.getLogger(GoogleAsyncEventListener.class);
-    private static String analyticsKey;
-    private static CloseableHttpClient httpclient;
-    private static Buffer buffer;
-    private static ExecutorService executor;
-    private static Future future;
-    private static boolean destroyed = false;
+    public static final int GA_MAX_EVENTS = 20;
 
-    @Autowired(required = true)
-    ConfigurationService configurationService;
+    private static final Logger LOGGER = LogManager.getLogger();
 
-    @Autowired(required = true)
-    ClientInfoService clientInfoService;
+    private static final int MAX_TIME_SINCE_EVENT = 14400000;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private ClientInfoService clientInfoService;
+
+    @Autowired
+    private List<GoogleAnalyticsClient> googleAnalyticsClients;
+
+    private Buffer eventsBuffer;
 
     @PostConstruct
     public void init() {
-        analyticsKey = configurationService.getProperty("google.analytics.key");
-        if (StringUtils.isNotEmpty(analyticsKey)) {
-            int analyticsBufferlimit = configurationService.getIntProperty("google.analytics.buffer.limit", 256);
-            buffer = BufferUtils.synchronizedBuffer(new CircularFifoBuffer(analyticsBufferlimit));
-            httpclient = HttpClients.createDefault();
-            executor = Executors.newSingleThreadExecutor();
-            future = executor.submit(new GoogleAnalyticsTask());
-        }
+        int analyticsBufferlimit = configurationService.getIntProperty("google.analytics.buffer.limit", 256);
+        eventsBuffer = BufferUtils.synchronizedBuffer(new CircularFifoBuffer(analyticsBufferlimit));
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void receiveEvent(Event event) {
-        if ((event instanceof UsageEvent)) {
-            if (StringUtils.isNotEmpty(analyticsKey)) {
-                UsageEvent ue = (UsageEvent) event;
-                log.debug("Usage event received " + event.getName());
-                try {
-                    if (ue.getAction() == UsageEvent.Action.VIEW &&
-                            ue.getObject().getType() == Constants.BITSTREAM) {
 
-                        // Client ID, should uniquely identify the user or device. If we have an X-CORRELATION-ID
-                        // header or a session ID for the user, then lets use it, othwerwise generate a UUID.
-                        String cid;
-                        if (ue.getRequest().getHeader("X-CORRELATION-ID") != null) {
-                            cid = ue.getRequest().getHeader("X-CORRELATION-ID");
-                        } else if (ue.getRequest().getSession(false) != null) {
-                            cid = ue.getRequest().getSession().getId();
-                        } else {
-                            cid = UUID.randomUUID().toString();
-                        }
-                        // Prefer the X-REFERRER header, otherwise falback to the referrer header
-                        String referrer;
-                        if (ue.getRequest().getHeader("X-REFERRER") != null) {
-                            referrer = ue.getRequest().getHeader("X-REFERRER");
-                        } else {
-                            referrer = ue.getRequest().getHeader("referer");
-                        }
-                        buffer.add(new GoogleAnalyticsEvent(cid, clientInfoService.getClientIp(ue.getRequest()),
-                                ue.getRequest().getHeader("USER-AGENT"), referrer,
-                                ue.getRequest() .getRequestURI() + "?" + ue.getRequest().getQueryString(),
-                                getObjectName(ue), System.currentTimeMillis()));
-                    }
-                } catch (Exception e) {
-                    log.error("Failed to add event to buffer", e);
-                    log.error("Event information: " + ue);
-                    Context context = ue.getContext();
-                    if (context != null) {
-                        log.error("Context information:");
-                        log.error("    Current User: " + context.getCurrentUser());
-                        log.error("    Extra log info: " + context.getExtraLogInfo());
-                        if (context.getEvents() != null && !context.getEvents().isEmpty()) {
-                            for (int x = 1; x <= context.getEvents().size(); x++) {
-                                log.error("    Context Event " + x + ": " + context.getEvents().get(x));
-                            }
-                        }
-                    } else {
-                        log.error("UsageEvent has no Context object");
-                    }
-                }
+        if (!(event instanceof UsageEvent) || isGoogleAnalyticsKeyNotConfigured()) {
+            return;
+        }
+
+        UsageEvent usageEvent = (UsageEvent) event;
+        LOGGER.debug("Usage event received " + event.getName());
+
+        if (isNotBitstreamViewEvent(usageEvent)) {
+            return;
+        }
+
+        try {
+            GoogleAnalyticsEvent analyticsEvent = createGoogleAnalyticsEvent(usageEvent);
+            eventsBuffer.add(analyticsEvent);
+        } catch (Exception e) {
+            logReceiveEventException(usageEvent, e);
+        }
+
+    }
+
+    /**
+     * Send the collected events to Google Analytics.
+     */
+    public void sendCollectedEvents() {
+
+        if (isGoogleAnalyticsKeyNotConfigured()) {
+            return;
+        }
+
+        String analyticsKey = getGoogleAnalyticsKey();
+
+        List<GoogleAnalyticsEvent> events = getEventsFromBufferFilteredByEventTime();
+
+        if (events.isEmpty()) {
+            return;
+        }
+
+        GoogleAnalyticsClient client = getClientByAnalyticsKey(analyticsKey);
+
+        try {
+            client.sendEvents(analyticsKey, events);
+        } catch (RuntimeException ex) {
+            LOGGER.error("An error occurs sending the events.", ex);
+        }
+
+    }
+
+    /**
+     * Creates an instance of GoogleAnalyticsEvent from the given usage event.
+     * @param  usageEvent the usage event
+     * @return            the Google Analytics event instance
+     */
+    private GoogleAnalyticsEvent createGoogleAnalyticsEvent(UsageEvent usageEvent) {
+
+        HttpServletRequest request = usageEvent.getRequest();
+
+        String clientId = getClientId(usageEvent);
+        String referrer = getReferrer(usageEvent);
+        String clientIp = clientInfoService.getClientIp(request);
+        String userAgent = request.getHeader("USER-AGENT");
+        String documentPath = getDocumentPath(request);
+        String documentName = getObjectName(usageEvent);
+
+        return new GoogleAnalyticsEvent(clientId, clientIp, userAgent, referrer,
+            documentPath, documentName);
+    }
+
+    /**
+     * Client ID, should uniquely identify the user or device. If we have an
+     * X-CORRELATION-ID header or a session ID for the user, then lets use it,
+     * othwerwise generate a UUID.
+     */
+    private String getClientId(UsageEvent usageEvent) {
+        if (usageEvent.getRequest().getHeader("X-CORRELATION-ID") != null) {
+            return usageEvent.getRequest().getHeader("X-CORRELATION-ID");
+        } else if (usageEvent.getRequest().getSession(false) != null) {
+            return usageEvent.getRequest().getSession().getId();
+        } else {
+            return UUID.randomUUID().toString();
+        }
+    }
+
+    /**
+     * Prefer the X-REFERRER header, otherwise fallback to the referrer header.
+     */
+    private String getReferrer(UsageEvent usageEvent) {
+        if (usageEvent.getRequest().getHeader("X-REFERRER") != null) {
+            return usageEvent.getRequest().getHeader("X-REFERRER");
+        } else {
+            return usageEvent.getRequest().getHeader("referer");
+        }
+    }
+
+    private String getDocumentPath(HttpServletRequest request) {
+        String documentPath = request.getRequestURI();
+        if (StringUtils.isNotBlank(request.getQueryString())) {
+            documentPath += "?" + request.getQueryString();
+        }
+        return documentPath;
+    }
+
+    private boolean isNotBitstreamViewEvent(UsageEvent usageEvent) {
+        return usageEvent.getAction() != UsageEvent.Action.VIEW
+            || usageEvent.getObject().getType() != Constants.BITSTREAM;
+    }
+
+    private boolean isGoogleAnalyticsKeyNotConfigured() {
+        return StringUtils.isBlank(getGoogleAnalyticsKey());
+    }
+
+    private void logReceiveEventException(UsageEvent usageEvent, Exception e) {
+
+        LOGGER.error("Failed to add event to buffer", e);
+        LOGGER.error("Event information: " + usageEvent);
+
+        Context context = usageEvent.getContext();
+        if (context == null) {
+            LOGGER.error("UsageEvent has no Context object");
+            return;
+        }
+
+        LOGGER.error("Context information:");
+        LOGGER.error("    Current User: " + context.getCurrentUser());
+        LOGGER.error("    Extra log info: " + context.getExtraLogInfo());
+        if (context.getEvents() != null && !context.getEvents().isEmpty()) {
+            for (int x = 1; x <= context.getEvents().size(); x++) {
+                LOGGER.error("    Context Event " + x + ": " + context.getEvents().get(x));
             }
         }
+
     }
 
     private String getObjectName(UsageEvent ue) {
@@ -146,7 +214,7 @@ public class GoogleAsyncEventListener extends AbstractUsageEventListener {
             }
         } catch (SQLException e) {
             // This shouldn't merit interrupting the user's transaction so log the error and continue.
-            log.error("Error in Google Analytics recording - can't determine ParentObjectName for bitstream " +
+            LOGGER.error("Error in Google Analytics recording - can't determine ParentObjectName for bitstream " +
                     ue.getObject().getID(), e);
         }
 
@@ -154,78 +222,73 @@ public class GoogleAsyncEventListener extends AbstractUsageEventListener {
 
     }
 
-    @PreDestroy
-    public void destroy() throws InterruptedException {
-        destroyed = true;
-        if (StringUtils.isNotEmpty(analyticsKey)) {
-            future.cancel(true);
-            executor.shutdown();
-            executor.awaitTermination(1, TimeUnit.SECONDS);
-        }
-    }
+    /**
+     * Returns the first GA_MAX_EVENTS stored in the eventsBuffer with a time minor
+     * that MAX_TIME_SINCE_EVENT. The found events are removed from the buffer.
+     *
+     * @return the events from the buffer
+     */
+    private List<GoogleAnalyticsEvent> getEventsFromBufferFilteredByEventTime() {
 
-    private static class GoogleAnalyticsTask implements Runnable {
-        public void run() {
-            while (!destroyed) {
-                try {
-                    boolean sleep = false;
-                    StringBuilder request = null;
-                    List<GoogleAnalyticsEvent> events = new ArrayList<>();
-                    Iterator iterator = buffer.iterator();
-                    for (int x = 0; x < GA_MAX_EVENTS && iterator.hasNext(); x++) {
-                        GoogleAnalyticsEvent event = (GoogleAnalyticsEvent) iterator.next();
-                        events.add(event);
-                        if ((System.currentTimeMillis() - event.getTime()) < MAX_TIME_SINCE_EVENT) {
-                            String download = "v=1" +
-                                    "&tid=" + analyticsKey +
-                                    "&cid=" + event.getCid() +
-                                    "&t=event" +
-                                    "&uip=" + URLEncoder.encode(event.getUip(), "UTF-8") +
-                                    "&ua=" + URLEncoder.encode(event.getUa(), "UTF-8") +
-                                    "&dr=" + URLEncoder.encode(event.getDr(), "UTF-8") +
-                                    "&dp=" + URLEncoder.encode(event.getDp(), "UTF-8") +
-                                    "&dt=" + URLEncoder.encode(event.getDt(), "UTF-8") +
-                                    "&qt=" + (System.currentTimeMillis() - event.getTime()) +
-                                    "&ec=bitstream" +
-                                    "&ea=download" +
-                                    "&el=item";
-                            if (request == null) {
-                                request = new StringBuilder(download);
-                            } else {
-                                request.append("\n").append(download);
-                            }
-                        }
-                    }
+        List<GoogleAnalyticsEvent> events = new ArrayList<>();
 
-                    if (request != null) {
-                        HttpPost httpPost = new HttpPost(ANALYTICS_BATCH_ENDPOINT);
-                        httpPost.setEntity(new StringEntity(request.toString()));
-                        try (final CloseableHttpResponse response2 = httpclient.execute(httpPost)) {
-                            // I can't find a list of what are acceptable responses,
-                            // so I log the response but take no action.
-                            log.debug("Google Analytics response is " + response2.getStatusLine());
-                            // Cleanup processed events
-                            buffer.removeAll(events);
-                        } catch (IOException e) {
-                            log.error("GA post failed", e);
-                        }
-                    } else {
-                        sleep = true;
-                    }
+        Iterator<?> iterator = eventsBuffer.iterator();
 
-                    if (sleep) {
-                        try {
-                            Thread.sleep(60000);
-                        } catch (InterruptedException e) {
-                            log.debug("Interrupted; checking if we should stop");
-                        }
-                    }
-                } catch (Throwable t) {
-                    log.error("Unexpected error; aborting GA event recording", t);
-                    Throwables.propagate(t);
-                }
+        while (iterator.hasNext() && events.size() < GA_MAX_EVENTS) {
+
+            GoogleAnalyticsEvent event = (GoogleAnalyticsEvent) iterator.next();
+            eventsBuffer.remove(event);
+
+            if ((System.currentTimeMillis() - event.getTime()) < MAX_TIME_SINCE_EVENT) {
+                events.add(event);
             }
-            log.info("Stopping GA event recording");
+
         }
+
+        return events;
     }
+
+    /**
+     * Returns the first instance of the GoogleAnalyticsClient that supports the
+     * given analytics key.
+     *
+     * @param  analyticsKey          the analytics key.
+     * @return                       the found client
+     * @throws IllegalStateException if no client is found for the given analytics
+     *                               key
+     */
+    private GoogleAnalyticsClient getClientByAnalyticsKey(String analyticsKey) {
+
+        List<GoogleAnalyticsClient> clients = googleAnalyticsClients.stream()
+            .filter(client -> client.isAnalyticsKeySupported(analyticsKey))
+            .collect(Collectors.toList());
+
+        if (clients.isEmpty()) {
+            throw new IllegalStateException("No Google Analytics Client supports key " + analyticsKey);
+        }
+
+        if (clients.size() > 1) {
+            throw new IllegalStateException("More than one Google Analytics Client supports key " + analyticsKey);
+        }
+
+        return clients.get(0);
+
+    }
+
+    private String getGoogleAnalyticsKey() {
+        return configurationService.getProperty("google.analytics.key");
+    }
+
+    public List<GoogleAnalyticsClient> getGoogleAnalyticsClients() {
+        return googleAnalyticsClients;
+    }
+
+    public void setGoogleAnalyticsClients(List<GoogleAnalyticsClient> googleAnalyticsClients) {
+        this.googleAnalyticsClients = googleAnalyticsClients;
+    }
+
+    public Buffer getEventsBuffer() {
+        return eventsBuffer;
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalytics4ClientRequestBuilder.java b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalytics4ClientRequestBuilder.java
new file mode 100644
index 0000000000..85f48d6108
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalytics4ClientRequestBuilder.java
@@ -0,0 +1,247 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+import static java.util.stream.Collectors.groupingBy;
+import static org.apache.commons.lang.StringUtils.startsWith;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.google.GoogleAnalyticsEvent;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link GoogleAnalyticsClientRequestBuilder} that compose
+ * the request for Google Analytics 4 (GA4).
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GoogleAnalytics4ClientRequestBuilder implements GoogleAnalyticsClientRequestBuilder {
+
+    private final String endpointUrl;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    public GoogleAnalytics4ClientRequestBuilder(String endpointUrl) {
+        this.endpointUrl = endpointUrl;
+    }
+
+    @Override
+    public String getEndpointUrl(String analyticsKey) {
+
+        if (!startsWith(analyticsKey, "G-")) {
+            throw new IllegalArgumentException("Only keys with G- prefix are supported");
+        }
+
+        String apiSecret = configurationService.getProperty("google.analytics.api-secret");
+        if (StringUtils.isBlank(apiSecret)) {
+            throw new GoogleAnalyticsClientException("The API secret must be configured to sent GA4 events");
+        }
+
+        return endpointUrl + "?api_secret=" + apiSecret + "&measurement_id=" + analyticsKey;
+
+    }
+
+    @Override
+    public List<String> composeRequestsBody(String analyticsKey, List<GoogleAnalyticsEvent> events) {
+
+        Map<String, List<GoogleAnalyticsEvent>> eventsGroupedByClientId = groupByClientId(events);
+
+        List<String> requestsBody = new ArrayList<String>();
+
+        for (String clientId : eventsGroupedByClientId.keySet()) {
+            String requestBody = composeRequestBody(clientId, eventsGroupedByClientId.get(clientId));
+            requestsBody.add(requestBody);
+        }
+
+        return requestsBody;
+
+    }
+
+    private Map<String, List<GoogleAnalyticsEvent>> groupByClientId(List<GoogleAnalyticsEvent> events) {
+        return events.stream()
+            .collect(groupingBy(GoogleAnalyticsEvent::getClientId));
+    }
+
+    private String composeRequestBody(String clientId, List<GoogleAnalyticsEvent> events) {
+
+        GoogleAnalytics4EventsVO eventsVo = new GoogleAnalytics4EventsVO(clientId);
+
+        events.stream()
+            .map(GoogleAnalytics4EventVO::fromGoogleAnalyticsEvent)
+            .forEach(eventsVo::addEvent);
+
+        return toJsonAsString(eventsVo);
+
+    }
+
+    private String toJsonAsString(GoogleAnalytics4EventsVO eventsVo) {
+        try {
+            return objectMapper.writeValueAsString(eventsVo);
+        } catch (JsonProcessingException e) {
+            throw new GoogleAnalyticsClientException(e);
+        }
+    }
+
+    public void setConfigurationService(ConfigurationService configurationService) {
+        this.configurationService = configurationService;
+    }
+
+    /**
+     * Class that models the json of the events to be write in the body of the GA request.
+     */
+    public static class GoogleAnalytics4EventsVO {
+
+        @JsonProperty("client_id")
+        private final String clientId;
+
+        private final List<GoogleAnalytics4EventVO> events;
+
+        public GoogleAnalytics4EventsVO(String clientId) {
+            this.clientId = clientId;
+            this.events = new ArrayList<>();
+        }
+
+        public String getClientId() {
+            return clientId;
+        }
+
+        public List<GoogleAnalytics4EventVO> getEvents() {
+            return events;
+        }
+
+        public void addEvent(GoogleAnalytics4EventVO event) {
+            this.events.add(event);
+        }
+
+    }
+
+    /**
+     * Class that model a single event to be sent to GA.
+     */
+    public static class GoogleAnalytics4EventVO {
+
+        private final String name = "item";
+
+        private final GoogleAnalytics4EventParamsVO params;
+
+        public static GoogleAnalytics4EventVO fromGoogleAnalyticsEvent(GoogleAnalyticsEvent event) {
+            return new GoogleAnalytics4EventVO(event.getTime(), event.getDocumentTitle(), event.getDocumentPath(),
+                event.getDocumentReferrer(), event.getUserAgent(), event.getUserIp());
+        }
+
+        public GoogleAnalytics4EventVO(long time, String documentTitle, String documentPath, String documentReferrer,
+            String userAgent, String userIp) {
+
+            this.params = new GoogleAnalytics4EventParamsVO(time, documentTitle, documentPath,
+                documentReferrer, userAgent, userIp);
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public GoogleAnalytics4EventParamsVO getParams() {
+            return params;
+        }
+
+    }
+
+    /**
+     * Class that model the params of a specific event to be sent to GA.
+     *
+     * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+     *
+     */
+    public static class GoogleAnalytics4EventParamsVO {
+
+        private final String action = "download";
+
+        private final String category = "bitstream";
+
+        @JsonInclude(Include.NON_NULL)
+        private final long time;
+
+        @JsonInclude(Include.NON_NULL)
+        @JsonProperty("document_title")
+        private final String documentTitle;
+
+        @JsonInclude(Include.NON_NULL)
+        @JsonProperty("document_path")
+        private final String documentPath;
+
+        @JsonInclude(Include.NON_NULL)
+        @JsonProperty("document_referrer")
+        private final String documentReferrer;
+
+        @JsonInclude(Include.NON_NULL)
+        @JsonProperty("user_agent")
+        private final String userAgent;
+
+        @JsonInclude(Include.NON_NULL)
+        @JsonProperty("user_ip")
+        private final String userIp;
+
+        public GoogleAnalytics4EventParamsVO(long time, String documentTitle, String documentPath,
+            String documentReferrer, String userAgent, String userIp) {
+            this.time = time;
+            this.documentTitle = documentTitle;
+            this.documentPath = documentPath;
+            this.documentReferrer = documentReferrer;
+            this.userAgent = userAgent;
+            this.userIp = userIp;
+        }
+
+        public long getTime() {
+            return time;
+        }
+
+        public String getDocumentTitle() {
+            return documentTitle;
+        }
+
+        public String getDocumentPath() {
+            return documentPath;
+        }
+
+        public String getDocumentReferrer() {
+            return documentReferrer;
+        }
+
+        public String getUserAgent() {
+            return userAgent;
+        }
+
+        public String getUserIp() {
+            return userIp;
+        }
+
+        public String getAction() {
+            return action;
+        }
+
+        public String getCategory() {
+            return category;
+        }
+
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClient.java b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClient.java
new file mode 100644
index 0000000000..80f64aa534
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClient.java
@@ -0,0 +1,37 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+import java.util.List;
+
+import org.dspace.google.GoogleAnalyticsEvent;
+
+/**
+ * Client to send events to Google Analytics.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface GoogleAnalyticsClient {
+
+    /**
+     * Check if the client supports the given analytics key.
+     *
+     * @param  analyticsKey the analytics key
+     * @return              true if the key is supported, false otherwise
+     */
+    boolean isAnalyticsKeySupported(String analyticsKey);
+
+    /**
+     * Send the given Google Analytics events.
+     *
+     * @param analyticsKey the analytics key
+     * @param events       the events to be sent
+     */
+    void sendEvents(String analyticsKey, List<GoogleAnalyticsEvent> events);
+}
diff --git a/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientException.java b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientException.java
new file mode 100644
index 0000000000..a762deed34
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientException.java
@@ -0,0 +1,32 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+/**
+ * Exception thrown by {@link GoogleAnalyticsClient} during the events sending.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GoogleAnalyticsClientException extends RuntimeException {
+
+    private static final long serialVersionUID = -2248100136404696572L;
+
+    public GoogleAnalyticsClientException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public GoogleAnalyticsClientException(String message) {
+        super(message);
+    }
+
+    public GoogleAnalyticsClientException(Throwable cause) {
+        super(cause);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientImpl.java b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientImpl.java
new file mode 100644
index 0000000000..b5ee1806cd
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientImpl.java
@@ -0,0 +1,119 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+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;
+import org.dspace.google.GoogleAnalyticsEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Implementation of {@link GoogleAnalyticsClient}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GoogleAnalyticsClientImpl implements GoogleAnalyticsClient {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GoogleAnalyticsClientImpl.class);
+
+    private final String keyPrefix;
+
+    private final GoogleAnalyticsClientRequestBuilder requestBuilder;
+
+    private final CloseableHttpClient httpclient;
+
+    public GoogleAnalyticsClientImpl(String keyPrefix, GoogleAnalyticsClientRequestBuilder requestBuilder) {
+        this.keyPrefix = keyPrefix;
+        this.requestBuilder = requestBuilder;
+        this.httpclient = HttpClients.createDefault();
+    }
+
+    @Override
+    public boolean isAnalyticsKeySupported(String analyticsKey) {
+        return StringUtils.startsWith(analyticsKey, keyPrefix);
+    }
+
+    @Override
+    public void sendEvents(String analyticsKey, List<GoogleAnalyticsEvent> events) {
+
+        if (!isAnalyticsKeySupported(analyticsKey)) {
+            throw new IllegalArgumentException("The given analytics key " + analyticsKey
+                + " is not supported. A key with prefix " + keyPrefix + " is required");
+        }
+
+        String endpointUrl = requestBuilder.getEndpointUrl(analyticsKey);
+
+        requestBuilder.composeRequestsBody(analyticsKey, events)
+            .forEach(requestBody -> sendRequest(endpointUrl, requestBody));
+
+    }
+
+    private void sendRequest(String endpointUrl, String requestBody) {
+
+        try {
+
+            HttpPost httpPost = new HttpPost(endpointUrl);
+            httpPost.setEntity(new StringEntity(requestBody));
+
+            try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
+                if (isNotSuccessfull(response)) {
+                    throw new GoogleAnalyticsClientException(formatErrorMessage(response));
+                }
+            }
+
+        } catch (GoogleAnalyticsClientException ex) {
+            throw ex;
+        } catch (Exception ex) {
+            throw new GoogleAnalyticsClientException("An error occurs sending events to " + endpointUrl, ex);
+        }
+
+    }
+
+    private boolean isNotSuccessfull(HttpResponse response) {
+        int statusCode = getStatusCode(response);
+        return statusCode < 200 || statusCode > 299;
+    }
+
+    private int getStatusCode(HttpResponse response) {
+        return response.getStatusLine().getStatusCode();
+    }
+
+    private String formatErrorMessage(HttpResponse response) {
+        return "Status " + getStatusCode(response) + ". Content: " + getResponseContent(response);
+    }
+
+    private String getResponseContent(HttpResponse response) {
+        try {
+            return IOUtils.toString(response.getEntity().getContent(), Charset.defaultCharset());
+        } catch (UnsupportedOperationException | IOException e) {
+            LOGGER.error("An error occurs getting the response content", e);
+            return "Generic error";
+        }
+    }
+
+    public String getKeyPrefix() {
+        return keyPrefix;
+    }
+
+    public GoogleAnalyticsClientRequestBuilder getRequestBuilder() {
+        return requestBuilder;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientRequestBuilder.java b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientRequestBuilder.java
new file mode 100644
index 0000000000..f45eddce4c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientRequestBuilder.java
@@ -0,0 +1,40 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+import java.util.List;
+
+import org.dspace.google.GoogleAnalyticsEvent;
+
+/**
+ * Interface for classes used by {@link GoogleAnalyticsClient} to define the url
+ * and the body of the requests to be sent to Google Analytics.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface GoogleAnalyticsClientRequestBuilder {
+
+    /**
+     * Returns the url of the Google Analytics endpoint.
+     *
+     * @param  analyticsKey the Google Analytics key
+     * @return              the endpoint url
+     */
+    String getEndpointUrl(String analyticsKey);
+
+    /**
+     * Returns the body of the requests to be sent to Google Analytics as string,
+     * based on the given analytics key and events.
+     *
+     * @param  analyticsKey the Google Analytics key
+     * @param  events       the events to be sent
+     * @return              the requests body as string
+     */
+    List<String> composeRequestsBody(String analyticsKey, List<GoogleAnalyticsEvent> events);
+}
diff --git a/dspace-api/src/main/java/org/dspace/google/client/UniversalAnalyticsClientRequestBuilder.java b/dspace-api/src/main/java/org/dspace/google/client/UniversalAnalyticsClientRequestBuilder.java
new file mode 100644
index 0000000000..274c27957e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/google/client/UniversalAnalyticsClientRequestBuilder.java
@@ -0,0 +1,74 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+import static org.apache.commons.lang.StringUtils.startsWith;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.dspace.google.GoogleAnalyticsEvent;
+
+/**
+ * Implementation of {@link GoogleAnalyticsClientRequestBuilder} that compose
+ * the request for Universal Analytics (UA).
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class UniversalAnalyticsClientRequestBuilder implements GoogleAnalyticsClientRequestBuilder {
+
+    private final String endpointUrl;
+
+    public UniversalAnalyticsClientRequestBuilder(String endpointUrl) {
+        this.endpointUrl = endpointUrl;
+    }
+
+    @Override
+    public String getEndpointUrl(String analyticsKey) {
+        return endpointUrl;
+    }
+
+    @Override
+    public List<String> composeRequestsBody(String analyticsKey, List<GoogleAnalyticsEvent> events) {
+
+        if (!startsWith(analyticsKey, "UA-")) {
+            throw new IllegalArgumentException("Only keys with UA- prefix are supported");
+        }
+
+        String requestBody = events.stream()
+            .map(event -> formatEvent(analyticsKey, event))
+            .collect(Collectors.joining("\n"));
+
+        return isNotEmpty(requestBody) ? List.of(requestBody) : List.of();
+    }
+
+    private String formatEvent(String analyticsKey, GoogleAnalyticsEvent event) {
+        return "v=1" +
+            "&tid=" + analyticsKey +
+            "&cid=" + event.getClientId() +
+            "&t=event" +
+            "&uip=" + encodeParameter(event.getUserIp()) +
+            "&ua=" + encodeParameter(event.getUserAgent()) +
+            "&dr=" + encodeParameter(event.getDocumentReferrer()) +
+            "&dp=" + encodeParameter(event.getDocumentPath()) +
+            "&dt=" + encodeParameter(event.getDocumentTitle()) +
+            "&qt=" + (System.currentTimeMillis() - event.getTime()) +
+            "&ec=bitstream" +
+            "&ea=download" +
+            "&el=item";
+    }
+
+    private String encodeParameter(String parameter) {
+        return URLEncoder.encode(parameter, StandardCharsets.UTF_8);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java b/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
index c417aa4794..aa730fe2b1 100644
--- a/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
@@ -9,6 +9,7 @@ package org.dspace.handle;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -211,17 +212,17 @@ public class HandleServiceImpl implements HandleService {
     @Override
     public void unbindHandle(Context context, DSpaceObject dso)
         throws SQLException {
-        List<Handle> handles = getInternalHandles(context, dso);
-        if (CollectionUtils.isNotEmpty(handles)) {
-            for (Handle handle : handles) {
+        Iterator<Handle> handles = dso.getHandles().iterator();
+        if (handles.hasNext()) {
+            while (handles.hasNext()) {
+                final Handle handle = handles.next();
+                handles.remove();
                 //Only set the "resouce_id" column to null when unbinding a handle.
                 // We want to keep around the "resource_type_id" value, so that we
                 // can verify during a restore whether the same *type* of resource
                 // is reusing this handle!
                 handle.setDSpaceObject(null);
 
-                //Also remove the handle from the DSO list to keep a consistent model
-                dso.getHandles().remove(handle);
 
                 handleDAO.save(context, handle);
 
@@ -256,7 +257,7 @@ public class HandleServiceImpl implements HandleService {
     @Override
     public String findHandle(Context context, DSpaceObject dso)
         throws SQLException {
-        List<Handle> handles = getInternalHandles(context, dso);
+        List<Handle> handles = dso.getHandles();
         if (CollectionUtils.isEmpty(handles)) {
             return null;
         } else {
@@ -328,20 +329,6 @@ public class HandleServiceImpl implements HandleService {
     ////////////////////////////////////////
     // Internal methods
     ////////////////////////////////////////
-
-    /**
-     * Return the handle for an Object, or null if the Object has no handle.
-     *
-     * @param context DSpace context
-     * @param dso     DSpaceObject for which we require our handles
-     * @return The handle for object, or null if the object has no handle.
-     * @throws SQLException If a database error occurs
-     */
-    protected List<Handle> getInternalHandles(Context context, DSpaceObject dso)
-        throws SQLException {
-        return handleDAO.getHandlesByDSpaceObject(context, dso);
-    }
-
     /**
      * Find the database row corresponding to handle.
      *
@@ -405,7 +392,7 @@ public class HandleServiceImpl implements HandleService {
         }
 
         // Check additional prefixes supported in the config file
-        String[] additionalPrefixes = configurationService.getArrayProperty("handle.additional.prefixes");
+        String[] additionalPrefixes = getAdditionalPrefixes();
         for (String additionalPrefix : additionalPrefixes) {
             if (identifier.startsWith(additionalPrefix + "/")) {
                 // prefix is the equivalent of 123456789 in 123456789/???; don't strip
@@ -415,4 +402,9 @@ public class HandleServiceImpl implements HandleService {
 
         return null;
     }
+
+    @Override
+    public String[] getAdditionalPrefixes() {
+        return configurationService.getArrayProperty("handle.additional.prefixes");
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/handle/UpdateHandlePrefix.java b/dspace-api/src/main/java/org/dspace/handle/UpdateHandlePrefix.java
index 133d3dbc2c..7fb03376eb 100644
--- a/dspace-api/src/main/java/org/dspace/handle/UpdateHandlePrefix.java
+++ b/dspace-api/src/main/java/org/dspace/handle/UpdateHandlePrefix.java
@@ -126,7 +126,7 @@ public class UpdateHandlePrefix {
                         );
 
                     } catch (SQLException sqle) {
-                        if ((context != null) && (context.isValid())) {
+                        if (context.isValid()) {
                             context.abort();
                             context = null;
                         }
diff --git a/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverDTO.java b/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverDTO.java
new file mode 100644
index 0000000000..fe50bba813
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverDTO.java
@@ -0,0 +1,87 @@
+/**
+ * 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/
+ */
+package org.dspace.handle.hdlresolver;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Objects;
+
+import org.apache.commons.lang3.Validate;
+import org.dspace.core.Constants;
+
+/**
+ * Maps the URL of the request to an handle identifier
+ * 
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.it)
+ *
+ */
+public class HdlResolverDTO {
+
+    private final String[] splittedString;
+    private final String handle;
+
+    /**
+     * Decode a given URL
+     * @param url URL
+     * @return decoded URL
+     */
+    private static String decode(String url) {
+        try {
+            return URLDecoder.decode(url, Constants.DEFAULT_ENCODING);
+        } catch (UnsupportedEncodingException e) {
+            return url;
+        }
+    }
+
+    /**
+     * Default Constructor
+     * 
+     * @param requestURL is the complete Request URL
+     * @param resolverSubPath is the rest service Sub-path
+     */
+    public HdlResolverDTO(final String requestURL, final String resolverSubPath) {
+        Validate.notBlank(requestURL, "RequestURI not specified");
+        Validate.notBlank(resolverSubPath, "fullPath not specified");
+        this.splittedString = requestURL.split(resolverSubPath);
+        if (Objects.nonNull(splittedString) && splittedString.length > 1) {
+            // Decodes the URL-encoded characters of the String
+            this.handle = decode(splittedString[1]);
+        } else {
+            this.handle = null;
+        }
+    }
+
+    /**
+     * Returns the splitted String of the resource-path
+     * 
+     * @return
+     */
+    public final String[] getSplittedString() {
+        return this.splittedString;
+    }
+
+    /**
+     * Returns the handle identifier
+     * 
+     * @return
+     */
+    public final String getHandle() {
+        return this.handle;
+    }
+
+    /**
+     * Checks if the handle identifier is valid.
+     * 
+     * @return
+     */
+    public boolean isValid() {
+        return Objects.nonNull(this.handle) &&
+                !"null".equalsIgnoreCase(this.handle) &&
+                !this.handle.trim().isEmpty();
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverService.java b/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverService.java
new file mode 100644
index 0000000000..3beca5f5dd
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverService.java
@@ -0,0 +1,69 @@
+/**
+ * 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/
+ */
+package org.dspace.handle.hdlresolver;
+
+import java.util.List;
+
+import org.dspace.core.Context;
+
+/**
+ * Service used to for utilities involving {@code HdlResolverDTO} and its
+ * resolution to handle URI and vice-versa.
+ * 
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.it)
+ *
+ */
+/**
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ *
+ */
+public interface HdlResolverService {
+
+    /**
+     * Method that creates an <code>HdlResovlerDTO</code> using the requestURI (full
+     * requested handle URI) and the path (REST handler URI)
+     * 
+     * @param requestURI
+     * @param path
+     * @return <code>HdlResolverDTO</code>
+     */
+    HdlResolverDTO resolveBy(String requestURI, String path);
+
+    /**
+     * Converts the hdlResovler into URL fetching it from repository using the DSpace context
+     * 
+     * @param context
+     * @param hdlResolver
+     * @return URL found or null
+     */
+    String resolveToURL(Context context, HdlResolverDTO hdlResolver);
+
+    /**
+     * List all available prefixes for this installation
+     * 
+     * @return `List<String>` of Handle prefixes
+     */
+    List<String> listPrefixes();
+
+    /**
+     * List all available handles with `prefix`
+     * 
+     * @param context DSpace context
+     * @param prefix prefix to search
+     * @return `List<String>` of handles
+     */
+    List<String> listHandles(Context context, String prefix);
+
+    /**
+     * Verifies status of handle controller
+     * 
+     * @return `true` if enabled, `false` otherwise
+     */
+    boolean isListhandlesEnabled();
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverServiceImpl.java b/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverServiceImpl.java
new file mode 100644
index 0000000000..3607777322
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverServiceImpl.java
@@ -0,0 +1,87 @@
+/**
+ * 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/
+ */
+package org.dspace.handle.hdlresolver;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 
+ * Handle Resolver that uses an <code>HandleService</code> to retrieve the right
+ * URL of a target Handle.
+ * 
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.it)
+ *
+ */
+@Service
+public class HdlResolverServiceImpl implements HdlResolverService {
+
+    public static final String LISTHANDLES_HIDE_PROP = "handle.hide.listhandles";
+
+    private static final Logger log = LogManager.getLogger();
+
+    @Autowired(required = true)
+    private HandleService handleService;
+
+    @Autowired(required = true)
+    private ConfigurationService configurationService;
+
+    @Override
+    public HdlResolverDTO resolveBy(String requestURI, String path) {
+        return new HdlResolverDTO(requestURI, path);
+    }
+
+    @Override
+    public String resolveToURL(Context context, HdlResolverDTO hdlResolver) {
+        try {
+            return this.handleService.resolveToURL(context, hdlResolver.getHandle());
+        } catch (SQLException e) {
+            log.error("Error while resolving Handle: " + hdlResolver.getHandle(), e);
+            throw new RuntimeException("Error while resolving Handle: " + hdlResolver.getHandle(), e);
+        }
+    }
+
+    @Override
+    public List<String> listPrefixes() {
+        return Stream.concat(
+                Stream.of(this.handleService.getAdditionalPrefixes()),
+                Stream.of(this.handleService.getPrefix())
+            )
+            .filter(StringUtils::isNotBlank)
+            .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> listHandles(Context context, String prefix) {
+        List<String> handlesForPrefix = List.of();
+        try {
+            handlesForPrefix = this.handleService.getHandlesForPrefix(context, prefix);
+        } catch (SQLException e) {
+            log.error("Error while listing handles for prefix: " + prefix, e);
+            throw new RuntimeException("Error while listing handles for prefix: " + prefix, e);
+        }
+        return handlesForPrefix;
+    }
+
+    @Override
+    public boolean isListhandlesEnabled() {
+        return !this.configurationService.getBooleanProperty(LISTHANDLES_HIDE_PROP);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/handle/service/HandleService.java b/dspace-api/src/main/java/org/dspace/handle/service/HandleService.java
index c7de7411ef..85950ab6db 100644
--- a/dspace-api/src/main/java/org/dspace/handle/service/HandleService.java
+++ b/dspace-api/src/main/java/org/dspace/handle/service/HandleService.java
@@ -101,16 +101,18 @@ public interface HandleService {
         throws SQLException, IllegalStateException;
 
     /**
-     * Creates a handle entry, but with a handle supplied by the caller (new
-     * Handle not generated)
+     * Creates a handle entry, but with a handle supplied by the caller (new Handle
+     * not generated)
      *
      * @param context        DSpace context
      * @param dso            DSpaceObject
      * @param suppliedHandle existing handle value
      * @param force          FIXME: currently unused
      * @return the Handle
-     * @throws SQLException          An exception that provides information on a database access error or other errors.
-     * @throws IllegalStateException if specified handle is already in use by another object
+     * @throws SQLException          An exception that provides information on a
+     *                               database access error or other errors.
+     * @throws IllegalStateException if specified handle is already in use by
+     *                               another object
      */
     public String createHandle(Context context, DSpaceObject dso, String suppliedHandle, boolean force)
         throws SQLException, IllegalStateException;
@@ -190,4 +192,12 @@ public interface HandleService {
      * @return
      */
     String parseHandle(String identifier);
+
+    /**
+     * Gets the additional prefixes used for handles,
+     * mapped in configuration file.
+     * 
+     * @return `String[]` array of prefixes
+     */
+    String[] getAdditionalPrefixes();
 }
diff --git a/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollectionServiceImpl.java b/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollectionServiceImpl.java
index 88cec74a58..0ad83a3292 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollectionServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollectionServiceImpl.java
@@ -19,20 +19,20 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
 
-import ORG.oclc.oai.harvester2.verb.Identify;
-import ORG.oclc.oai.harvester2.verb.ListIdentifiers;
 import org.dspace.content.Collection;
 import org.dspace.core.Context;
 import org.dspace.harvest.dao.HarvestedCollectionDAO;
 import org.dspace.harvest.service.HarvestedCollectionService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.input.DOMBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.input.DOMBuilder;
+import org.oclc.oai.harvester2.verb.Identify;
+import org.oclc.oai.harvester2.verb.ListIdentifiers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.w3c.dom.DOMException;
 import org.xml.sax.SAXException;
@@ -198,7 +198,7 @@ public class HarvestedCollectionServiceImpl implements HarvestedCollectionServic
         // First, see if we can contact the target server at all.
         try {
             new Identify(oaiSource);
-        } catch (IOException | ParserConfigurationException | TransformerException | SAXException ex) {
+        } catch (IOException | ParserConfigurationException | XPathExpressionException | SAXException ex) {
             errorSet.add(OAI_ADDRESS_ERROR + ": OAI server could not be reached.");
             return errorSet;
         }
@@ -216,7 +216,7 @@ public class HarvestedCollectionServiceImpl implements HarvestedCollectionServic
         try {
             OREOAIPrefix = OAIHarvester.oaiResolveNamespaceToPrefix(oaiSource, OAIHarvester.getORENamespace().getURI());
             DMDOAIPrefix = OAIHarvester.oaiResolveNamespaceToPrefix(oaiSource, DMD_NS.getURI());
-        } catch (IOException | ParserConfigurationException | TransformerException | SAXException ex) {
+        } catch (IOException | ParserConfigurationException | XPathExpressionException | SAXException ex) {
             errorSet.add(OAI_ADDRESS_ERROR
                 + ": OAI did not respond to ListMetadataFormats query  ("
                 + ORE_NS.getPrefix() + ":" + OREOAIPrefix + " ; "
@@ -260,7 +260,8 @@ public class HarvestedCollectionServiceImpl implements HarvestedCollectionServic
                     }
                 }
             }
-        } catch (IOException | ParserConfigurationException | TransformerException | DOMException | SAXException e) {
+        } catch (IOException | ParserConfigurationException | XPathExpressionException | DOMException |
+                 SAXException e) {
             errorSet.add(OAI_ADDRESS_ERROR + ": OAI server could not be reached");
             return errorSet;
         } catch (RuntimeException re) {
diff --git a/dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java b/dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java
index 71e00d73d7..5aeb40bdd9 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java
@@ -28,13 +28,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
 
-import ORG.oclc.oai.harvester2.verb.GetRecord;
-import ORG.oclc.oai.harvester2.verb.Identify;
-import ORG.oclc.oai.harvester2.verb.ListMetadataFormats;
-import ORG.oclc.oai.harvester2.verb.ListRecords;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
@@ -70,11 +67,15 @@ import org.dspace.harvest.service.HarvestedCollectionService;
 import org.dspace.harvest.service.HarvestedItemService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.input.DOMBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.input.DOMBuilder;
+import org.jdom2.output.XMLOutputter;
+import org.oclc.oai.harvester2.verb.GetRecord;
+import org.oclc.oai.harvester2.verb.Identify;
+import org.oclc.oai.harvester2.verb.ListMetadataFormats;
+import org.oclc.oai.harvester2.verb.ListRecords;
 import org.xml.sax.SAXException;
 
 
@@ -91,7 +92,7 @@ public class OAIHarvester {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(OAIHarvester.class);
+    private static final Logger log = LogManager.getLogger();
 
     private static final Namespace ATOM_NS = Namespace.getNamespace("http://www.w3.org/2005/Atom");
     private static final Namespace ORE_NS = Namespace.getNamespace("http://www.openarchives.org/ore/terms/");
@@ -133,7 +134,7 @@ public class OAIHarvester {
     private String metadataKey;
 
     // DOMbuilder class for the DOM -> JDOM conversions
-    private static DOMBuilder db = new DOMBuilder();
+    private static final DOMBuilder db = new DOMBuilder();
     // The point at which this thread should terminate itself
 
     /* Initialize the harvester with a collection object */
@@ -331,18 +332,16 @@ public class OAIHarvester {
 
             // main loop to keep requesting more objects until we're done
             List<Element> records;
-            Set<String> errorSet = new HashSet<String>();
+            Set<String> errorSet = new HashSet<>();
 
             ListRecords listRecords = new ListRecords(oaiSource, fromDate, toDate, oaiSetId, descMDPrefix);
             log.debug(
                 "Harvesting request parameters: listRecords " + oaiSource + " " + fromDate + " " + toDate + " " +
                     oaiSetId + " " + descMDPrefix);
-            if (listRecords != null) {
-                log.info("HTTP Request: " + listRecords.getRequestURL());
-            }
+            log.info("HTTP Request: " + listRecords.getRequestURL());
 
             while (listRecords != null) {
-                records = new ArrayList<Element>();
+                records = new ArrayList<>();
                 oaiResponse = db.build(listRecords.getDocument());
 
                 if (listRecords.getErrors() != null && listRecords.getErrors().getLength() > 0) {
@@ -376,8 +375,8 @@ public class OAIHarvester {
                 }
 
                 // Process the obtained records
-                if (records != null && records.size() > 0) {
-                    log.info("Found " + records.size() + " records to process");
+                if (!records.isEmpty()) {
+                    log.info("Found {} records to process", records::size);
                     for (Element record : records) {
                         // check for STOP interrupt from the scheduler
                         if (HarvestScheduler.getInterrupt() == HarvestScheduler.HARVESTER_INTERRUPT_STOP) {
@@ -439,7 +438,8 @@ public class OAIHarvester {
             harvestRow.setHarvestStatus(HarvestedCollection.STATUS_UNKNOWN_ERROR);
             harvestedCollectionService.update(ourContext, harvestRow);
             alertAdmin(HarvestedCollection.STATUS_UNKNOWN_ERROR, ex);
-            log.error("Error occurred while generating an OAI response: " + ex.getMessage() + " " + ex.getCause(), ex);
+            log.error("Error occurred while generating an OAI response: {} {}",
+                    ex.getMessage(), ex.getCause(), ex);
             ourContext.complete();
             return;
         } finally {
@@ -455,6 +455,7 @@ public class OAIHarvester {
         harvestRow.setHarvestStartTime(startTime);
         harvestRow.setHarvestMessage("Harvest from " + oaiSource + " successful");
         harvestRow.setHarvestStatus(HarvestedCollection.STATUS_READY);
+        harvestRow.setLastHarvested(startTime);
         log.info(
             "Harvest from " + oaiSource + " successful. The process took " + timeTaken + " milliseconds. Harvested "
                 + currentRecord + " items.");
@@ -493,11 +494,11 @@ public class OAIHarvester {
      * @throws HarvestingException          if harvesting error
      * @throws ParserConfigurationException XML parsing error
      * @throws SAXException                 if XML processing error
-     * @throws TransformerException         if XML transformer error
+     * @throws XPathExpressionException     if XPath error
      */
     protected void processRecord(Element record, String OREPrefix, final long currentRecord, long totalListSize)
         throws SQLException, AuthorizeException, IOException, CrosswalkException, HarvestingException,
-        ParserConfigurationException, SAXException, TransformerException {
+        ParserConfigurationException, SAXException, XPathExpressionException {
         WorkspaceItem wi = null;
         Date timeStart = new Date();
 
@@ -567,11 +568,7 @@ public class OAIHarvester {
             // Import the actual bitstreams
             if (harvestRow.getHarvestType() == 3) {
                 log.info("Running ORE ingest on: " + item.getHandle());
-
-                List<Bundle> allBundles = item.getBundles();
-                for (Bundle bundle : allBundles) {
-                    itemService.removeBundle(ourContext, item, bundle);
-                }
+                itemService.removeAllBundles(ourContext, item);
                 ORExwalk.ingest(ourContext, item, oreREM, true);
             }
         } else {
@@ -623,7 +620,7 @@ public class OAIHarvester {
             List<Bundle> OREBundles = itemService.getBundles(item, "ORE");
             Bitstream OREBitstream = null;
 
-            if (OREBundles.size() > 0) {
+            if (!OREBundles.isEmpty()) {
                 OREBundle = OREBundles.get(0);
             } else {
                 OREBundle = bundleService.create(ourContext, item, "ORE");
@@ -698,7 +695,7 @@ public class OAIHarvester {
 
         List<MetadataValue> values = itemService.getMetadata(item, "dc", "identifier", Item.ANY, Item.ANY);
 
-        if (values.size() > 0 && acceptedHandleServers != null) {
+        if (!values.isEmpty() && acceptedHandleServers != null) {
             for (MetadataValue value : values) {
                 //     0   1       2         3   4
                 //   https://hdl.handle.net/1234/12
@@ -732,7 +729,7 @@ public class OAIHarvester {
      * @return a string in the format 'yyyy-mm-ddThh:mm:ssZ' and converted to UTC timezone
      */
     private String processDate(Date date) {
-        Integer timePad = configurationService.getIntProperty("oai.harvester.timePadding");
+        int timePad = configurationService.getIntProperty("oai.harvester.timePadding");
 
         if (timePad == 0) {
             timePad = 120;
@@ -769,10 +766,10 @@ public class OAIHarvester {
      * @throws IOException                  if IO error
      * @throws SAXException                 if XML processing error
      * @throws ParserConfigurationException XML parsing error
-     * @throws TransformerException         if XML transformer error
+     * @throws XPathExpressionException     if XPath error
      */
     private String oaiGetDateGranularity(String oaiSource)
-        throws IOException, ParserConfigurationException, SAXException, TransformerException {
+        throws IOException, ParserConfigurationException, SAXException, XPathExpressionException {
         Identify iden = new Identify(oaiSource);
         return iden.getDocument().getElementsByTagNameNS(OAI_NS.getURI(), "granularity").item(0).getTextContent();
     }
@@ -789,26 +786,24 @@ public class OAIHarvester {
      *                                      operations.
      * @throws ParserConfigurationException XML parsing error
      * @throws SAXException                 if XML processing error
-     * @throws TransformerException         if XML transformer error
+     * @throws XPathExpressionException     if XPath error
      * @throws ConnectException             if could not connect to OAI server
      */
     public static String oaiResolveNamespaceToPrefix(String oaiSource, String MDNamespace)
-        throws IOException, ParserConfigurationException, SAXException, TransformerException, ConnectException {
+        throws IOException, ParserConfigurationException, SAXException, XPathExpressionException, ConnectException {
         String metaPrefix = null;
 
         // Query the OAI server for the metadata
         ListMetadataFormats lmf = new ListMetadataFormats(oaiSource);
 
-        if (lmf != null) {
-            Document lmfResponse = db.build(lmf.getDocument());
-            List<Element> mdFormats = lmfResponse.getRootElement().getChild("ListMetadataFormats", OAI_NS)
-                                                 .getChildren("metadataFormat", OAI_NS);
+        Document lmfResponse = db.build(lmf.getDocument());
+        List<Element> mdFormats = lmfResponse.getRootElement().getChild("ListMetadataFormats", OAI_NS)
+                                             .getChildren("metadataFormat", OAI_NS);
 
-            for (Element mdFormat : mdFormats) {
-                if (MDNamespace.equals(mdFormat.getChildText("metadataNamespace", OAI_NS))) {
-                    metaPrefix = mdFormat.getChildText("metadataPrefix", OAI_NS);
-                    break;
-                }
+        for (Element mdFormat : mdFormats) {
+            if (MDNamespace.equals(mdFormat.getChildText("metadataNamespace", OAI_NS))) {
+                metaPrefix = mdFormat.getChildText("metadataPrefix", OAI_NS);
+                break;
             }
         }
 
@@ -868,15 +863,15 @@ public class OAIHarvester {
      *                                      operations.
      * @throws ParserConfigurationException XML parsing error
      * @throws SAXException                 if XML processing error
-     * @throws TransformerException         if XML transformer error
+     * @throws XPathExpressionException     if XPath error
      * @throws HarvestingException          if harvesting error
      */
     protected List<Element> getMDrecord(String oaiSource, String itemOaiId, String metadataPrefix)
-        throws IOException, ParserConfigurationException, SAXException, TransformerException, HarvestingException {
+        throws IOException, ParserConfigurationException, SAXException, XPathExpressionException, HarvestingException {
         GetRecord getRecord = new GetRecord(oaiSource, itemOaiId, metadataPrefix);
-        Set<String> errorSet = new HashSet<String>();
+        Set<String> errorSet = new HashSet<>();
         // If the metadata is not available for this item, can the whole thing
-        if (getRecord != null && getRecord.getErrors() != null && getRecord.getErrors().getLength() > 0) {
+        if (getRecord.getErrors() != null && getRecord.getErrors().getLength() > 0) {
             for (int i = 0; i < getRecord.getErrors().getLength(); i++) {
                 String errorCode = getRecord.getErrors().item(i).getAttributes().getNamedItem("code").getTextContent();
                 errorSet.add(errorCode);
diff --git a/dspace-api/src/main/java/org/dspace/health/EmbargoCheck.java b/dspace-api/src/main/java/org/dspace/health/EmbargoCheck.java
index 5577f41e66..e7b456f7b3 100644
--- a/dspace-api/src/main/java/org/dspace/health/EmbargoCheck.java
+++ b/dspace-api/src/main/java/org/dspace/health/EmbargoCheck.java
@@ -26,9 +26,8 @@ public class EmbargoCheck extends Check {
     @Override
     public String run(ReportInfo ri) {
         String ret = "";
-        Context context = null;
+        Context context = new Context();
         try {
-            context = new Context();
             Iterator<Item> item_iter = null;
             try {
                 item_iter = embargoService.findItemsByLiftMetadata(context);
@@ -56,9 +55,7 @@ public class EmbargoCheck extends Check {
         } catch (SQLException e) {
             error(e);
             try {
-                if (null != context) {
-                    context.abort();
-                }
+                context.abort();
             } catch (Exception e1) {
                 error(e);
             }
diff --git a/dspace-api/src/main/java/org/dspace/identifier/DOI.java b/dspace-api/src/main/java/org/dspace/identifier/DOI.java
index 67668c3abe..e99472e45c 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/DOI.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DOI.java
@@ -34,8 +34,6 @@ public class DOI
     implements Identifier, ReloadableEntity<Integer> {
     public static final String SCHEME = "doi:";
 
-    public static final String RESOLVER = "http://dx.doi.org";
-
     @Id
     @Column(name = "doi_id")
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "doi_seq")
diff --git a/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
index da9c3b718a..66e7b94a4b 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
@@ -543,7 +543,7 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
 
         if (DELETED.equals(doiRow.getStatus()) || TO_BE_DELETED.equals(doiRow.getStatus())) {
             throw new DOIIdentifierException("You tried to update the metadata"
-                    + "of a DOI that is marked as DELETED.",
+                    + " of a DOI that is marked as DELETED.",
                     DOIIdentifierException.DOI_IS_DELETED);
         }
 
@@ -1028,7 +1028,7 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
         Item item = (Item) dso;
 
         List<MetadataValue> metadata = itemService.getMetadata(item, MD_SCHEMA, DOI_ELEMENT, DOI_QUALIFIER, null);
-        String leftPart = DOI.RESOLVER + SLASH + getPrefix() + SLASH + getNamespaceSeparator();
+        String leftPart = doiService.getResolver() + SLASH + getPrefix() + SLASH + getNamespaceSeparator();
         for (MetadataValue id : metadata) {
             if (id.getValue().startsWith(leftPart)) {
                 return doiService.DOIFromExternalFormat(id.getValue());
diff --git a/dspace-api/src/main/java/org/dspace/identifier/DOIServiceImpl.java b/dspace-api/src/main/java/org/dspace/identifier/DOIServiceImpl.java
index aca933aab6..99643db33f 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/DOIServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DOIServiceImpl.java
@@ -17,11 +17,13 @@ import org.dspace.core.Context;
 import org.dspace.identifier.dao.DOIDAO;
 import org.dspace.identifier.doi.DOIIdentifierException;
 import org.dspace.identifier.service.DOIService;
+import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * Service implementation for the DOI object.
- * This class is responsible for all business logic calls for the DOI object and is autowired by spring.
+ * Service implementation for the {@link DOI} object.
+ * This class is responsible for all business logic calls for the DOI object
+ * and is autowired by Spring.
  * This class should never be accessed directly.
  *
  * @author kevinvandevelde at atmire.com
@@ -31,6 +33,16 @@ public class DOIServiceImpl implements DOIService {
     @Autowired(required = true)
     protected DOIDAO doiDAO;
 
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
+
+    private static final Pattern DOI_URL_PATTERN
+            = Pattern.compile("http(s)?://([a-z0-9-.]+)?doi.org(?<path>/.*)",
+                    Pattern.CASE_INSENSITIVE);
+    private static final String DOI_URL_PATTERN_PATH_GROUP = "path";
+
+    private static final String RESOLVER_DEFAULT = "https://doi.org";
+
     protected DOIServiceImpl() {
 
     }
@@ -66,25 +78,46 @@ public class DOIServiceImpl implements DOIService {
         if (null == identifier) {
             throw new IllegalArgumentException("Identifier is null.", new NullPointerException());
         }
+
         if (identifier.isEmpty()) {
             throw new IllegalArgumentException("Cannot format an empty identifier.");
         }
-        if (identifier.startsWith(DOI.SCHEME)) {
-            return DOI.RESOLVER + "/" + identifier.substring(DOI.SCHEME.length());
+
+        String resolver = getResolver();
+
+        if (identifier.startsWith(DOI.SCHEME)) { // doi:something
+            StringBuilder result = new StringBuilder(resolver);
+            if (!resolver.endsWith("/")) {
+                result.append('/');
+            }
+            result.append(identifier.substring(DOI.SCHEME.length()));
+            return result.toString();
         }
-        if (identifier.startsWith("10.") && identifier.contains("/")) {
-            return DOI.RESOLVER + "/" + identifier;
+
+        if (identifier.startsWith("10.") && identifier.contains("/")) { // 10.something
+            StringBuilder result = new StringBuilder(resolver);
+            if (!resolver.endsWith("/")) {
+                result.append('/');
+            }
+            result.append(identifier);
+            return result.toString();
         }
-        if (identifier.startsWith(DOI.RESOLVER + "/10.")) {
+
+        if (identifier.startsWith(resolver + "/10.")) { // https://doi.org/10.something
             return identifier;
         }
 
+        Matcher matcher = DOI_URL_PATTERN.matcher(identifier);
+        if (matcher.matches()) { // various old URL forms
+            return resolver + matcher.group(DOI_URL_PATTERN_PATH_GROUP);
+        }
+
         throw new IdentifierException(identifier + "does not seem to be a DOI.");
     }
 
     @Override
     public String DOIFromExternalFormat(String identifier) throws DOIIdentifierException {
-        Pattern pattern = Pattern.compile("^" + DOI.RESOLVER + "/+(10\\..*)$");
+        Pattern pattern = Pattern.compile("^" + getResolver() + "/+(10\\..*)$");
         Matcher matcher = pattern.matcher(identifier);
         if (matcher.find()) {
             return DOI.SCHEME + matcher.group(1);
@@ -99,18 +132,29 @@ public class DOIServiceImpl implements DOIService {
         if (null == identifier) {
             throw new IllegalArgumentException("Identifier is null.", new NullPointerException());
         }
-        if (identifier.startsWith(DOI.SCHEME)) {
-            return identifier;
-        }
+
         if (identifier.isEmpty()) {
             throw new IllegalArgumentException("Cannot format an empty identifier.");
         }
-        if (identifier.startsWith("10.") && identifier.contains("/")) {
+
+        if (identifier.startsWith(DOI.SCHEME)) { // doi:something
+            return identifier;
+        }
+
+        if (identifier.startsWith("10.") && identifier.contains("/")) { // 10.something
             return DOI.SCHEME + identifier;
         }
-        if (identifier.startsWith(DOI.RESOLVER + "/10.")) {
-            return DOI.SCHEME + identifier.substring(18);
+
+        String resolver = getResolver();
+        if (identifier.startsWith(resolver + "/10.")) { //https://doi.org/10.something
+            return DOI.SCHEME + identifier.substring(resolver.length());
         }
+
+        Matcher matcher = DOI_URL_PATTERN.matcher(identifier);
+        if (matcher.matches()) { // various old URL forms
+            return DOI.SCHEME + matcher.group(DOI_URL_PATTERN_PATH_GROUP).substring(1);
+        }
+
         throw new DOIIdentifierException(identifier + "does not seem to be a DOI.",
                                          DOIIdentifierException.UNRECOGNIZED);
     }
@@ -126,4 +170,14 @@ public class DOIServiceImpl implements DOIService {
         throws SQLException {
         return doiDAO.findSimilarNotInState(context, doiPattern, statuses, dsoIsNotNull);
     }
+
+    @Override
+    public String getResolver() {
+        String resolver = configurationService.getProperty("identifier.doi.resolver",
+                RESOLVER_DEFAULT);
+        if (resolver.endsWith("/")) {
+            resolver = resolver.substring(0, resolver.length() - 1);
+        }
+        return resolver;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/identifier/DataCiteXMLCreator.java b/dspace-api/src/main/java/org/dspace/identifier/DataCiteXMLCreator.java
index 0ea25ff3a4..ae2cd248d4 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/DataCiteXMLCreator.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DataCiteXMLCreator.java
@@ -23,8 +23,8 @@ import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.services.ConfigurationService;
 import org.dspace.utils.DSpace;
-import org.jdom.Element;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.output.XMLOutputter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedDOIIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedDOIIdentifierProvider.java
index cc43bd21b5..a864b4be4b 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/VersionedDOIIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/VersionedDOIIdentifierProvider.java
@@ -261,7 +261,6 @@ public class VersionedDOIIdentifierProvider extends DOIIdentifierProvider {
             doiService.update(context, doi);
             return doi.getDoi();
         }
-        assert (previousVersionDOI != null);
 
         String identifier = getBareDOI(previousVersionDOI);
 
diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
index 61abbcb580..7705fd2b57 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
@@ -117,7 +117,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                 // check if we have a previous item
                 if (previous != null) {
                     try {
-                        // If we have a reviewer he/she might not have the
+                        // If we have a reviewer they might not have the
                         // rights to edit the metadata of thes previous item.
                         // Temporarly grant them:
                         context.turnOffAuthorisationSystem();
diff --git a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
index bc8ea90957..57136d6143 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
@@ -45,13 +45,13 @@ import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.handle.service.HandleService;
 import org.dspace.identifier.DOI;
 import org.dspace.services.ConfigurationService;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.filter.ElementFilter;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.filter.ElementFilter;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dspace-api/src/main/java/org/dspace/identifier/service/DOIService.java b/dspace-api/src/main/java/org/dspace/identifier/service/DOIService.java
index 9af1fd8a0a..5bd68a9061 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/service/DOIService.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/service/DOIService.java
@@ -17,26 +17,65 @@ import org.dspace.identifier.IdentifierException;
 import org.dspace.identifier.doi.DOIIdentifierException;
 
 /**
- * Service interface class for the DOI object.
- * The implementation of this class is responsible for all business logic calls for the DOI object and is autowired
- * by spring
+ * Service interface class for the {@link DOI} object.
+ * The implementation of this class is responsible for all business logic calls
+ * for the {@link DOI} object and is autowired by Spring.
  *
  * @author kevinvandevelde at atmire.com
  */
 public interface DOIService {
 
+    /**
+     * Update a DOI in storage.
+     *
+     * @param context current DSpace session.
+     * @param doi the DOI to persist.
+     * @throws SQLException passed through.
+     */
     public void update(Context context, DOI doi) throws SQLException;
 
+    /**
+     * Create a new DOI in storage.
+     *
+     * @param context current DSpace session.
+     * @return the new DOI.
+     * @throws SQLException passed through.
+     */
     public DOI create(Context context) throws SQLException;
 
+    /**
+     * Find a specific DOI in storage.
+     *
+     * @param context current DSpace session.
+     * @param doi string representation of the DOI.
+     * @return the DOI object found.
+     * @throws SQLException passed through, can mean none found.
+     */
     public DOI findByDoi(Context context, String doi) throws SQLException;
 
+    /**
+     * Find the DOI assigned to a given DSpace Object.
+     *
+     * @param context current DSpace session.
+     * @param dso The DSpace Object.
+     * @return the DSO's DOI.
+     * @throws SQLException passed through.
+     */
     public DOI findDOIByDSpaceObject(Context context, DSpaceObject dso) throws SQLException;
 
+    /**
+     * Find the DOI assigned to a given DSpace Object, unless it has one of a
+     * given set of statuses.
+     *
+     * @param context current DSpace context.
+     * @param dso the DSpace Object.
+     * @param statusToExclude uninteresting statuses.
+     * @return the DSO's DOI.
+     * @throws SQLException passed through.
+     */
     public DOI findDOIByDSpaceObject(Context context, DSpaceObject dso, List<Integer> statusToExclude)
         throws SQLException;
 
-
     /**
      * This method helps to convert a DOI into a URL. It takes DOIs in one of
      * the following formats  and returns it as URL (f.e.
@@ -49,12 +88,18 @@ public interface DOIService {
      *
      * @param identifier A DOI that should be returned in external form.
      * @return A String containing a URL to the official DOI resolver.
-     * @throws IllegalArgumentException                  If identifier is null or an empty String.
-     * @throws org.dspace.identifier.IdentifierException If identifier could not be recognized as valid DOI.
+     * @throws IllegalArgumentException If identifier is null or an empty String.
+     * @throws IdentifierException      If identifier could not be recognized as valid DOI.
      */
     public String DOIToExternalForm(String identifier)
         throws IdentifierException;
 
+    /**
+     * Convert an HTTP DOI URL (https://doi.org/10.something) to a "doi:" URI.
+     * @param identifier HTTP URL
+     * @return DOI URI
+     * @throws DOIIdentifierException if {@link identifier} is not recognizable.
+     */
     public String DOIFromExternalFormat(String identifier)
         throws DOIIdentifierException;
 
@@ -64,16 +109,24 @@ public interface DOIService {
      * @param identifier Identifier to format, following format are accepted:
      *                   f.e. 10.123/456, doi:10.123/456, http://dx.doi.org/10.123/456.
      * @return Given Identifier with DOI-Scheme, f.e. doi:10.123/456.
-     * @throws IllegalArgumentException                         If identifier is empty or null.
-     * @throws org.dspace.identifier.doi.DOIIdentifierException If DOI could not be recognized.
+     * @throws IllegalArgumentException If identifier is empty or null.
+     * @throws DOIIdentifierException   If DOI could not be recognized.
      */
     public String formatIdentifier(String identifier)
         throws DOIIdentifierException;
 
+    /**
+     * Find all DOIs that have one of a given set of statuses.
+     * @param context current DSpace session.
+     * @param statuses desired statuses.
+     * @return all DOIs having any of the given statuses.
+     * @throws SQLException passed through.
+     */
     public List<DOI> getDOIsByStatus(Context context, List<Integer> statuses) throws SQLException;
 
     /**
-     * Find all DOIs that are similar to the specified pattern ant not in the specified states.
+     * Find all DOIs that are similar to the specified pattern and not in the
+     * specified states.
      *
      * @param context      DSpace context
      * @param doiPattern   The pattern, e.g. "10.5072/123.%"
@@ -85,4 +138,11 @@ public interface DOIService {
     public List<DOI> getSimilarDOIsNotInState(Context context, String doiPattern, List<Integer> statuses,
                                               boolean dsoIsNotNull)
         throws SQLException;
+
+    /**
+     * Get the URL stem of the DOI resolver, e.g. "https://doi.org/".
+     *
+     * @return URL to the DOI resolver.
+     */
+    public String getResolver();
 }
diff --git a/dspace-api/src/main/java/org/dspace/identifier/service/IdentifierService.java b/dspace-api/src/main/java/org/dspace/identifier/service/IdentifierService.java
index 74219fc71c..64eee1dfcf 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/service/IdentifierService.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/service/IdentifierService.java
@@ -92,6 +92,9 @@ public interface IdentifierService {
         throws AuthorizeException, SQLException, IdentifierException;
 
     /**
+     * Used to register newly-minted identifiers.  Each provider is responsible
+     * for creating the appropriate identifier.  All providers are interrogated.
+     *
      * @param context The relevant DSpace Context.
      * @param dso     DSpace object to be registered
      * @throws AuthorizeException  if authorization error
@@ -101,7 +104,7 @@ public interface IdentifierService {
     void register(Context context, DSpaceObject dso) throws AuthorizeException, SQLException, IdentifierException;
 
     /**
-     * Used to Register a specific Identifier (for example a Handle, hdl:1234.5/6)
+     * Used to Register a specific Identifier (for example a Handle, hdl:1234.5/6).
      * The provider is responsible for detecting and processing the appropriate
      * identifier.  All Providers are interrogated.  Multiple providers
      * can process the same identifier.
diff --git a/dspace-api/src/main/java/org/dspace/iiif/IIIFApiQueryServiceImpl.java b/dspace-api/src/main/java/org/dspace/iiif/IIIFApiQueryServiceImpl.java
index 04a08a7781..7c6336ed3c 100644
--- a/dspace-api/src/main/java/org/dspace/iiif/IIIFApiQueryServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/IIIFApiQueryServiceImpl.java
@@ -23,8 +23,7 @@ import org.dspace.iiif.util.IIIFSharedUtils;
 
 
 /**
- * Queries the configured IIIF server for image dimensions. Used for
- * formats that cannot be easily read using ImageIO (jpeg 2000).
+ * Queries the configured IIIF image server via the Image API.
  *
  * @author Michael Spalti mspalti@willamette.edu
  */
diff --git a/dspace-api/src/main/java/org/dspace/iiif/canvasdimension/CanvasDimensionCLI.java b/dspace-api/src/main/java/org/dspace/iiif/canvasdimension/CanvasDimensionCLI.java
index 50b934d110..c7feea4c56 100644
--- a/dspace-api/src/main/java/org/dspace/iiif/canvasdimension/CanvasDimensionCLI.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/canvasdimension/CanvasDimensionCLI.java
@@ -8,6 +8,7 @@
 package org.dspace.iiif.canvasdimension;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.UUID;
 
 import org.apache.commons.cli.CommandLine;
@@ -48,6 +49,7 @@ public class CanvasDimensionCLI {
 
     public static void main(String[] argv) throws Exception {
 
+        Date startTime = new Date();
 
         boolean iiifEnabled = configurationService.getBooleanProperty("iiif.enabled");
         if (!iiifEnabled) {
@@ -64,7 +66,8 @@ public class CanvasDimensionCLI {
         String identifier = null;
         String eperson = null;
 
-        Context context = new Context();
+        Context context = new Context(Context.Mode.BATCH_EDIT);
+
         IIIFCanvasDimensionService canvasProcessor = IIIFCanvasDimensionServiceFactory.getInstance()
                                                                                       .getIiifCanvasDimensionService();
 
@@ -220,9 +223,15 @@ public class CanvasDimensionCLI {
             context.commit();
         }
 
+        Date endTime = new Date();
+        System.out.println("Started: " + startTime.getTime());
+        System.out.println("Ended: " + endTime.getTime());
+        System.out.println(
+            "Elapsed time: " + ((endTime.getTime() - startTime.getTime()) / 1000) + " secs (" + (endTime
+                .getTime() - startTime.getTime()) + " msecs)");
+
         // Always print summary to standard out.
         System.out.println(processed + " IIIF items were processed.");
-
     }
 
 }
diff --git a/dspace-api/src/main/java/org/dspace/iiif/canvasdimension/IIIFCanvasDimensionServiceImpl.java b/dspace-api/src/main/java/org/dspace/iiif/canvasdimension/IIIFCanvasDimensionServiceImpl.java
index ad36b65ab9..a8be8971c0 100644
--- a/dspace-api/src/main/java/org/dspace/iiif/canvasdimension/IIIFCanvasDimensionServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/canvasdimension/IIIFCanvasDimensionServiceImpl.java
@@ -119,6 +119,7 @@ public class IIIFCanvasDimensionServiceImpl implements IIIFCanvasDimensionServic
                 if (processItemBundles(context, item)) {
                     ++processed;
                 }
+                context.uncacheEntity(item);
             }
         }
     }
@@ -137,6 +138,7 @@ public class IIIFCanvasDimensionServiceImpl implements IIIFCanvasDimensionServic
             List<Bitstream> bitstreams = bundle.getBitstreams();
             for (Bitstream bit : bitstreams) {
                 done |= processBitstream(context, bit);
+                context.uncacheEntity(bit);
             }
         }
         if (done) {
diff --git a/dspace-api/src/main/java/org/dspace/iiif/consumer/CanvasCacheEvictService.java b/dspace-api/src/main/java/org/dspace/iiif/consumer/CanvasCacheEvictService.java
index 56cd432d91..beeb40ceac 100644
--- a/dspace-api/src/main/java/org/dspace/iiif/consumer/CanvasCacheEvictService.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/consumer/CanvasCacheEvictService.java
@@ -23,7 +23,7 @@ public class CanvasCacheEvictService {
     CacheManager cacheManager;
 
     public void evictSingleCacheValue(String cacheKey) {
-        Objects.requireNonNull(cacheManager.getCache(CACHE_NAME)).evict(cacheKey);
+        Objects.requireNonNull(cacheManager.getCache(CACHE_NAME)).evictIfPresent(cacheKey);
     }
 
 }
diff --git a/dspace-api/src/main/java/org/dspace/iiif/consumer/ManifestsCacheEvictService.java b/dspace-api/src/main/java/org/dspace/iiif/consumer/ManifestsCacheEvictService.java
index 967d0667a6..963ce3113f 100644
--- a/dspace-api/src/main/java/org/dspace/iiif/consumer/ManifestsCacheEvictService.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/consumer/ManifestsCacheEvictService.java
@@ -26,11 +26,11 @@ public class ManifestsCacheEvictService {
     CacheManager cacheManager;
 
     public void evictSingleCacheValue(String cacheKey) {
-        Objects.requireNonNull(cacheManager.getCache(CACHE_NAME)).evict(cacheKey);
+        Objects.requireNonNull(cacheManager.getCache(CACHE_NAME)).evictIfPresent(cacheKey);
     }
 
     public void evictAllCacheValues() {
-        Objects.requireNonNull(cacheManager.getCache(CACHE_NAME)).clear();
+        Objects.requireNonNull(cacheManager.getCache(CACHE_NAME)).invalidate();
     }
 
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/cache/CacheLogger.java b/dspace-api/src/main/java/org/dspace/iiif/logger/CacheLogger.java
similarity index 95%
rename from dspace-server-webapp/src/main/java/org/dspace/app/rest/cache/CacheLogger.java
rename to dspace-api/src/main/java/org/dspace/iiif/logger/CacheLogger.java
index bd77c578e6..28d57975bf 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/cache/CacheLogger.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/logger/CacheLogger.java
@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 
-package org.dspace.app.rest.cache;
+package org.dspace.iiif.logger;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/cache/CanvasCacheLogger.java b/dspace-api/src/main/java/org/dspace/iiif/logger/CanvasCacheLogger.java
similarity index 95%
rename from dspace-server-webapp/src/main/java/org/dspace/app/rest/cache/CanvasCacheLogger.java
rename to dspace-api/src/main/java/org/dspace/iiif/logger/CanvasCacheLogger.java
index eaa08000ee..2f1a8d6dba 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/cache/CanvasCacheLogger.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/logger/CanvasCacheLogger.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.rest.cache;
+package org.dspace.iiif.logger;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSFieldMapping.java
new file mode 100644
index 0000000000..e7d2d3398b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSFieldMapping.java
@@ -0,0 +1,39 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.ads;
+
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the ADS metadatum fields on the DSpace metadatum fields
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ */
+@SuppressWarnings("rawtypes")
+public class ADSFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    @Resource(name = "adsMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..8fbe4ef2cf
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSImportMetadataSourceServiceImpl.java
@@ -0,0 +1,334 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.ads;
+
+import static org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl.HEADER_PARAMETERS;
+
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import javax.el.MethodNotFoundException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying ADS
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class ADSImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<String>
+        implements QuerySource {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String url;
+    private String resultFieldList;
+
+    private String apiKey;
+    private int timeout = 1000;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Override
+    public String getImportSource() {
+        return "ads";
+    }
+
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByIdCallable(id));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query, count, start));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query));
+    }
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByIdCallable(query));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        return retry(new FindMatchingRecordCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for CrossRef");
+    }
+
+    @Override
+    public void init() throws Exception {}
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    /**
+     * This class is a Callable implementation to get ADS entries based on query object.
+     * This Callable use as query value the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, a Query's map entry with key "query" will be used.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private SearchByQueryCallable(String queryString, Integer maxResult, Integer start) {
+            query = new Query();
+            query.addParameter("query", queryString);
+            query.addParameter("count", maxResult);
+            query.addParameter("start", start);
+        }
+
+        private SearchByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            return search(query.getParameterAsClass("query", String.class),
+                query.getParameterAsClass("start", Integer.class),
+                query.getParameterAsClass("count", Integer.class),
+                getApiKey());
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get an ADS entry using bibcode
+     * The bibcode to use can be passed through the constructor as a String or as Query's map entry, with the key "id".
+     *
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByIdCallable implements Callable<List<ImportRecord>> {
+        private Query query;
+
+        private SearchByIdCallable(Query query) {
+            this.query = query;
+        }
+
+        private SearchByIdCallable(String id) {
+            this.query = new Query();
+            query.addParameter("id", id);
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            String queryString = "bibcode:" + query.getParameterAsClass("id", String.class);
+            return search(queryString, 0 , 1, getApiKey());
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to search ADS entries
+     * using author and title and year.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class FindMatchingRecordCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private FindMatchingRecordCallable(Query q) {
+            query = q;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            String author = query.getParameterAsClass("author", String.class);
+            String title = query.getParameterAsClass("title", String.class);
+            Integer year = query.getParameterAsClass("year", Integer.class);
+            return search(title, author, year, start, count, getApiKey());
+        }
+
+    }
+
+    /**
+     * This class is a Callable implementation to count the number of entries for an ADS query.
+     * This Callable use as query value to ADS the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, the value of the Query's
+     * map with the key "query" will be used.
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class CountByQueryCallable implements Callable<Integer> {
+        private Query query;
+
+
+        private CountByQueryCallable(String queryString) {
+            query = new Query();
+            query.addParameter("query", queryString);
+        }
+
+        private CountByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            return count(query.getParameterAsClass("query", String.class), getApiKey());
+        }
+    }
+
+    private List<ImportRecord> search(String title, String author, int year,  int start, int count, String token) {
+        String query = "";
+        if (StringUtils.isNotBlank(title)) {
+            query += "title:" + title;
+        }
+        if (StringUtils.isNotBlank(author)) {
+            String splitRegex = "(\\s*,\\s+|\\s*;\\s+|\\s*;+|\\s*,+|\\s+)";
+            String[] authors = author.split(splitRegex);
+            // [FAU]
+            if (StringUtils.isNotBlank(query)) {
+                query = "author:";
+            } else {
+                query += "&fq=author:";
+            }
+            int x = 0;
+            for (String auth : authors) {
+                x++;
+                query += auth;
+                if (x < authors.length) {
+                    query += " AND ";
+                }
+            }
+        }
+        if (year != -1) {
+            // [DP]
+            if (StringUtils.isNotBlank(query)) {
+                query = "year:";
+            } else {
+                query += "&fq=year:";
+            }
+            query += year;
+        }
+        return search(query.toString(), start, count, token);
+    }
+
+    public Integer count(String query, String token) {
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            Map<String, String> headerParameters = new HashMap<String, String>();
+            headerParameters.put("Authorization", "Bearer " + token);
+            params.put(HEADER_PARAMETERS, headerParameters);
+
+            URIBuilder uriBuilder = new URIBuilder(this.url);
+            uriBuilder.addParameter("q", query);
+            uriBuilder.addParameter("rows", "1");
+            uriBuilder.addParameter("start", "0");
+            uriBuilder.addParameter("fl", this.resultFieldList);
+
+            String resp = liveImportClient.executeHttpGetRequest(timeout, uriBuilder.toString(), params);
+            JsonNode jsonNode = convertStringJsonToJsonNode(resp);
+            return jsonNode.at("/response/numFound").asInt();
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
+    public List<ImportRecord> search(String query, Integer start, Integer count, String token) {
+        List<ImportRecord> adsResults = new ArrayList<>();
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            Map<String, String> headerParameters = new HashMap<String, String>();
+            headerParameters.put("Authorization", "Bearer " + token);
+            params.put(HEADER_PARAMETERS, headerParameters);
+
+            URIBuilder uriBuilder = new URIBuilder(this.url);
+            uriBuilder.addParameter("q", query);
+            uriBuilder.addParameter("rows", count.toString());
+            uriBuilder.addParameter("start", start.toString());
+            uriBuilder.addParameter("fl", this.resultFieldList);
+
+            String resp = liveImportClient.executeHttpGetRequest(timeout, uriBuilder.toString(), params);
+
+            JsonNode jsonNode = convertStringJsonToJsonNode(resp);
+            JsonNode docs = jsonNode.at("/response/docs");
+            if (docs.isArray()) {
+                Iterator<JsonNode> nodes = docs.elements();
+                while (nodes.hasNext()) {
+                    JsonNode node = nodes.next();
+                    adsResults.add(transformSourceRecords(node.toString()));
+                }
+            } else {
+                adsResults.add(transformSourceRecords(docs.toString()));
+            }
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+        return adsResults;
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        try {
+            return new ObjectMapper().readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return null;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public void setResultFieldList(String resultFieldList) {
+        this.resultFieldList = resultFieldList;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/arxiv/metadatamapping/contributor/ArXivIdMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/arxiv/metadatamapping/contributor/ArXivIdMetadataContributor.java
index ed5ac5960b..7bd42cf07a 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/arxiv/metadatamapping/contributor/ArXivIdMetadataContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/arxiv/metadatamapping/contributor/ArXivIdMetadataContributor.java
@@ -9,10 +9,10 @@ package org.dspace.importer.external.arxiv.metadatamapping.contributor;
 
 import java.util.Collection;
 
-import org.apache.axiom.om.OMElement;
 import org.dspace.importer.external.metadatamapping.MetadatumDTO;
 import org.dspace.importer.external.metadatamapping.contributor.MetadataContributor;
 import org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor;
+import org.jdom2.Element;
 
 /**
  * Arxiv specific implementation of {@link MetadataContributor}
@@ -32,7 +32,7 @@ public class ArXivIdMetadataContributor extends SimpleXpathMetadatumContributor
      * @return a collection of import records. Only the identifier of the found records may be put in the record.
      */
     @Override
-    public Collection<MetadatumDTO> contributeMetadata(OMElement t) {
+    public Collection<MetadatumDTO> contributeMetadata(Element t) {
         Collection<MetadatumDTO> values = super.contributeMetadata(t);
         parseValue(values);
         return values;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/arxiv/service/ArXivImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/arxiv/service/ArXivImportMetadataSourceServiceImpl.java
index 6b418423fa..96689e62ba 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/arxiv/service/ArXivImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/arxiv/service/ArXivImportMetadataSourceServiceImpl.java
@@ -7,8 +7,10 @@
  */
 package org.dspace.importer.external.arxiv.service;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -20,10 +22,6 @@ import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.xpath.AXIOMXPath;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.Item;
 import org.dspace.importer.external.datamodel.ImportRecord;
@@ -31,7 +29,14 @@ import org.dspace.importer.external.datamodel.Query;
 import org.dspace.importer.external.exception.MetadataSourceException;
 import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
 import org.dspace.importer.external.service.components.QuerySource;
-import org.jaxen.JaxenException;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
 
 /**
  * Implements a data source for querying ArXiv
@@ -39,7 +44,7 @@ import org.jaxen.JaxenException;
  * @author Pasquale Cavallo (pasquale.cavallo at 4Science dot it)
  *
  */
-public class ArXivImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<OMElement>
+public class ArXivImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Element>
     implements QuerySource {
 
     private WebTarget webTarget;
@@ -213,15 +218,20 @@ public class ArXivImportMetadataSourceServiceImpl extends AbstractImportMetadata
             Response response = invocationBuilder.get();
             if (response.getStatus() == 200) {
                 String responseString = response.readEntity(String.class);
-                OMXMLParserWrapper records = OMXMLBuilderFactory.createOMBuilder(new StringReader(responseString));
-                OMElement element = records.getDocumentElement();
-                AXIOMXPath xpath = null;
+
+                SAXBuilder saxBuilder = new SAXBuilder();
+                Document document = saxBuilder.build(new StringReader(responseString));
+                Element root = document.getRootElement();
+
+                List namespaces = Arrays.asList(Namespace.getNamespace("opensearch",
+                                                      "http://a9.com/-/spec/opensearch/1.1/"));
+                XPathExpression<Element> xpath =
+                    XPathFactory.instance().compile("opensearch:totalResults", Filters.element(), null, namespaces);
+
+                Element count = xpath.evaluateFirst(root);
                 try {
-                    xpath = new AXIOMXPath("opensearch:totalResults");
-                    xpath.addNamespace("opensearch", "http://a9.com/-/spec/opensearch/1.1/");
-                    OMElement count = (OMElement) xpath.selectSingleNode(element);
                     return Integer.parseInt(count.getText());
-                } catch (JaxenException e) {
+                } catch (NumberFormatException e) {
                     return null;
                 }
             } else {
@@ -274,8 +284,8 @@ public class ArXivImportMetadataSourceServiceImpl extends AbstractImportMetadata
             Response response = invocationBuilder.get();
             if (response.getStatus() == 200) {
                 String responseString = response.readEntity(String.class);
-                List<OMElement> omElements = splitToRecords(responseString);
-                for (OMElement record : omElements) {
+                List<Element> elements = splitToRecords(responseString);
+                for (Element record : elements) {
                     results.add(transformSourceRecords(record));
                 }
                 return results;
@@ -321,8 +331,8 @@ public class ArXivImportMetadataSourceServiceImpl extends AbstractImportMetadata
             Response response = invocationBuilder.get();
             if (response.getStatus() == 200) {
                 String responseString = response.readEntity(String.class);
-                List<OMElement> omElements = splitToRecords(responseString);
-                for (OMElement record : omElements) {
+                List<Element> elements = splitToRecords(responseString);
+                for (Element record : elements) {
                     results.add(transformSourceRecords(record));
                 }
                 return results;
@@ -359,8 +369,8 @@ public class ArXivImportMetadataSourceServiceImpl extends AbstractImportMetadata
             Response response = invocationBuilder.get();
             if (response.getStatus() == 200) {
                 String responseString = response.readEntity(String.class);
-                List<OMElement> omElements = splitToRecords(responseString);
-                for (OMElement record : omElements) {
+                List<Element> elements = splitToRecords(responseString);
+                for (Element record : elements) {
                     results.add(transformSourceRecords(record));
                 }
                 return results;
@@ -387,16 +397,21 @@ public class ArXivImportMetadataSourceServiceImpl extends AbstractImportMetadata
         }
     }
 
-    private List<OMElement> splitToRecords(String recordsSrc) {
-        OMXMLParserWrapper records = OMXMLBuilderFactory.createOMBuilder(new StringReader(recordsSrc));
-        OMElement element = records.getDocumentElement();
-        AXIOMXPath xpath = null;
+    private List<Element> splitToRecords(String recordsSrc) {
+
         try {
-            xpath = new AXIOMXPath("ns:entry");
-            xpath.addNamespace("ns", "http://www.w3.org/2005/Atom");
-            List<OMElement> recordsList = xpath.selectNodes(element);
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(recordsSrc));
+            Element root = document.getRootElement();
+
+            List namespaces = Arrays.asList(Namespace.getNamespace("ns",
+                                                                   "http://www.w3.org/2005/Atom"));
+            XPathExpression<Element> xpath =
+                XPathFactory.instance().compile("ns:entry", Filters.element(), null, namespaces);
+
+            List<Element> recordsList = xpath.evaluate(root);
             return recordsList;
-        } catch (JaxenException e) {
+        } catch (JDOMException | IOException e) {
             return null;
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/bibtex/service/BibtexImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/bibtex/service/BibtexImportMetadataSourceServiceImpl.java
index 7468d601f5..0014088c86 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/bibtex/service/BibtexImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/bibtex/service/BibtexImportMetadataSourceServiceImpl.java
@@ -70,11 +70,24 @@ public class BibtexImportMetadataSourceServiceImpl extends AbstractPlainMetadata
                 keyValueItem.setKey(entry.getValue().getType().getValue());
                 keyValueItem.setValue(entry.getKey().getValue());
                 keyValues.add(keyValueItem);
+                PlainMetadataKeyValueItem typeItem = new PlainMetadataKeyValueItem();
+                typeItem.setKey("type");
+                typeItem.setValue(entry.getValue().getType().getValue());
+                keyValues.add(typeItem);
                 if (entry.getValue().getFields() != null) {
                     for (Entry<Key,Value> subentry : entry.getValue().getFields().entrySet()) {
                         PlainMetadataKeyValueItem innerItem = new PlainMetadataKeyValueItem();
-                        innerItem.setKey(subentry.getKey().getValue());
-                        innerItem.setValue(subentry.getValue().toUserString());
+                        innerItem.setKey(subentry.getKey().getValue().toLowerCase());
+                        String latexString = subentry.getValue().toUserString();
+                        try {
+                            org.jbibtex.LaTeXParser laTeXParser = new org.jbibtex.LaTeXParser();
+                            List<org.jbibtex.LaTeXObject> latexObjects = laTeXParser.parse(latexString);
+                            org.jbibtex.LaTeXPrinter laTeXPrinter = new org.jbibtex.LaTeXPrinter();
+                            String plainTextString = laTeXPrinter.print(latexObjects);
+                            innerItem.setValue(plainTextString.replaceAll("\n", " "));
+                        } catch (ParseException e) {
+                            innerItem.setValue(latexString);
+                        }
                         keyValues.add(innerItem);
                     }
                 }
@@ -92,10 +105,10 @@ public class BibtexImportMetadataSourceServiceImpl extends AbstractPlainMetadata
 
 
     /**
-     * Retrieve the MetadataFieldMapping containing the mapping between RecordType
+     * Set the MetadataFieldMapping containing the mapping between RecordType
      * (in this case PlainMetadataSourceDto.class) and Metadata
      *
-     * @return The configured MetadataFieldMapping
+     * @param metadataFieldMap The configured MetadataFieldMapping
      */
     @Override
     @SuppressWarnings("unchecked")
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiFieldMapping.java
new file mode 100644
index 0000000000..f266ff3d85
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiFieldMapping.java
@@ -0,0 +1,37 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.cinii;
+
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the Cinii metadatum fields on the DSpace metadatum fields
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ */
+public class CiniiFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @Resource(name = "ciniiMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..5eff46c790
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiImportMetadataSourceServiceImpl.java
@@ -0,0 +1,447 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.cinii;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpException;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.dspace.services.ConfigurationService;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying Cinii
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class CiniiImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Element>
+        implements QuerySource {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String url;
+    private String urlSearch;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Override
+    public String getImportSource() {
+        return "cinii";
+    }
+
+    @Override
+    public void init() throws Exception {}
+
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByIdCallable(id));
+        return CollectionUtils.isNotEmpty(records) ? records.get(0) : null;
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query, count, start));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query));
+    }
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByIdCallable(query));
+        return CollectionUtils.isNotEmpty(records) ? records.get(0) : null;
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        return retry(new FindMatchingRecordCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for Cinii");
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUrlSearch() {
+        return urlSearch;
+    }
+
+    public void setUrlSearch(String urlSearch) {
+        this.urlSearch = urlSearch;
+    }
+
+    /**
+     * This class is a Callable implementation to get CiNii entries based on
+     * query object.
+     * 
+     * This Callable use as query value the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, a Query's map entry with key "query" will be used.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private SearchByQueryCallable(String queryString, Integer maxResult, Integer start) {
+            query = new Query();
+            query.addParameter("query", queryString);
+            query.addParameter("count", maxResult);
+            query.addParameter("start", start);
+        }
+
+        private SearchByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> records = new LinkedList<ImportRecord>();
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            String queryString = query.getParameterAsClass("query", String.class);
+            String appId = configurationService.getProperty("cinii.appid");
+            List<String> ids = getCiniiIds(appId, count, null, null, null, start, queryString);
+            if (CollectionUtils.isNotEmpty(ids)) {
+                for (String id : ids) {
+                    List<ImportRecord> tmp = search(id, appId);
+                    if (CollectionUtils.isNotEmpty(tmp)) {
+                        tmp.forEach(x -> x.addValue(createIdentifier(id)));
+                    }
+                    records.addAll(tmp);
+                }
+            }
+            return records;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get an CiNii entry using CiNii ID
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class SearchByIdCallable implements Callable<List<ImportRecord>> {
+        private Query query;
+
+        private SearchByIdCallable(Query query) {
+            this.query = query;
+        }
+
+        private SearchByIdCallable(String id) {
+            this.query = new Query();
+            query.addParameter("id", id);
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            String appId = configurationService.getProperty("cinii.appid");
+            String id = query.getParameterAsClass("id", String.class);
+            List<ImportRecord> importRecord = search(id, appId);
+            if (CollectionUtils.isNotEmpty(importRecord)) {
+                importRecord.forEach(x -> x.addValue(createIdentifier(id)));
+            }
+            return importRecord;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to search CiNii entries
+     * using author, title and year.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class FindMatchingRecordCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private FindMatchingRecordCallable(Query q) {
+            query = q;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> records = new LinkedList<ImportRecord>();
+            String title = query.getParameterAsClass("title", String.class);
+            String author = query.getParameterAsClass("author", String.class);
+            Integer year = query.getParameterAsClass("year", Integer.class);
+            Integer maxResult = query.getParameterAsClass("maxResult", Integer.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            String appId = configurationService.getProperty("cinii.appid");
+            List<String> ids = getCiniiIds(appId, maxResult, author, title, year, start, null);
+            if (CollectionUtils.isNotEmpty(ids)) {
+                for (String id : ids) {
+                    List<ImportRecord> importRecords = search(id, appId);
+                    if (CollectionUtils.isNotEmpty(importRecords)) {
+                        importRecords.forEach(x -> x.addValue(createIdentifier(id)));
+                    }
+                    records.addAll(importRecords);
+                }
+            }
+            return records;
+        }
+
+    }
+
+    /**
+     * This class is a Callable implementation to count the number
+     * of entries for an CiNii query.
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class CountByQueryCallable implements Callable<Integer> {
+        private Query query;
+
+
+        private CountByQueryCallable(String queryString) {
+            query = new Query();
+            query.addParameter("query", queryString);
+        }
+
+        private CountByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            String appId = configurationService.getProperty("cinii.appid");
+            String queryString = query.getParameterAsClass("query", String.class);
+            return countCiniiElement(appId, null, null, null, null, null, queryString);
+        }
+    }
+
+    /**
+     * Get metadata by searching CiNii RDF API with CiNii NAID
+     *
+     * @param id    CiNii NAID to search by
+     * @param appId registered application identifier for the API
+     * @return record metadata
+     * @throws IOException   A general class of exceptions produced by failed or interrupted I/O operations.
+     * @throws HttpException Represents a XML/HTTP fault and provides access to the HTTP status code.
+     */
+    protected List<ImportRecord> search(String id, String appId)
+        throws IOException, HttpException {
+        try {
+            List<ImportRecord> records = new LinkedList<ImportRecord>();
+            URIBuilder uriBuilder = new URIBuilder(this.url + id + ".rdf?appid=" + appId);
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            List<Element> elements = splitToRecords(response);
+            for (Element record : elements) {
+                records.add(transformSourceRecords(record));
+            }
+            return records;
+        } catch (URISyntaxException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    private List<Element> splitToRecords(String recordsSrc) {
+        try {
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(recordsSrc));
+            Element root = document.getRootElement();
+            return root.getChildren();
+        } catch (JDOMException | IOException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Returns a list of uri links (for example:https://cir.nii.ac.jp/crid/123456789)
+     * to the searched CiNii articles
+     * 
+     * @param appId       Application ID
+     * @param maxResult   The number of search results per page
+     * @param author      Author name
+     * @param title       Article name
+     * @param year        Year of publication
+     * @param start       Start number for the acquired search result list
+     * @param query       Keyword to be searched
+     */
+    private List<String> getCiniiIds(String appId, Integer maxResult, String author, String title,
+        Integer year, Integer start, String query) {
+        try {
+            List<String> ids = new ArrayList<>();
+            URIBuilder uriBuilder = new URIBuilder(this.urlSearch);
+            uriBuilder.addParameter("format", "rss");
+            if (StringUtils.isNotBlank(appId)) {
+                uriBuilder.addParameter("appid", appId);
+            }
+            if (Objects.nonNull(maxResult) && maxResult != 0) {
+                uriBuilder.addParameter("count", maxResult.toString());
+            }
+            if (Objects.nonNull(start)) {
+                uriBuilder.addParameter("start", start.toString());
+            }
+            if (StringUtils.isNotBlank(title)) {
+                uriBuilder.addParameter("title", title);
+            }
+            if (StringUtils.isNotBlank(author)) {
+                uriBuilder.addParameter("author", author);
+            }
+            if (StringUtils.isNotBlank(query)) {
+                uriBuilder.addParameter("q", query);
+            }
+            if (Objects.nonNull(year) && year != -1 && year != 0) {
+                uriBuilder.addParameter("year_from", String.valueOf(year));
+                uriBuilder.addParameter("year_to", String.valueOf(year));
+            }
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            int url_len = this.url.length() - 1;
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(response));
+            Element root = document.getRootElement();
+            List<Namespace> namespaces = Arrays.asList(
+                 Namespace.getNamespace("ns", "http://purl.org/rss/1.0/"),
+                 Namespace.getNamespace("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"));
+            XPathExpression<Attribute> xpath = XPathFactory.instance().compile("//ns:item/@rdf:about",
+                    Filters.attribute(), null, namespaces);
+            List<Attribute> recordsList = xpath.evaluate(root);
+            for (Attribute item : recordsList) {
+                String value = item.getValue();
+                if (value.length() > url_len) {
+                    ids.add(value.substring(url_len + 1));
+                }
+            }
+            return ids;
+        } catch (JDOMException | IOException | URISyntaxException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Returns the total number of CiNii articles returned by a specific query
+     * 
+     * @param appId       Application ID
+     * @param maxResult   The number of search results per page
+     * @param author      Author name
+     * @param title       Article name
+     * @param year        Year of publication
+     * @param start       Start number for the acquired search result list
+     * @param query       Keyword to be searched
+     */
+    private Integer countCiniiElement(String appId, Integer maxResult, String author, String title,
+            Integer year, Integer start, String query) {
+        try {
+            URIBuilder uriBuilder = new URIBuilder(this.urlSearch);
+            uriBuilder.addParameter("format", "rss");
+            uriBuilder.addParameter("appid", appId);
+            if (Objects.nonNull(maxResult) && maxResult != 0) {
+                uriBuilder.addParameter("count", maxResult.toString());
+            }
+            if (Objects.nonNull(start)) {
+                uriBuilder.addParameter("start", start.toString());
+            }
+            if (StringUtils.isNotBlank(title)) {
+                uriBuilder.addParameter("title", title);
+            }
+            if (StringUtils.isNotBlank(author)) {
+                uriBuilder.addParameter("author", author);
+            }
+            if (StringUtils.isNotBlank(query)) {
+                uriBuilder.addParameter("q", query);
+            }
+            if (Objects.nonNull(year) && year != -1 && year != 0) {
+                uriBuilder.addParameter("year_from", String.valueOf(year));
+                uriBuilder.addParameter("year_to", String.valueOf(year));
+            }
+
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(response));
+            Element root = document.getRootElement();
+            List<Namespace> namespaces = Arrays
+                    .asList(Namespace.getNamespace("opensearch", "http://a9.com/-/spec/opensearch/1.1/"));
+            XPathExpression<Element> xpath = XPathFactory.instance().compile("//opensearch:totalResults",
+                    Filters.element(), null, namespaces);
+            List<Element> nodes = xpath.evaluate(root);
+            if (nodes != null && !nodes.isEmpty()) {
+                return Integer.parseInt(((Element) nodes.get(0)).getText());
+            }
+            return 0;
+        } catch (JDOMException | IOException | URISyntaxException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    private MetadatumDTO createIdentifier(String id) {
+        MetadatumDTO metadatumDTO = new MetadatumDTO();
+        metadatumDTO.setSchema("dc");
+        metadatumDTO.setElement("identifier");
+        metadatumDTO.setQualifier("other");
+        metadatumDTO.setValue(id);
+        return metadatumDTO;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefAuthorMetadataProcessor.java b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefAuthorMetadataProcessor.java
new file mode 100644
index 0000000000..abf84f52d0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefAuthorMetadataProcessor.java
@@ -0,0 +1,67 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.crossref;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.importer.external.metadatamapping.contributor.JsonPathMetadataProcessor;
+
+/**
+ * This class is used for CrossRef's Live-Import to extract
+ * attributes such as "given" and "family" from the array of authors/editors
+ * and return them concatenated.
+ * Beans are configured in the crossref-integration.xml file.
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class CrossRefAuthorMetadataProcessor implements JsonPathMetadataProcessor {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String pathToArray;
+
+    @Override
+    public Collection<String> processMetadata(String json) {
+        JsonNode rootNode = convertStringJsonToJsonNode(json);
+        Iterator<JsonNode> authors = rootNode.at(pathToArray).iterator();
+        Collection<String> values = new ArrayList<>();
+        while (authors.hasNext()) {
+            JsonNode author = authors.next();
+            String givenName = author.at("/given").textValue();
+            String familyName = author.at("/family").textValue();
+            if (StringUtils.isNoneBlank(givenName) && StringUtils.isNoneBlank(familyName)) {
+                values.add(givenName + " " + familyName);
+            }
+        }
+        return values;
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode body = null;
+        try {
+            body = mapper.readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return body;
+    }
+
+    public void setPathToArray(String pathToArray) {
+        this.pathToArray = pathToArray;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefFieldMapping.java
new file mode 100644
index 0000000000..5e879b4d26
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefFieldMapping.java
@@ -0,0 +1,39 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.crossref;
+
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the CrossRef metadatum fields on the DSpace metadatum fields
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ */
+@SuppressWarnings("rawtypes")
+public class CrossRefFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    @Resource(name = "crossrefMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..7dde330b27
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefImportMetadataSourceServiceImpl.java
@@ -0,0 +1,336 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.crossref;
+
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import javax.el.MethodNotFoundException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.DoiCheck;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying CrossRef
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class CrossRefImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<String>
+        implements QuerySource {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String url;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Override
+    public String getImportSource() {
+        return "crossref";
+    }
+
+    @Override
+    public void init() throws Exception {}
+
+    @Override
+    public ImportRecord getRecord(String recordId) throws MetadataSourceException {
+        String id = getID(recordId);
+        List<ImportRecord> records = StringUtils.isNotBlank(id) ? retry(new SearchByIdCallable(id))
+                                                                : retry(new SearchByIdCallable(recordId));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        String id = getID(query);
+        return StringUtils.isNotBlank(id) ? retry(new DoiCheckCallable(id)) : retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        String id = getID(query.toString());
+        return StringUtils.isNotBlank(id) ? retry(new DoiCheckCallable(id)) : retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        String id = getID(query.toString());
+        return StringUtils.isNotBlank(id) ? retry(new SearchByIdCallable(id))
+                                          : retry(new SearchByQueryCallable(query, count, start));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        String id = getID(query.toString());
+        if (StringUtils.isNotBlank(id)) {
+            return retry(new SearchByIdCallable(id));
+        }
+        return retry(new SearchByQueryCallable(query));
+    }
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        String id = getID(query.toString());
+        List<ImportRecord> records = StringUtils.isNotBlank(id) ? retry(new SearchByIdCallable(id))
+                                                                : retry(new SearchByIdCallable(query));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        String id = getID(query.toString());
+        return StringUtils.isNotBlank(id) ? retry(new SearchByIdCallable(id))
+                                          : retry(new FindMatchingRecordCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for CrossRef");
+    }
+
+    public String getID(String id) {
+        return DoiCheck.isDoi(id) ? "filter=doi:" + id : StringUtils.EMPTY;
+    }
+
+    /**
+     * This class is a Callable implementation to get CrossRef entries based on query object.
+     * This Callable use as query value the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, a Query's map entry with key "query" will be used.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private SearchByQueryCallable(String queryString, Integer maxResult, Integer start) {
+            query = new Query();
+            query.addParameter("query", queryString);
+            query.addParameter("count", maxResult);
+            query.addParameter("start", start);
+        }
+
+        private SearchByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+
+            URIBuilder uriBuilder = new URIBuilder(url);
+            uriBuilder.addParameter("query", query.getParameterAsClass("query", String.class));
+            if (Objects.nonNull(count)) {
+                uriBuilder.addParameter("rows", count.toString());
+            }
+            if (Objects.nonNull(start)) {
+                uriBuilder.addParameter("offset", start.toString());
+            }
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            JsonNode jsonNode = convertStringJsonToJsonNode(response);
+            Iterator<JsonNode> nodes = jsonNode.at("/message/items").iterator();
+            while (nodes.hasNext()) {
+                JsonNode node = nodes.next();
+                results.add(transformSourceRecords(node.toString()));
+            }
+            return results;
+        }
+
+    }
+
+    /**
+     * This class is a Callable implementation to get an CrossRef entry using DOI
+     * The DOI to use can be passed through the constructor as a String or as Query's map entry, with the key "id".
+     *
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByIdCallable implements Callable<List<ImportRecord>> {
+        private Query query;
+
+        private SearchByIdCallable(Query query) {
+            this.query = query;
+        }
+
+        private SearchByIdCallable(String id) {
+            this.query = new Query();
+            query.addParameter("id", id);
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            String ID = URLDecoder.decode(query.getParameterAsClass("id", String.class), "UTF-8");
+            URIBuilder uriBuilder = new URIBuilder(url + "/" + ID);
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String responseString = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            JsonNode jsonNode = convertStringJsonToJsonNode(responseString);
+            JsonNode messageNode = jsonNode.at("/message");
+            results.add(transformSourceRecords(messageNode.toString()));
+            return results;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to search CrossRef entries using author and title.
+     * There are two field in the Query map to pass, with keys "title" and "author"
+     * (at least one must be used).
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class FindMatchingRecordCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private FindMatchingRecordCallable(Query q) {
+            query = q;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            String queryValue = query.getParameterAsClass("query", String.class);
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            String author = query.getParameterAsClass("author", String.class);
+            String title = query.getParameterAsClass("title", String.class);
+            String bibliographics = query.getParameterAsClass("bibliographics", String.class);
+            List<ImportRecord> results = new ArrayList<>();
+            URIBuilder uriBuilder = new URIBuilder(url);
+            if (Objects.nonNull(queryValue)) {
+                uriBuilder.addParameter("query", queryValue);
+            }
+            if (Objects.nonNull(count)) {
+                uriBuilder.addParameter("rows", count.toString());
+            }
+            if (Objects.nonNull(start)) {
+                uriBuilder.addParameter("offset", start.toString());
+            }
+            if (Objects.nonNull(author)) {
+                uriBuilder.addParameter("query.author", author);
+            }
+            if (Objects.nonNull(title )) {
+                uriBuilder.addParameter("query.container-title", title);
+            }
+            if (Objects.nonNull(bibliographics)) {
+                uriBuilder.addParameter("query.bibliographic", bibliographics);
+            }
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String resp = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            JsonNode jsonNode = convertStringJsonToJsonNode(resp);
+            Iterator<JsonNode> nodes = jsonNode.at("/message/items").iterator();
+            while (nodes.hasNext()) {
+                JsonNode node = nodes.next();
+                results.add(transformSourceRecords(node.toString()));
+            }
+            return results;
+        }
+
+    }
+
+    /**
+     * This class is a Callable implementation to count the number of entries for an CrossRef query.
+     * This Callable use as query value to CrossRef the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, the value of the Query's
+     * map with the key "query" will be used.
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class CountByQueryCallable implements Callable<Integer> {
+
+        private Query query;
+
+        private CountByQueryCallable(String queryString) {
+            query = new Query();
+            query.addParameter("query", queryString);
+        }
+
+        private CountByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            URIBuilder uriBuilder = new URIBuilder(url);
+            uriBuilder.addParameter("query", query.getParameterAsClass("query", String.class));
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String responseString = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            JsonNode jsonNode = convertStringJsonToJsonNode(responseString);
+            return jsonNode.at("/message/total-results").asInt();
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to check if exist an CrossRef entry using DOI.
+     * The DOI to use can be passed through the constructor as a String or as Query's map entry, with the key "id".
+     * return 1 if CrossRef entry exists otherwise 0
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class DoiCheckCallable implements Callable<Integer> {
+
+        private final Query query;
+
+        private DoiCheckCallable(final String id) {
+            final Query query = new Query();
+            query.addParameter("id", id);
+            this.query = query;
+        }
+
+        private DoiCheckCallable(final Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            URIBuilder uriBuilder = new URIBuilder(url + "/" + query.getParameterAsClass("id", String.class));
+            String responseString = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            JsonNode jsonNode = convertStringJsonToJsonNode(responseString);
+            return StringUtils.equals(jsonNode.at("/status").toString(), "ok") ? 1 : 0;
+        }
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        try {
+            return new ObjectMapper().readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return null;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteFieldMapping.java
new file mode 100644
index 0000000000..f8540307b9
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteFieldMapping.java
@@ -0,0 +1,38 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.datacite;
+
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the datacite metadatum fields on the DSpace metadatum fields
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ * @author Florian Gantner (florian.gantner@uni-bamberg.de)
+ */
+public class DataCiteFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @Resource(name = "dataciteMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..a11f2bc247
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteImportMetadataSourceServiceImpl.java
@@ -0,0 +1,168 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.datacite;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.el.MethodNotFoundException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.DoiCheck;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying Datacite
+ * Mainly copied from CrossRefImportMetadataSourceServiceImpl.
+ *
+ * optional Affiliation informations are not part of the API request.
+ * https://support.datacite.org/docs/can-i-see-more-detailed-affiliation-information-in-the-rest-api
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ * @author Florian Gantner (florian.gantner@uni-bamberg.de)
+ *
+ */
+public class DataCiteImportMetadataSourceServiceImpl
+        extends AbstractImportMetadataSourceService<String> implements QuerySource {
+    private final static Logger log = LogManager.getLogger();
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Override
+    public String getImportSource() {
+        return "datacite";
+    }
+
+    @Override
+    public void init() throws Exception {
+    }
+
+    @Override
+    public ImportRecord getRecord(String recordId) throws MetadataSourceException {
+        Collection<ImportRecord> records = getRecords(recordId, 0, 1);
+        if (records.size() == 0) {
+            return null;
+        }
+        return records.stream().findFirst().get();
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        Collection<ImportRecord> records = getRecords(query, 0, -1);
+        return records == null ? 0 : records.size();
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        String id = getID(query.toString());
+        return getRecordsCount(StringUtils.isBlank(id) ? query.toString() : id);
+    }
+
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        List<ImportRecord> records = new ArrayList<>();
+        String id = getID(query);
+        Map<String, Map<String, String>> params = new HashMap<>();
+        Map<String, String> uriParameters = new HashMap<>();
+        params.put("uriParameters", uriParameters);
+        if (StringUtils.isBlank(id)) {
+            id = query;
+        }
+        uriParameters.put("query", id);
+        int timeoutMs = configurationService.getIntProperty("datacite.timeout", 180000);
+        String url = configurationService.getProperty("datacite.url", "https://api.datacite.org/dois/");
+        String responseString = liveImportClient.executeHttpGetRequest(timeoutMs, url, params);
+        JsonNode jsonNode = convertStringJsonToJsonNode(responseString);
+        if (jsonNode == null) {
+            log.warn("DataCite returned invalid JSON");
+            return records;
+        }
+        JsonNode dataNode = jsonNode.at("/data");
+        if (dataNode.isArray()) {
+            Iterator<JsonNode> iterator = dataNode.iterator();
+            while (iterator.hasNext()) {
+                JsonNode singleDoiNode = iterator.next();
+                String json = singleDoiNode.at("/attributes").toString();
+                records.add(transformSourceRecords(json));
+            }
+        } else {
+            String json = dataNode.at("/attributes").toString();
+            records.add(transformSourceRecords(json));
+        }
+
+        return records;
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        try {
+            return new ObjectMapper().readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return null;
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        String id = getID(query.toString());
+        return getRecords(StringUtils.isBlank(id) ? query.toString() : id, 0, -1);
+    }
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        String id = getID(query.toString());
+        return getRecord(StringUtils.isBlank(id) ? query.toString() : id);
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        String id = getID(query.toString());
+        return getRecords(StringUtils.isBlank(id) ? query.toString() : id, 0, -1);
+    }
+
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for DataCite");
+    }
+
+    public String getID(String query) {
+        if (DoiCheck.isDoi(query)) {
+            return query;
+        }
+        // Workaround for encoded slashes.
+        if (query.contains("%252F")) {
+            query = query.replace("%252F", "/");
+        }
+        if (DoiCheck.isDoi(query)) {
+            return query;
+        }
+        return StringUtils.EMPTY;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoFieldMapping.java
new file mode 100644
index 0000000000..64ec53ffb9
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoFieldMapping.java
@@ -0,0 +1,36 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.epo.service;
+
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the Epo metadatum fields on the DSpace metadatum fields
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ */
+public class EpoFieldMapping extends AbstractMetadataFieldMapping {
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @Resource(name = "epoMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..7240e356e3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoImportMetadataSourceServiceImpl.java
@@ -0,0 +1,541 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.epo.service;
+
+import static org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl.HEADER_PARAMETERS;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpException;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.xerces.impl.dv.util.Base64;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.contributor.EpoIdMetadataContributor.EpoDocumentId;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.jaxen.JaxenException;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.Text;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying EPO
+ * 
+ * @author Pasquale Cavallo (pasquale.cavallo at 4Science dot it)
+ */
+public class EpoImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Element>
+        implements QuerySource {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String url;
+    private String authUrl;
+    private String searchUrl;
+
+    private String consumerKey;
+    private String consumerSecret;
+
+    private MetadataFieldConfig dateFiled;
+    private MetadataFieldConfig applicationNumber;
+
+    public static final String APP_NO_DATE_SEPARATOR = "$$$";
+    private static final String APP_NO_DATE_SEPARATOR_REGEX = "\\$\\$\\$";
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Override
+    public void init() throws Exception {}
+
+    /**
+     * The string that identifies this import implementation. Preferable a URI
+     *
+     * @return the identifying uri
+     */
+    @Override
+    public String getImportSource() {
+        return "epo";
+    }
+
+    /**
+     * Set the customer epo key
+     * @param consumerKey the customer consumer key
+     */
+    public void setConsumerKey(String consumerKey) {
+        this.consumerKey = consumerKey;
+    }
+
+    public String getConsumerKey() {
+        return consumerKey;
+    }
+
+    /**
+     * Set the costumer epo secret
+     * @param consumerSecret the customer epo secret
+     */
+    public void setConsumerSecret(String consumerSecret) {
+        this.consumerSecret = consumerSecret;
+    }
+
+    public String getConsumerSecret() {
+        return consumerSecret;
+    }
+
+    public void setDateFiled(MetadataFieldConfig dateFiled) {
+        this.dateFiled = dateFiled;
+    }
+
+    public MetadataFieldConfig getDateFiled() {
+        return dateFiled;
+    }
+
+    public void setApplicationNumber(MetadataFieldConfig applicationNumber) {
+        this.applicationNumber = applicationNumber;
+    }
+
+    public MetadataFieldConfig getApplicationNumber() {
+        return applicationNumber;
+    }
+
+    /***
+     * Log to EPO, bearer is valid for 20 minutes
+     * 
+     * @param consumerKey       The consumer Key
+     * @param consumerSecretKey The consumer secret key
+     * @return
+     * @throws IOException
+     * @throws HttpException
+     */
+    protected String login() throws IOException, HttpException {
+        Map<String, Map<String, String>> params = getLoginParams();
+        String entity = "grant_type=client_credentials";
+        String json = liveImportClient.executeHttpPostRequest(this.authUrl, params, entity);
+        ObjectMapper mapper = new ObjectMapper(new JsonFactory());
+        JsonNode rootNode = mapper.readTree(json);
+        JsonNode accessTokenNode = rootNode.get("access_token");
+        return accessTokenNode.asText();
+    }
+
+    private Map<String, Map<String, String>> getLoginParams() {
+        Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+        Map<String, String> headerParams = getLoginHeaderParams();
+        params.put(HEADER_PARAMETERS, headerParams);
+        return params;
+    }
+
+    private Map<String, String> getLoginHeaderParams() {
+        Map<String, String> params = new HashMap<String, String>();
+        String authString = consumerKey + ":" + consumerSecret;
+        params.put("Authorization", "Basic " + Base64.encode(authString.getBytes()));
+        params.put("Content-type", "application/x-www-form-urlencoded");
+        return params;
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        if (StringUtils.isNotBlank(consumerKey) && StringUtils.isNotBlank(consumerSecret)) {
+            try {
+                String bearer = login();
+                return retry(new CountRecordsCallable(query, bearer));
+            } catch (IOException | HttpException e) {
+                log.warn(e.getMessage());
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        }
+        return 0;
+
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        if (StringUtils.isNotBlank(consumerKey) && StringUtils.isNotBlank(consumerSecret)) {
+            try {
+                String bearer = login();
+                return retry(new CountRecordsCallable(query, bearer));
+            } catch (IOException | HttpException e) {
+                e.printStackTrace();
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start,
+            int count) throws MetadataSourceException {
+        if (StringUtils.isNotBlank(consumerKey) && StringUtils.isNotBlank(consumerSecret)) {
+            try {
+                String bearer = login();
+                return retry(new SearchByQueryCallable(query, bearer, start, count));
+            } catch (IOException | HttpException e) {
+                log.warn(e.getMessage());
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        }
+        return new ArrayList<ImportRecord>();
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query)
+            throws MetadataSourceException {
+        if (StringUtils.isNotBlank(consumerKey) && StringUtils.isNotBlank(consumerSecret)) {
+            try {
+                String bearer = login();
+                return retry(new SearchByQueryCallable(query, bearer));
+            } catch (IOException | HttpException e) {
+                log.warn(e.getMessage());
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        }
+        return new ArrayList<ImportRecord>();
+    }
+
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        if (StringUtils.isNotBlank(consumerKey) && StringUtils.isNotBlank(consumerSecret)) {
+            try {
+                String bearer = login();
+                List<ImportRecord> list = retry(new SearchByIdCallable(id, bearer));
+                return CollectionUtils.isNotEmpty(list) ? list.get(0) : null;
+            } catch (IOException | HttpException e) {
+                log.warn(e.getMessage());
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        return null;
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item)
+            throws MetadataSourceException {
+        return null;
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query)
+            throws MetadataSourceException {
+        return null;
+    }
+
+    /**
+     * This class is a Callable implementation to count the number of entries for an EPO query.
+     * This Callable use as query value to EPO the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, the value of the Query's
+     * map with the key "query" will be used.
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class CountRecordsCallable implements Callable<Integer> {
+
+        private String bearer;
+        private String query;
+
+        private CountRecordsCallable(Query query, String bearer) {
+            this.query = query.getParameterAsClass("query", String.class);
+            this.bearer = bearer;
+        }
+
+        private CountRecordsCallable(String query, String bearer) {
+            this.query = query;
+            this.bearer = bearer;
+        }
+
+        public Integer call() throws Exception {
+            return countDocument(bearer, query);
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get an EPO entry using epodocID (epodoc:AB1234567T)
+     * The epodocID to use can be passed through the constructor as a String or as Query's map entry, with the key "id".
+     *
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByIdCallable implements Callable<List<ImportRecord>> {
+
+        private String id;
+        private String bearer;
+
+        private SearchByIdCallable(String id, String bearer) {
+            this.id = id;
+            this.bearer = bearer;
+        }
+
+        public List<ImportRecord> call() throws Exception {
+            int positionToSplit = id.indexOf(":");
+            String docType = EpoDocumentId.EPODOC;
+            String idS = id;
+            if (positionToSplit != -1) {
+                docType = id.substring(0, positionToSplit);
+                idS = id.substring(positionToSplit + 1, id.length());
+            } else if (id.contains(APP_NO_DATE_SEPARATOR)) {
+                 // special case the id is the combination of the applicationnumber and date filed
+                String query = "applicationnumber=" + id.split(APP_NO_DATE_SEPARATOR_REGEX)[0];
+                SearchByQueryCallable search = new SearchByQueryCallable(query, bearer, 0, 10);
+                List<ImportRecord> records = search.call().stream()
+                        .filter(r -> r.getValue(dateFiled.getSchema(), dateFiled.getElement(),
+                                    dateFiled.getQualifier())
+                                .stream()
+                                .anyMatch(m -> StringUtils.equals(m.getValue(),
+                                        id.split(APP_NO_DATE_SEPARATOR_REGEX)[1])
+                        ))
+                        .limit(1).collect(Collectors.toList());
+                return records;
+            }
+            List<ImportRecord> records = searchDocument(bearer, idS, docType);
+            if (records.size() > 1) {
+                log.warn("More record are returned with epocID " + id);
+            }
+            return records;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get EPO entries based on query object.
+     * This Callable use as query value the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, a Query's map entry with key "query" will be used.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+        private Integer start;
+        private Integer count;
+        private String bearer;
+
+        private SearchByQueryCallable(Query query, String bearer) {
+            this.query = query;
+            this.bearer = bearer;
+        }
+
+        public SearchByQueryCallable(String queryValue, String bearer, int start, int count) {
+            this.query = new Query();
+            query.addParameter("query", queryValue);
+            this.start = query.getParameterAsClass("start", Integer.class) != null ?
+                query.getParameterAsClass("start", Integer.class) : 0;
+            this.count = query.getParameterAsClass("count", Integer.class) != null ?
+                query.getParameterAsClass("count", Integer.class) : 20;
+            this.bearer = bearer;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> records = new ArrayList<ImportRecord>();
+            String queryString = query.getParameterAsClass("query", String.class);
+            if (StringUtils.isNotBlank(consumerKey) && StringUtils.isNotBlank(consumerSecret)) {
+                if (StringUtils.isNotBlank(queryString) && StringUtils.isNotBlank(bearer)) {
+                    List<EpoDocumentId> epoDocIds = searchDocumentIds(bearer, queryString, start + 1, count);
+                    for (EpoDocumentId epoDocId : epoDocIds) {
+                        List<ImportRecord> recordfounds = searchDocument(bearer, epoDocId);
+                        if (recordfounds.size() > 1) {
+                            log.warn("More record are returned with epocID " + epoDocId.toString());
+                        }
+                        records.addAll(recordfounds);
+                    }
+                }
+
+            }
+            return records;
+        }
+    }
+
+    private Integer countDocument(String bearer, String query) {
+        if (StringUtils.isBlank(bearer)) {
+            return null;
+        }
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            Map<String, String> headerParameters = new HashMap<String, String>();
+            headerParameters.put("Authorization", "Bearer " + bearer);
+            headerParameters.put("X-OPS-Range", "1-1");
+            params.put(HEADER_PARAMETERS, headerParameters);
+
+            URIBuilder uriBuilder = new URIBuilder(this.searchUrl);
+            uriBuilder.addParameter("q", query);
+
+            String response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(response));
+            Element root = document.getRootElement();
+
+            List<Namespace> namespaces = Arrays.asList(
+                 Namespace.getNamespace("xlink", "http://www.w3.org/1999/xlink"),
+                 Namespace.getNamespace("ops", "http://ops.epo.org"),
+                 Namespace.getNamespace("ns", "http://www.epo.org/exchange"));
+
+            String totalRes = getElement(root, namespaces, "//ops:biblio-search/@total-result-count");
+            return Integer.parseInt(totalRes);
+        } catch (JDOMException | IOException | URISyntaxException | JaxenException e) {
+            log.error(e.getMessage(), e);
+            return null;
+        }
+    }
+
+    private List<EpoDocumentId> searchDocumentIds(String bearer, String query, int start, int count) {
+        List<EpoDocumentId> results = new ArrayList<EpoDocumentId>();
+        int end = start + count;
+        if (StringUtils.isBlank(bearer)) {
+            return results;
+        }
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            Map<String, String> headerParameters = new HashMap<String, String>();
+            headerParameters.put("Authorization", "Bearer " + bearer);
+            if (start >= 1 && end > start) {
+                headerParameters.put("X-OPS-Range", start + "-" + end);
+            }
+            params.put(HEADER_PARAMETERS, headerParameters);
+
+            URIBuilder uriBuilder = new URIBuilder(this.searchUrl);
+            uriBuilder.addParameter("q", query);
+
+            String response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(response));
+            Element root = document.getRootElement();
+
+            List<Namespace> namespaces = Arrays.asList(
+                 Namespace.getNamespace("xlink", "http://www.w3.org/1999/xlink"),
+                 Namespace.getNamespace("ops", "http://ops.epo.org"),
+                 Namespace.getNamespace("ns", "http://www.epo.org/exchange"));
+            XPathExpression<Element> xpath = XPathFactory.instance()
+                    .compile("//ns:document-id", Filters.element(), null, namespaces);
+
+            List<Element> documentIds = xpath.evaluate(root);
+            for (Element documentId : documentIds) {
+                results.add(new EpoDocumentId(documentId, namespaces));
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return results;
+    }
+
+    private List<ImportRecord> searchDocument(String bearer, EpoDocumentId id) {
+        return searchDocument(bearer, id.getId(), id.getDocumentIdType());
+    }
+
+    private List<ImportRecord> searchDocument(String bearer, String id, String docType) {
+        List<ImportRecord> results = new ArrayList<ImportRecord>();
+        if (StringUtils.isBlank(bearer)) {
+            return results;
+        }
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            Map<String, String> headerParameters = new HashMap<String, String>();
+            headerParameters.put("Authorization", "Bearer " + bearer);
+            params.put(HEADER_PARAMETERS, headerParameters);
+
+            String url = this.url.replace("$(doctype)", docType).replace("$(id)", id);
+
+            String response = liveImportClient.executeHttpGetRequest(1000, url, params);
+            List<Element> elements = splitToRecords(response);
+            for (Element element : elements) {
+                results.add(transformSourceRecords(element));
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return results;
+    }
+
+    private List<Element> splitToRecords(String recordsSrc) {
+        try {
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(recordsSrc));
+            Element root = document.getRootElement();
+            List<Namespace> namespaces = Arrays.asList(Namespace.getNamespace("ns", "http://www.epo.org/exchange"));
+            XPathExpression<Element> xpath = XPathFactory.instance().compile("//ns:exchange-document",
+                    Filters.element(), null, namespaces);
+
+            List<Element> recordsList = xpath.evaluate(root);
+            return recordsList;
+        } catch (JDOMException | IOException e) {
+            log.error(e.getMessage(), e);
+            return new LinkedList<Element>();
+        }
+    }
+
+    private String getElement(Element document, List<Namespace> namespaces, String path) throws JaxenException {
+        XPathExpression<Object> xpath = XPathFactory.instance().compile(path, Filters.fpassthrough(), null, namespaces);
+        List<Object> nodes = xpath.evaluate(document);
+        //exactly one element expected for any field
+        if (CollectionUtils.isEmpty(nodes)) {
+            return StringUtils.EMPTY;
+        } else {
+            return getValue(nodes.get(0));
+        }
+    }
+
+    private String getValue(Object el) {
+        if (el instanceof Element) {
+            return ((Element) el).getText();
+        } else if (el instanceof Attribute) {
+            return ((Attribute) el).getValue();
+        } else if (el instanceof String) {
+            return (String)el;
+        } else if (el instanceof Text) {
+            return ((Text) el).getText();
+        } else {
+            log.error("node of type: " + el.getClass());
+            return "";
+        }
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public void setAuthUrl(String authUrl) {
+        this.authUrl = authUrl;
+    }
+
+    public void setSearchUrl(String searchUrl) {
+        this.searchUrl = searchUrl;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/liveimportclient/service/LiveImportClient.java b/dspace-api/src/main/java/org/dspace/importer/external/liveimportclient/service/LiveImportClient.java
new file mode 100644
index 0000000000..a1132cda9c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/liveimportclient/service/LiveImportClient.java
@@ -0,0 +1,39 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.liveimportclient.service;
+
+import java.util.Map;
+
+/**
+ * Interface for classes that allow to contact LiveImport clients.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public interface LiveImportClient {
+
+    /**
+     * Http GET request
+     * 
+     * @param timeout        The connect timeout in milliseconds
+     * @param URL            URL
+     * @param params         This map contains the parameters to be included in the request.
+     *                       Each parameter will be added to the url?(key=value)
+     * @return               The response in String type converted from InputStream
+     */
+    public String executeHttpGetRequest(int timeout, String URL, Map<String, Map<String, String>> params);
+
+    /**
+     * Http POST request
+     * 
+     * @param URL      URL
+     * @param params   This map contains the header params to be included in the request.
+     * @param entry    the entity value
+     * @return         the response in String type converted from InputStream
+     */
+    public String executeHttpPostRequest(String URL, Map<String, Map<String, String>> params, String entry);
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/liveimportclient/service/LiveImportClientImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/liveimportclient/service/LiveImportClientImpl.java
new file mode 100644
index 0000000000..81a6631127
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/liveimportclient/service/LiveImportClientImpl.java
@@ -0,0 +1,188 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.liveimportclient.service;
+
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.config.RequestConfig.Builder;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link LiveImportClient}.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science dot com)
+ */
+public class LiveImportClientImpl implements LiveImportClient {
+
+    private final static Logger log = LogManager.getLogger();
+
+    public static final String URI_PARAMETERS = "uriParameters";
+    public static final String HEADER_PARAMETERS = "headerParameters";
+
+    private CloseableHttpClient httpClient;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Override
+    public String executeHttpGetRequest(int timeout, String URL, Map<String, Map<String, String>> params) {
+        HttpGet method = null;
+        try (CloseableHttpClient httpClient = Optional.ofNullable(this.httpClient)
+                                                      .orElseGet(HttpClients::createDefault)) {
+
+            Builder requestConfigBuilder = RequestConfig.custom();
+            requestConfigBuilder.setConnectionRequestTimeout(timeout);
+            RequestConfig defaultRequestConfig = requestConfigBuilder.build();
+
+            method = new HttpGet(buildUrl(URL, params.get(URI_PARAMETERS)));
+            method.setConfig(defaultRequestConfig);
+
+            Map<String, String> headerParams = params.get(HEADER_PARAMETERS);
+            if (MapUtils.isNotEmpty(headerParams)) {
+                for (String param : headerParams.keySet()) {
+                    method.setHeader(param, headerParams.get(param));
+                }
+            }
+
+            configureProxy(method, defaultRequestConfig);
+
+            HttpResponse httpResponse = httpClient.execute(method);
+            if (isNotSuccessfull(httpResponse)) {
+                throw new RuntimeException("The request failed with: " + getStatusCode(httpResponse) + " code, reason= "
+                                           + httpResponse.getStatusLine().getReasonPhrase());
+            }
+            InputStream inputStream = httpResponse.getEntity().getContent();
+            return IOUtils.toString(inputStream, Charset.defaultCharset());
+        } catch (Exception e1) {
+            log.error(e1.getMessage(), e1);
+        } finally {
+            if (Objects.nonNull(method)) {
+                method.releaseConnection();
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+
+    @Override
+    public String executeHttpPostRequest(String URL, Map<String, Map<String, String>> params, String entry) {
+        HttpPost method = null;
+        try (CloseableHttpClient httpClient = Optional.ofNullable(this.httpClient)
+                                                      .orElseGet(HttpClients::createDefault)) {
+
+            Builder requestConfigBuilder = RequestConfig.custom();
+            RequestConfig defaultRequestConfig = requestConfigBuilder.build();
+
+            method = new HttpPost(buildUrl(URL, params.get(URI_PARAMETERS)));
+            method.setConfig(defaultRequestConfig);
+            if (StringUtils.isNotBlank(entry)) {
+                method.setEntity(new StringEntity(entry));
+            }
+            setHeaderParams(method, params);
+
+            configureProxy(method, defaultRequestConfig);
+
+            HttpResponse httpResponse = httpClient.execute(method);
+            if (isNotSuccessfull(httpResponse)) {
+                throw new RuntimeException();
+            }
+            InputStream inputStream = httpResponse.getEntity().getContent();
+            return IOUtils.toString(inputStream, Charset.defaultCharset());
+        } catch (Exception e1) {
+            log.error(e1.getMessage(), e1);
+        } finally {
+            if (Objects.nonNull(method)) {
+                method.releaseConnection();
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+
+    private void configureProxy(HttpRequestBase method, RequestConfig defaultRequestConfig) {
+        String proxyHost = configurationService.getProperty("http.proxy.host");
+        String proxyPort = configurationService.getProperty("http.proxy.port");
+        if (StringUtils.isNotBlank(proxyHost) && StringUtils.isNotBlank(proxyPort)) {
+            RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig)
+                    .setProxy(new HttpHost(proxyHost, Integer.parseInt(proxyPort), "http"))
+                    .build();
+            method.setConfig(requestConfig);
+        }
+    }
+
+    /**
+     * Allows to set the header parameters to the HTTP Post method
+     * 
+     * @param method  HttpPost method
+     * @param params  This map contains the header params to be included in the request.
+     */
+    private void setHeaderParams(HttpPost method, Map<String, Map<String, String>> params) {
+        Map<String, String> headerParams = params.get(HEADER_PARAMETERS);
+        if (MapUtils.isNotEmpty(headerParams)) {
+            for (String param : headerParams.keySet()) {
+                method.setHeader(param, headerParams.get(param));
+            }
+        }
+    }
+
+    /**
+     * This method allows you to add the parameters contained in the requestParams map to the URL
+     * 
+     * @param URL                   URL
+     * @param requestParams         This map contains the parameters to be included in the request.
+     *                              Each parameter will be added to the url?(key=value)
+     * @return
+     * @throws URISyntaxException
+     */
+    private String buildUrl(String URL, Map<String, String> requestParams) throws URISyntaxException {
+        URIBuilder uriBuilder = new URIBuilder(URL);
+        if (MapUtils.isNotEmpty(requestParams)) {
+            for (String param : requestParams.keySet()) {
+                uriBuilder.setParameter(param, requestParams.get(param));
+            }
+        }
+        return uriBuilder.toString();
+    }
+
+    private boolean isNotSuccessfull(HttpResponse response) {
+        int statusCode = getStatusCode(response);
+        return statusCode < 200 || statusCode > 299;
+    }
+
+    private int getStatusCode(HttpResponse response) {
+        return response.getStatusLine().getStatusCode();
+    }
+
+    public CloseableHttpClient getHttpClient() {
+        return httpClient;
+    }
+
+    public void setHttpClient(CloseableHttpClient httpClient) {
+        this.httpClient = httpClient;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ArrayElementAttributeProcessor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ArrayElementAttributeProcessor.java
new file mode 100644
index 0000000000..b938a290c2
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ArrayElementAttributeProcessor.java
@@ -0,0 +1,82 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * This Processor allows to extract attribute values of an array.
+ * For exaple to extract all values of secondAttribute,
+ * "array":[
+ *       {
+ *        "firstAttribute":"first value",
+ *        "secondAttribute":"second value"
+ *       },
+ *       {
+ *        "firstAttribute":"first value",
+ *        "secondAttribute":"second value"
+ *        }
+ * ]
+ * 
+ * it's possible configure a bean with
+ * pathToArray=/array and elementAttribute=/secondAttribute
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class ArrayElementAttributeProcessor implements JsonPathMetadataProcessor {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String pathToArray;
+
+    private String elementAttribute;
+
+    @Override
+    public Collection<String> processMetadata(String json) {
+        JsonNode rootNode = convertStringJsonToJsonNode(json);
+        Iterator<JsonNode> array = rootNode.at(pathToArray).iterator();
+        Collection<String> values = new ArrayList<>();
+        while (array.hasNext()) {
+            JsonNode element = array.next();
+            String value = element.at(elementAttribute).textValue();
+            if (StringUtils.isNoneBlank(value)) {
+                values.add(value);
+            }
+        }
+        return values;
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode body = null;
+        try {
+            body = mapper.readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return body;
+    }
+
+    public void setPathToArray(String pathToArray) {
+        this.pathToArray = pathToArray;
+    }
+
+    public void setElementAttribute(String elementAttribute) {
+        this.elementAttribute = elementAttribute;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/AuthorMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/AuthorMetadataContributor.java
new file mode 100644
index 0000000000..26063dc744
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/AuthorMetadataContributor.java
@@ -0,0 +1,173 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.apache.commons.lang.StringUtils;
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jaxen.JaxenException;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+
+/**
+ * Scopus specific implementation of {@link MetadataContributor}
+ * Responsible for generating the ScopusID, orcid, author name and affiliationID
+ * from the retrieved item.
+ *
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4science dot it)
+ */
+public class AuthorMetadataContributor extends SimpleXpathMetadatumContributor {
+
+    private static final Namespace NAMESPACE = Namespace.getNamespace("http://www.w3.org/2005/Atom");
+
+    private MetadataFieldConfig orcid;
+    private MetadataFieldConfig scopusId;
+    private MetadataFieldConfig authname;
+    private MetadataFieldConfig affiliation;
+
+    private Map<String, String> affId2affName = new HashMap<String, String>();
+
+    /**
+     * Retrieve the metadata associated with the given object.
+     * Depending on the retrieved node (using the query),
+     * different types of values will be added to the MetadatumDTO list.
+     *
+     * @param element    A class to retrieve metadata from.
+     * @return           A collection of import records. Only the ScopusID, orcid, author name and affiliation
+     *                     of the found records may be put in the record.
+     */
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element element) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        List<MetadatumDTO> metadatums = null;
+        fillAffillation(element);
+        try {
+            List<Element> nodes = element.getChildren("author", NAMESPACE);
+            for (Element el : nodes) {
+                metadatums = getMetadataOfAuthors(el);
+                if (Objects.nonNull(metadatums)) {
+                    for (MetadatumDTO metadatum : metadatums) {
+                        values.add(metadatum);
+                    }
+                }
+            }
+        } catch (JaxenException e) {
+            throw new RuntimeException(e);
+        }
+        return values;
+    }
+
+    /**
+     * Retrieve the the ScopusID, orcid, author name and affiliationID
+     * metadata associated with the given element object.
+     * If the value retrieved from the element is empty
+     * it is set PLACEHOLDER_PARENT_METADATA_VALUE
+     * 
+     * @param element           A class to retrieve metadata from
+     * @throws JaxenException   If Xpath evaluation failed
+     */
+    private List<MetadatumDTO> getMetadataOfAuthors(Element element) throws JaxenException {
+        List<MetadatumDTO> metadatums = new ArrayList<MetadatumDTO>();
+        Element authname = element.getChild("authname", NAMESPACE);
+        Element scopusId = element.getChild("authid", NAMESPACE);
+        Element orcid = element.getChild("orcid", NAMESPACE);
+        Element afid = element.getChild("afid", NAMESPACE);
+
+        addMetadatum(metadatums, getMetadata(getElementValue(authname), this.authname));
+        addMetadatum(metadatums, getMetadata(getElementValue(scopusId), this.scopusId));
+        addMetadatum(metadatums, getMetadata(getElementValue(orcid), this.orcid));
+        addMetadatum(metadatums, getMetadata(StringUtils.isNotBlank(afid.getValue())
+                                 ? this.affId2affName.get(afid.getValue()) : null, this.affiliation));
+        return metadatums;
+    }
+
+    private void addMetadatum(List<MetadatumDTO> list, MetadatumDTO metadatum) {
+        if (Objects.nonNull(metadatum)) {
+            list.add(metadatum);
+        }
+    }
+
+    private String getElementValue(Element element) {
+        if (Objects.nonNull(element)) {
+            return element.getValue();
+        }
+        return StringUtils.EMPTY;
+    }
+
+    private MetadatumDTO getMetadata(String value, MetadataFieldConfig metadaConfig) {
+        if (StringUtils.isBlank(value)) {
+            return null;
+        }
+        MetadatumDTO metadata = new MetadatumDTO();
+        metadata.setElement(metadaConfig.getElement());
+        metadata.setQualifier(metadaConfig.getQualifier());
+        metadata.setSchema(metadaConfig.getSchema());
+        metadata.setValue(value);
+        return metadata;
+    }
+
+    private void fillAffillation(Element element) {
+        try {
+            List<Element> nodes = element.getChildren("affiliation", NAMESPACE);
+            for (Element el : nodes) {
+                fillAffiliation2Name(el);
+            }
+        } catch (JaxenException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void fillAffiliation2Name(Element element) throws JaxenException {
+        Element affilationName = element.getChild("affilname", NAMESPACE);
+        Element affilationId = element.getChild("afid", NAMESPACE);
+        if (Objects.nonNull(affilationId) && Objects.nonNull(affilationName)) {
+            affId2affName.put(affilationId.getValue(), affilationName.getValue());
+        }
+    }
+
+    public MetadataFieldConfig getAuthname() {
+        return authname;
+    }
+
+    public void setAuthname(MetadataFieldConfig authname) {
+        this.authname = authname;
+    }
+
+    public MetadataFieldConfig getOrcid() {
+        return orcid;
+    }
+
+    public void setOrcid(MetadataFieldConfig orcid) {
+        this.orcid = orcid;
+    }
+
+    public MetadataFieldConfig getScopusId() {
+        return scopusId;
+    }
+
+    public void setScopusId(MetadataFieldConfig scopusId) {
+        this.scopusId = scopusId;
+    }
+
+    public MetadataFieldConfig getAffiliation() {
+        return affiliation;
+    }
+
+    public void setAffiliation(MetadataFieldConfig affiliation) {
+        this.affiliation = affiliation;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EpoIdMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EpoIdMetadataContributor.java
new file mode 100644
index 0000000000..e32f45a4d5
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EpoIdMetadataContributor.java
@@ -0,0 +1,312 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Resource;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadataFieldMapping;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jaxen.JaxenException;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Text;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+import org.springframework.beans.factory.annotation.Required;
+
+/**
+ * Custom MetadataContributor to manage Epo ID.
+ * Need as input <publication-reference> element and all children.
+ * 
+ * @author Pasquale Cavallo
+ */
+public class EpoIdMetadataContributor implements MetadataContributor<Element> {
+
+    protected MetadataFieldConfig field;
+
+    private boolean needType;
+
+    /**
+     * This property will be used in ID definition.
+     * If this is true, id will be in the form docType:EpoID, otherwise EpoID will be returned
+     * 
+     * @param needType if true, docType will be included in id definition
+     */
+    public void setNeedType(boolean needType) {
+        this.needType = needType;
+    }
+
+    /**
+     * Return prefixToNamespaceMapping
+     *
+     * @return a prefixToNamespaceMapping map
+     */
+    public Map<String, String> getPrefixToNamespaceMapping() {
+        return prefixToNamespaceMapping;
+    }
+
+    protected MetadataFieldMapping<Element, MetadataContributor<Element>> metadataFieldMapping;
+
+    /**
+     * Return metadataFieldMapping
+     *
+     * @return MetadataFieldMapping
+     */
+    public MetadataFieldMapping<Element, MetadataContributor<Element>> getMetadataFieldMapping() {
+        return metadataFieldMapping;
+    }
+
+    /**
+     * Set the metadataFieldMapping of this SimpleXpathMetadatumContributor
+     *
+     * @param metadataFieldMapping the new mapping.
+     */
+    public void setMetadataFieldMapping(
+        MetadataFieldMapping<Element, MetadataContributor<Element>> metadataFieldMapping) {
+        this.metadataFieldMapping = metadataFieldMapping;
+    }
+
+    /**
+     * Set the prefixToNamespaceMapping for this object,
+     *
+     * @param prefixToNamespaceMapping the new mapping.
+     */
+    @Resource(name = "isiFullprefixMapping")
+    public void setPrefixToNamespaceMapping(Map<String, String> prefixToNamespaceMapping) {
+        this.prefixToNamespaceMapping = prefixToNamespaceMapping;
+    }
+
+    protected Map<String, String> prefixToNamespaceMapping;
+
+    /**
+     * Initialize EpoIdMetadataContributor with a query, prefixToNamespaceMapping and MetadataFieldConfig
+     *
+     * @param query                    query string
+     * @param prefixToNamespaceMapping metadata prefix to namespace mapping
+     * @param field
+     * <a href="https://github.com/DSpace/DSpace/tree/master/dspace-api/src/main/java/org/dspace/importer/external#metadata-mapping-">MetadataFieldConfig</a>
+     */
+    public EpoIdMetadataContributor(String query, Map<String, String> prefixToNamespaceMapping,
+        MetadataFieldConfig field) {
+        this.query = query;
+        this.prefixToNamespaceMapping = prefixToNamespaceMapping;
+        this.field = field;
+    }
+
+    /**
+     * Empty constructor for EpoIdMetadataContributor
+     */
+    public EpoIdMetadataContributor() {
+
+    }
+
+    protected String query;
+
+    /**
+     * Return the MetadataFieldConfig used while retrieving MetadatumDTO
+     *
+     * @return MetadataFieldConfig
+     */
+    public MetadataFieldConfig getField() {
+        return field;
+    }
+
+    /**
+     * Setting the MetadataFieldConfig
+     *
+     * @param field MetadataFieldConfig used while retrieving MetadatumDTO
+     */
+    @Required
+    public void setField(MetadataFieldConfig field) {
+        this.field = field;
+    }
+
+    /**
+     * Return query used to create an xpathExpression on, this query is used to
+     *
+     * @return the query this instance is based on
+     */
+    public String getQuery() {
+        return query;
+    }
+
+    @Required
+    public void setQuery(String query) {
+        this.query = query;
+    }
+
+    /**
+     * Retrieve the metadata associated with the given object.
+     * Depending on the retrieved node (using the query), different types of values will be added to the MetadatumDTO
+     * list
+     *
+     * @param element A class to retrieve metadata from.
+     * @return a collection of import records. Only the identifier of the found records may be put in the record.
+     */
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element element) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        try {
+            List<Namespace> namespaces = Arrays.asList(
+                    Namespace.getNamespace("xlink", "http://www.w3.org/1999/xlink"),
+                    Namespace.getNamespace("ops", "http://ops.epo.org"),
+                    Namespace.getNamespace("ns", "http://www.epo.org/exchange"));
+            XPathExpression<Element> xpath = XPathFactory.instance().compile(query, Filters.element(), null,
+                    namespaces);
+            List<Element> elements = xpath.evaluate(element);
+            for (Element el : elements) {
+                EpoDocumentId document = new EpoDocumentId(el, namespaces);
+                MetadatumDTO metadatum = new MetadatumDTO();
+                metadatum.setElement(field.getElement());
+                metadatum.setQualifier(field.getQualifier());
+                metadatum.setSchema(field.getSchema());
+                if (needType) {
+                    metadatum.setValue(document.getIdAndType());
+                } else {
+                    metadatum.setValue(document.getId());
+                }
+                values.add(metadatum);
+            }
+            return values;
+        } catch (JaxenException e) {
+            System.err.println(query);
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * This class maps EPO's response metadata needs to extract epo ID.
+     * 
+     * @author Pasquale Cavallo
+     *
+     */
+    public static class EpoDocumentId {
+
+        private String documentIdType;
+        private String country;
+        private String docNumber;
+        private String kind;
+        private String date;
+        private List<Namespace> namespaces;
+
+
+        public static final String DOCDB = "docdb";
+        public static final String EPODOC = "epodoc";
+        public static final String ORIGIN = "origin";
+
+
+        public EpoDocumentId(Element documentId, List<Namespace> namespaces) throws JaxenException {
+            this.namespaces = namespaces;
+            Element preferredId = null;
+            XPathExpression<Object> xpath = XPathFactory.instance().compile(
+                    "./ns:document-id[@document-id-type=\"epodoc\"]", Filters.fpassthrough(), null, namespaces);
+
+            List<Object> nodes = xpath.evaluate(documentId);
+            if (CollectionUtils.isNotEmpty(nodes)) {
+                preferredId = (Element) nodes.get(0);
+            }
+            if (Objects.isNull(preferredId)) {
+                preferredId = documentId;
+            }
+
+            this.documentIdType = buildDocumentIdType(preferredId);
+            this.country = buildCountry(preferredId);
+            this.docNumber = buildDocNumber(preferredId);
+            this.kind = buildKind(preferredId);
+            this.date = buildDate(preferredId);
+        }
+
+        private String buildDocumentIdType(Element documentId) throws JaxenException {
+            return getElement(documentId, "./@document-id-type");
+        }
+
+        private String buildCountry(Element documentId) throws JaxenException {
+            return getElement(documentId, "./ns:country");
+        }
+
+        private String buildDocNumber(Element documentId) throws JaxenException {
+            return getElement(documentId, "./ns:doc-number");
+        }
+
+        private String buildKind(Element documentId) throws JaxenException {
+            return getElement(documentId, "./ns:kind");
+        }
+
+        private String buildDate(Element documentId) throws JaxenException {
+            return getElement(documentId, "./ns:date");
+        }
+
+
+        public String getDocumentIdType() {
+            return documentIdType;
+        }
+
+        /**
+         * This method compute the epo ID from fields
+         * 
+         * @return the EPO id
+         */
+        public String getId() {
+            if (DOCDB.equals(documentIdType)) {
+                return country + "." + docNumber + "." + kind;
+            } else if (EPODOC.equals(documentIdType)) {
+                return docNumber + ((kind != null) ? kind : StringUtils.EMPTY);
+            } else {
+                return StringUtils.EMPTY;
+            }
+        }
+
+        public String getIdAndType() {
+            if (EPODOC.equals(documentIdType)) {
+                return documentIdType + ":" + docNumber + ((kind != null) ? kind : "");
+            } else if (DOCDB.equals(documentIdType)) {
+                return documentIdType + ":" + country + "." + docNumber + "." + kind;
+            } else {
+                return StringUtils.EMPTY;
+            }
+        }
+
+
+        private String getElement(Element documentId, String path) throws JaxenException {
+            if (Objects.isNull(documentId)) {
+                return StringUtils.EMPTY;
+            }
+            XPathExpression<Object> xpath = XPathFactory.instance().compile(path, Filters.fpassthrough(), null,
+                    namespaces);
+            List<Object> nodes = xpath.evaluate(documentId);
+            //exactly one element expected for any field
+            return CollectionUtils.isNotEmpty(nodes) ? getValue(nodes.get(0)) : StringUtils.EMPTY;
+        }
+
+        private String getValue(Object el) {
+            if (el instanceof Element) {
+                return ((Element) el).getText();
+            } else if (el instanceof Attribute) {
+                return ((Attribute) el).getValue();
+            } else if (el instanceof String) {
+                return (String)el;
+            } else if (el instanceof Text) {
+                return ((Text) el).getText();
+            } else {
+                return StringUtils.EMPTY;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/JsonPathMetadataProcessor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/JsonPathMetadataProcessor.java
new file mode 100644
index 0000000000..2de0c6a0bb
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/JsonPathMetadataProcessor.java
@@ -0,0 +1,23 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.Collection;
+
+/**
+ * Service interface class for processing json object.
+ * The implementation of this class is responsible for all business logic calls
+ * for extracting of values from json object.
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public interface JsonPathMetadataProcessor {
+
+    public Collection<String> processMetadata(String json);
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/MatrixElementProcessor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/MatrixElementProcessor.java
new file mode 100644
index 0000000000..c8e93971f4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/MatrixElementProcessor.java
@@ -0,0 +1,87 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * This Processor allows to extract all values of a matrix.
+ * Only need to configure the path to the matrix in "pathToMatrix"
+ * For exaple to extract all values
+ * "matrix": [
+ *     [
+ *      "first",
+ *      "second"
+ *     ],
+ *     [
+ *      "third"
+ *     ],
+ *     [
+ *      "fourth",
+ *      "fifth"
+ *     ]
+ *   ],
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class MatrixElementProcessor implements JsonPathMetadataProcessor {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String pathToMatrix;
+
+    @Override
+    public Collection<String> processMetadata(String json) {
+        JsonNode rootNode = convertStringJsonToJsonNode(json);
+        Iterator<JsonNode> array = rootNode.at(pathToMatrix).elements();
+        Collection<String> values = new ArrayList<>();
+        while (array.hasNext()) {
+            JsonNode element = array.next();
+            if (element.isArray()) {
+                Iterator<JsonNode> nodes = element.iterator();
+                while (nodes.hasNext()) {
+                    String nodeValue = nodes.next().textValue();
+                    if (StringUtils.isNotBlank(nodeValue)) {
+                        values.add(nodeValue);
+                    }
+                }
+            } else {
+                String nodeValue = element.textValue();
+                if (StringUtils.isNotBlank(nodeValue)) {
+                    values.add(nodeValue);
+                }
+            }
+        }
+        return values;
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode body = null;
+        try {
+            body = mapper.readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return body;
+    }
+
+    public void setPathToMatrix(String pathToMatrix) {
+        this.pathToMatrix = pathToMatrix;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/PageRangeXPathMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/PageRangeXPathMetadataContributor.java
new file mode 100644
index 0000000000..0bcb33d689
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/PageRangeXPathMetadataContributor.java
@@ -0,0 +1,110 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+
+/**
+ * Scopus specific implementation of {@link MetadataContributor}
+ * Responsible for generating the Scopus startPage and endPage from the retrieved item.
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4science.com)
+ */
+public class PageRangeXPathMetadataContributor extends SimpleXpathMetadatumContributor {
+
+    private MetadataFieldConfig startPageMetadata;
+
+    private MetadataFieldConfig endPageMetadata;
+
+    /**
+     * Retrieve the metadata associated with the given Element object.
+     * Depending on the retrieved node (using the query),
+     * StartPage and EndPage values will be added to the MetadatumDTO list
+     *
+     * @param el    A class to retrieve metadata from.
+     * @return      A collection of import records. Only the StartPage and EndPage
+     *                of the found records may be put in the record.
+     */
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element el) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        List<MetadatumDTO> metadatums = null;
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            List<Element> nodes = el.getChildren(query, Namespace.getNamespace(ns));
+            for (Element element : nodes) {
+                metadatums = getMetadatum(element.getValue());
+                if (Objects.nonNull(metadatums)) {
+                    for (MetadatumDTO metadatum : metadatums) {
+                        values.add(metadatum);
+                    }
+                }
+            }
+        }
+        return values;
+    }
+
+    private  List<MetadatumDTO> getMetadatum(String value) {
+        List<MetadatumDTO> metadatums = new ArrayList<MetadatumDTO>();
+        if (StringUtils.isBlank(value)) {
+            return null;
+        }
+        String [] range = value.split("-");
+        if (range.length == 2) {
+            metadatums.add(setStartPage(range));
+            metadatums.add(setEndPage(range));
+        } else if (range.length != 0) {
+            metadatums.add(setStartPage(range));
+        }
+        return metadatums;
+    }
+
+    private MetadatumDTO setEndPage(String[] range) {
+        MetadatumDTO endPage = new MetadatumDTO();
+        endPage.setValue(range[1]);
+        endPage.setElement(endPageMetadata.getElement());
+        endPage.setQualifier(endPageMetadata.getQualifier());
+        endPage.setSchema(endPageMetadata.getSchema());
+        return endPage;
+    }
+
+    private MetadatumDTO setStartPage(String[] range) {
+        MetadatumDTO startPage = new MetadatumDTO();
+        startPage.setValue(range[0]);
+        startPage.setElement(startPageMetadata.getElement());
+        startPage.setQualifier(startPageMetadata.getQualifier());
+        startPage.setSchema(startPageMetadata.getSchema());
+        return startPage;
+    }
+
+    public MetadataFieldConfig getStartPageMetadata() {
+        return startPageMetadata;
+    }
+
+    public void setStartPageMetadata(MetadataFieldConfig startPageMetadata) {
+        this.startPageMetadata = startPageMetadata;
+    }
+
+    public MetadataFieldConfig getEndPageMetadata() {
+        return endPageMetadata;
+    }
+
+    public void setEndPageMetadata(MetadataFieldConfig endPageMetadata) {
+        this.endPageMetadata = endPageMetadata;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ReplaceCharacterXPathMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ReplaceCharacterXPathMetadataContributor.java
new file mode 100644
index 0000000000..9fb92348be
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ReplaceCharacterXPathMetadataContributor.java
@@ -0,0 +1,66 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+
+/**
+ * This contributor replace specific character in the metadata value.
+ * It is useful for some provider (e.g. Scopus) which use containing "/" character.
+ * Actually, "/" will never encode by framework in URL building. In the same ways, if we
+ * encode "/" -> %2F, it will be encoded by framework and become %252F.
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4science.com)
+ */
+public class ReplaceCharacterXPathMetadataContributor extends SimpleXpathMetadatumContributor {
+
+    private char characterToBeReplaced;
+
+    private char characterToReplaceWith;
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element element) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            List<Element> nodes = element.getChildren(query, Namespace.getNamespace(ns));
+            for (Element el : nodes) {
+                values.add(getMetadatum(field, el.getValue()));
+            }
+        }
+        return values;
+    }
+
+    private MetadatumDTO getMetadatum(MetadataFieldConfig field, String value) {
+        MetadatumDTO dcValue = new MetadatumDTO();
+        if (Objects.isNull(field)) {
+            return null;
+        }
+        dcValue.setValue(value == null ? null : value.replace(characterToBeReplaced, characterToReplaceWith));
+        dcValue.setElement(field.getElement());
+        dcValue.setQualifier(field.getQualifier());
+        dcValue.setSchema(field.getSchema());
+        return dcValue;
+    }
+
+    public void setCharacterToBeReplaced(int characterToBeReplaced) {
+        this.characterToBeReplaced = (char)characterToBeReplaced;
+    }
+
+    public void setCharacterToReplaceWith(int characterToReplaceWith) {
+        this.characterToReplaceWith = (char)characterToReplaceWith;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleConcatContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleConcatContributor.java
new file mode 100644
index 0000000000..d84bc65701
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleConcatContributor.java
@@ -0,0 +1,65 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+
+/**
+ * This contributor is able to concat multi value.
+ * Given a certain path, if it contains several nodes,
+ * the values of nodes will be concatenated into a single one.
+ * The concrete example we can see in the file wos-responce.xml in the <abstract_text> node,
+ * which may contain several <p> paragraphs,
+ * this Contributor allows concatenating all <p> paragraphs. to obtain a single one.
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4Science dot it)
+ */
+public class SimpleConcatContributor extends SimpleXpathMetadatumContributor {
+
+    private final static Logger log = LogManager.getLogger();
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element t) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        StringBuilder text = new StringBuilder();
+        List<Namespace> namespaces = new ArrayList<Namespace>();
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            namespaces.add(Namespace.getNamespace(prefixToNamespaceMapping.get(ns), ns));
+        }
+        XPathExpression<Object> xpath = XPathFactory.instance().compile(query, Filters.fpassthrough(), null,namespaces);
+        List<Object> nodes = xpath.evaluate(t);
+        for (Object el : nodes) {
+            if (el instanceof Element) {
+                Element element = (Element) el;
+                if (StringUtils.isNotBlank(element.getText())) {
+                    text.append(element.getText());
+                }
+            } else {
+                log.warn("node of type: " + el.getClass());
+            }
+        }
+        if (StringUtils.isNotBlank(text.toString())) {
+            values.add(metadataFieldMapping.toDCValue(field, text.toString()));
+        }
+        return values;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleJsonPathMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleJsonPathMetadataContributor.java
new file mode 100644
index 0000000000..590fc63283
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleJsonPathMetadataContributor.java
@@ -0,0 +1,181 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Objects;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadataFieldMapping;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+
+/**
+ * A simple JsonPath Metadata processor
+ * that allow extract value from json object
+ * by configuring the path in the query variable via the bean.
+ * moreover this can also perform more compact extractions
+ * by configuring specific json processor in "metadataProcessor"
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class SimpleJsonPathMetadataContributor implements MetadataContributor<String> {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String query;
+
+    private MetadataFieldConfig field;
+
+    protected JsonPathMetadataProcessor metadataProcessor;
+
+    /**
+     * Initialize SimpleJsonPathMetadataContributor with a query, prefixToNamespaceMapping and MetadataFieldConfig
+     *
+     * @param query The JSonPath query
+     * @param field the matadata field to map the result of the Json path query
+     * <a href="https://github.com/DSpace/DSpace/tree/master/dspace-api/src/main/java/org/dspace/importer/external#metadata-mapping-">MetadataFieldConfig</a>
+     */
+    public SimpleJsonPathMetadataContributor(String query, MetadataFieldConfig field) {
+        this.query = query;
+        this.field = field;
+    }
+
+
+    /**
+     * Unused by this implementation
+     */
+    @Override
+    public void setMetadataFieldMapping(MetadataFieldMapping<String, MetadataContributor<String>> rt) {
+
+    }
+
+    /**
+     * Empty constructor for SimpleJsonPathMetadataContributor
+     */
+    public SimpleJsonPathMetadataContributor() {
+
+    }
+
+    /**
+     * Return the MetadataFieldConfig used while retrieving MetadatumDTO
+     *
+     * @return MetadataFieldConfig
+     */
+    public MetadataFieldConfig getField() {
+        return field;
+    }
+
+    /**
+     * Setting the MetadataFieldConfig
+     *
+     * @param field MetadataFieldConfig used while retrieving MetadatumDTO
+     */
+    public void setField(MetadataFieldConfig field) {
+        this.field = field;
+    }
+
+    /**
+     * Return query used to create the JSonPath
+     *
+     * @return the query this instance is based on
+     */
+    public String getQuery() {
+        return query;
+    }
+
+    /**
+     * Return query used to create the JSonPath
+     *
+     */
+    public void setQuery(String query) {
+        this.query = query;
+    }
+
+    /**
+     * Used to process data got by jsonpath expression, like arrays to stringify, change date format or else
+     * If it is null, toString will be used.
+     * 
+     * @param metadataProcessor
+     */
+    public void setMetadataProcessor(JsonPathMetadataProcessor metadataProcessor) {
+        this.metadataProcessor = metadataProcessor;
+    }
+
+    /**
+     * Retrieve the metadata associated with the given object.
+     * The toString() of the resulting object will be used.
+     * 
+     * @param fullJson A class to retrieve metadata from.
+     * @return a collection of import records. Only the identifier of the found records may be put in the record.
+     */
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(String fullJson) {
+        Collection<MetadatumDTO> metadata = new ArrayList<>();
+        Collection<String> metadataValue = new ArrayList<>();
+        if (Objects.nonNull(metadataProcessor)) {
+            metadataValue = metadataProcessor.processMetadata(fullJson);
+        } else {
+            JsonNode jsonNode = convertStringJsonToJsonNode(fullJson);
+            JsonNode node = jsonNode.at(query);
+            if (node.isArray()) {
+                Iterator<JsonNode> nodes = node.iterator();
+                while (nodes.hasNext()) {
+                    String nodeValue = getStringValue(nodes.next());
+                    if (StringUtils.isNotBlank(nodeValue)) {
+                        metadataValue.add(nodeValue);
+                    }
+                }
+            } else if (!node.isNull() && StringUtils.isNotBlank(node.toString())) {
+                String nodeValue = getStringValue(node);
+                if (StringUtils.isNotBlank(nodeValue)) {
+                    metadataValue.add(nodeValue);
+                }
+            }
+        }
+        for (String value : metadataValue) {
+            MetadatumDTO metadatumDto = new MetadatumDTO();
+            metadatumDto.setValue(value);
+            metadatumDto.setElement(field.getElement());
+            metadatumDto.setQualifier(field.getQualifier());
+            metadatumDto.setSchema(field.getSchema());
+            metadata.add(metadatumDto);
+        }
+        return metadata;
+    }
+
+    private String getStringValue(JsonNode node) {
+        if (node.isTextual()) {
+            return node.textValue();
+        }
+        if (node.isNumber()) {
+            return node.numberValue().toString();
+        }
+        log.error("It wasn't possible to convert the value of the following JsonNode:" + node.asText());
+        return StringUtils.EMPTY;
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode body = null;
+        try {
+            body = mapper.readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return body;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleMultiplePathContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleMultiplePathContributor.java
new file mode 100644
index 0000000000..57a3293151
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleMultiplePathContributor.java
@@ -0,0 +1,75 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+
+/**
+ * Web of Science specific implementation of {@link MetadataContributor}.
+ * This contributor can perform research on multi-paths.
+ * For example, to populate the subject metadata, in the Web of Science response
+ * the values are contained in different paths,
+ * so this Contributor allows you to collect the values by configuring the paths in the paths list.
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4Science dot it)
+ */
+public class SimpleMultiplePathContributor extends SimpleXpathMetadatumContributor {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private List<String> paths;
+
+    public SimpleMultiplePathContributor() {}
+
+    public SimpleMultiplePathContributor(List<String> paths) {
+        this.paths = paths;
+    }
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element t) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        for (String path : this.paths) {
+            List<Namespace> namespaces = new ArrayList<Namespace>();
+            for (String ns : prefixToNamespaceMapping.keySet()) {
+                namespaces.add(Namespace.getNamespace(prefixToNamespaceMapping.get(ns), ns));
+            }
+            XPathExpression<Object> xpath = XPathFactory.instance().compile(path, Filters.fpassthrough(), null,
+                    namespaces);
+            List<Object> nodes = xpath.evaluate(t);
+            for (Object el : nodes) {
+                if (el instanceof Element) {
+                    values.add(metadataFieldMapping.toDCValue(field, ((Element) el).getText()));
+                } else {
+                    log.warn("node of type: " + el.getClass());
+                }
+            }
+        }
+        return values;
+    }
+
+    public List<String> getPaths() {
+        return paths;
+    }
+
+    public void setPaths(List<String> paths) {
+        this.paths = paths;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleRisToMetadataConcatContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleRisToMetadataConcatContributor.java
new file mode 100644
index 0000000000..5dd354c6f1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleRisToMetadataConcatContributor.java
@@ -0,0 +1,59 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+
+/**
+ * This contributor extends SimpleRisToMetadataContributor,
+ * in particular, this one is able to chain multi values into a single one
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+public class SimpleRisToMetadataConcatContributor extends SimpleRisToMetadataContributor {
+
+    private String tag;
+
+    private MetadataFieldConfig metadata;
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Map<String, List<String>> record) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        List<String> fieldValues = record.get(this.tag);
+        Optional.ofNullable(fieldValues)
+                .map(fv -> fv.stream())
+                .map(s -> s.collect(Collectors.joining(" ")))
+                .ifPresent(t -> values.add(this.metadataFieldMapping.toDCValue(this.metadata, t)));
+        return values;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    public MetadataFieldConfig getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(MetadataFieldConfig metadata) {
+        this.metadata = metadata;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleRisToMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleRisToMetadataContributor.java
new file mode 100644
index 0000000000..36ea0dd478
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleRisToMetadataContributor.java
@@ -0,0 +1,71 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadataFieldMapping;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+
+/**
+ * Metadata contributor that takes a record defined as Map<String,List<String>>
+ * and turns it into metadatums configured in fieldToMetadata
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+public class SimpleRisToMetadataContributor implements MetadataContributor<Map<String,List<String>>> {
+
+    protected Map<String, MetadataFieldConfig> fieldToMetadata;
+
+    protected MetadataFieldMapping<Map<String,List<String>>,
+              MetadataContributor<Map<String,List<String>>>> metadataFieldMapping;
+
+    public SimpleRisToMetadataContributor() {}
+
+    public SimpleRisToMetadataContributor(Map<String, MetadataFieldConfig> fieldToMetadata) {
+        this.fieldToMetadata = fieldToMetadata;
+    }
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Map<String, List<String>> record) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        for (String field : fieldToMetadata.keySet()) {
+            List<String> fieldValues = record.get(field);
+            if (Objects.nonNull(fieldValues)) {
+                for (String value : fieldValues) {
+                    values.add(metadataFieldMapping.toDCValue(fieldToMetadata.get(field), value));
+                }
+            }
+        }
+        return values;
+    }
+
+    public Map<String, MetadataFieldConfig> getFieldToMetadata() {
+        return fieldToMetadata;
+    }
+
+    public void setFieldToMetadata(Map<String, MetadataFieldConfig> fieldToMetadata) {
+        this.fieldToMetadata = fieldToMetadata;
+    }
+
+    public MetadataFieldMapping<Map<String, List<String>>,
+           MetadataContributor<Map<String, List<String>>>> getMetadataFieldMapping() {
+        return metadataFieldMapping;
+    }
+
+    public void setMetadataFieldMapping(MetadataFieldMapping<Map<String, List<String>>,
+                                        MetadataContributor<Map<String, List<String>>>> metadataFieldMapping) {
+        this.metadataFieldMapping = metadataFieldMapping;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathDateFormatMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathDateFormatMetadataContributor.java
new file mode 100644
index 0000000000..fb15cd60ab
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathDateFormatMetadataContributor.java
@@ -0,0 +1,91 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Text;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+
+/**
+ * This contributor can be used when parsing an XML file,
+ * particularly to extract a date and convert it to a specific format.
+ * In the variable dateFormatFrom the read format should be configured,
+ * instead in the variable dateFormatTo the format you want to obtain.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class SimpleXpathDateFormatMetadataContributor extends SimpleXpathMetadatumContributor {
+
+    private DateFormat dateFormatFrom;
+    private DateFormat dateFormatTo;
+
+    public void setDateFormatFrom(String dateFormatFrom) {
+        this.dateFormatFrom = new SimpleDateFormat(dateFormatFrom);
+    }
+
+    public void setDateFormatTo(String dateFormatTo) {
+        this.dateFormatTo = new SimpleDateFormat(dateFormatTo);
+    }
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element element) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        List<Namespace> namespaces = new ArrayList<Namespace>();
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            namespaces.add(Namespace.getNamespace(prefixToNamespaceMapping.get(ns), ns));
+        }
+        XPathExpression<Object> xpath = XPathFactory.instance()
+                          .compile(query,Filters.fpassthrough(), null, namespaces);
+        List<Object> nodes = xpath.evaluate(element);
+        for (Object el : nodes) {
+            if (el instanceof Element) {
+                values.add(getMetadatum(field, ((Element) el).getText()));
+            } else if (el instanceof Attribute) {
+                values.add(getMetadatum(field, ((Attribute) el).getValue()));
+            } else if (el instanceof String) {
+                values.add(getMetadatum(field, (String) el));
+            } else if (el instanceof Text) {
+                values.add(metadataFieldMapping.toDCValue(field, ((Text) el).getText()));
+            } else {
+                System.err.println("node of type: " + el.getClass());
+            }
+        }
+        return values;
+    }
+
+    private MetadatumDTO getMetadatum(MetadataFieldConfig field, String value) {
+        MetadatumDTO dcValue = new MetadatumDTO();
+        if (field == null) {
+            return null;
+        }
+        try {
+            dcValue.setValue(dateFormatTo.format(dateFormatFrom.parse(value)));
+        } catch (ParseException e) {
+            dcValue.setValue(value);
+        }
+        dcValue.setElement(field.getElement());
+        dcValue.setQualifier(field.getQualifier());
+        dcValue.setSchema(field.getSchema());
+        return dcValue;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumAndAttributeContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumAndAttributeContributor.java
new file mode 100644
index 0000000000..edaad8a249
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumAndAttributeContributor.java
@@ -0,0 +1,69 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+
+/**
+ * This contributor checks for each node returned for the supplied path
+ * if node contains supplied attribute - the value of the current node is taken if exist.
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4Science dot com)
+ */
+public class SimpleXpathMetadatumAndAttributeContributor extends SimpleXpathMetadatumContributor {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String attribute;
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element t) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        List<Namespace> namespaces = new ArrayList<Namespace>();
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            namespaces.add(Namespace.getNamespace(prefixToNamespaceMapping.get(ns), ns));
+        }
+        XPathExpression<Object> xpath = XPathFactory.instance().compile(query, Filters.fpassthrough(), null,
+                namespaces);
+        List<Object> nodes = xpath.evaluate(t);
+        for (Object el : nodes) {
+            if (el instanceof Element) {
+                Element element = (Element) el;
+                String attributeValue = element.getAttributeValue(this.attribute);
+                if (StringUtils.isNotBlank(attributeValue)) {
+                    values.add(metadataFieldMapping.toDCValue(this.field, attributeValue));
+                }
+            } else {
+                log.warn("node of type: " + el.getClass());
+            }
+        }
+        return values;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumContributor.java
index 87cdbfa6ed..05f8647d78 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumContributor.java
@@ -7,33 +7,36 @@
  */
 package org.dspace.importer.external.metadatamapping.contributor;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.logging.log4j.Logger;
 import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
 import org.dspace.importer.external.metadatamapping.MetadataFieldMapping;
 import org.dspace.importer.external.metadatamapping.MetadatumDTO;
-import org.jaxen.JaxenException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Text;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * Metadata contributor that takes an axiom OMElement and turns it into a metadatum
+ * Metadata contributor that takes a JDOM Element and turns it into a metadatum
  *
  * @author Roeland Dillen (roeland at atmire dot com)
  */
-public class SimpleXpathMetadatumContributor implements MetadataContributor<OMElement> {
-    private MetadataFieldConfig field;
+public class SimpleXpathMetadatumContributor implements MetadataContributor<Element> {
 
-    private static final Logger log = LoggerFactory.getLogger(SimpleXpathMetadatumContributor.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
+
+    protected MetadataFieldConfig field;
 
     /**
      * Return prefixToNamespaceMapping
@@ -44,14 +47,14 @@ public class SimpleXpathMetadatumContributor implements MetadataContributor<OMEl
         return prefixToNamespaceMapping;
     }
 
-    private MetadataFieldMapping<OMElement, MetadataContributor<OMElement>> metadataFieldMapping;
+    protected MetadataFieldMapping<Element, MetadataContributor<Element>> metadataFieldMapping;
 
     /**
      * Return metadataFieldMapping
      *
      * @return MetadataFieldMapping
      */
-    public MetadataFieldMapping<OMElement, MetadataContributor<OMElement>> getMetadataFieldMapping() {
+    public MetadataFieldMapping<Element, MetadataContributor<Element>> getMetadataFieldMapping() {
         return metadataFieldMapping;
     }
 
@@ -62,7 +65,7 @@ public class SimpleXpathMetadatumContributor implements MetadataContributor<OMEl
      */
     @Override
     public void setMetadataFieldMapping(
-        MetadataFieldMapping<OMElement, MetadataContributor<OMElement>> metadataFieldMapping) {
+        MetadataFieldMapping<Element, MetadataContributor<Element>> metadataFieldMapping) {
         this.metadataFieldMapping = metadataFieldMapping;
     }
 
@@ -76,7 +79,7 @@ public class SimpleXpathMetadatumContributor implements MetadataContributor<OMEl
         this.prefixToNamespaceMapping = prefixToNamespaceMapping;
     }
 
-    private Map<String, String> prefixToNamespaceMapping;
+    protected Map<String, String> prefixToNamespaceMapping;
 
     /**
      * Initialize SimpleXpathMetadatumContributor with a query, prefixToNamespaceMapping and MetadataFieldConfig
@@ -100,7 +103,7 @@ public class SimpleXpathMetadatumContributor implements MetadataContributor<OMEl
 
     }
 
-    private String query;
+    protected String query;
 
     /**
      * Return the MetadataFieldConfig used while retrieving MetadatumDTO
@@ -140,36 +143,33 @@ public class SimpleXpathMetadatumContributor implements MetadataContributor<OMEl
      * Depending on the retrieved node (using the query), different types of values will be added to the MetadatumDTO
      * list
      *
-     * @param t A class to retrieve metadata from.
+     * @param t An element to retrieve metadata from.
      * @return a collection of import records. Only the identifier of the found records may be put in the record.
      */
     @Override
-    public Collection<MetadatumDTO> contributeMetadata(OMElement t) {
+    public Collection<MetadatumDTO> contributeMetadata(Element t) {
         List<MetadatumDTO> values = new LinkedList<>();
-        try {
-            AXIOMXPath xpath = new AXIOMXPath(query);
-            for (String ns : prefixToNamespaceMapping.keySet()) {
-                xpath.addNamespace(prefixToNamespaceMapping.get(ns), ns);
-            }
-            List<Object> nodes = xpath.selectNodes(t);
-            for (Object el : nodes) {
-                if (el instanceof OMElement) {
-                    values.add(metadataFieldMapping.toDCValue(field, ((OMElement) el).getText()));
-                } else if (el instanceof OMAttribute) {
-                    values.add(metadataFieldMapping.toDCValue(field, ((OMAttribute) el).getAttributeValue()));
-                } else if (el instanceof String) {
-                    values.add(metadataFieldMapping.toDCValue(field, (String) el));
-                } else if (el instanceof OMText) {
-                    values.add(metadataFieldMapping.toDCValue(field, ((OMText) el).getText()));
-                } else {
-                    log.error("node of type: " + el.getClass());
-                }
-            }
-            return values;
-        } catch (JaxenException e) {
-            log.error(query, e);
-            throw new RuntimeException(e);
-        }
 
+        List<Namespace> namespaces = new ArrayList<>();
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            namespaces.add(Namespace.getNamespace(prefixToNamespaceMapping.get(ns), ns));
+        }
+        XPathExpression<Object> xpath = XPathFactory.instance().compile(query, Filters.fpassthrough(), null,namespaces);
+        List<Object> nodes = xpath.evaluate(t);
+        for (Object el : nodes) {
+            if (el instanceof Element) {
+                values.add(metadataFieldMapping.toDCValue(field, ((Element) el).getText()));
+            } else if (el instanceof Attribute) {
+                values.add(metadataFieldMapping.toDCValue(field, ((Attribute) el).getValue()));
+            } else if (el instanceof String) {
+                values.add(metadataFieldMapping.toDCValue(field, (String) el));
+            } else if (el instanceof Text) {
+                values.add(metadataFieldMapping.toDCValue(field, ((Text) el).getText()));
+            } else {
+                log.error("Encountered unsupported XML node of type: {}. Skipped that node.", el.getClass());
+            }
+        }
+        return values;
     }
-}
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SplitMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SplitMetadataContributor.java
new file mode 100644
index 0000000000..c04081957f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SplitMetadataContributor.java
@@ -0,0 +1,65 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.dspace.importer.external.metadatamapping.MetadataFieldMapping;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+
+/**
+ * Wrapper class used to split another MetadataContributor's output into distinct values.
+ * The split is performed by matching a regular expression against the wrapped MetadataContributor's output.
+ *
+ * @author Philipp Rumpf (philipp.rumpf@uni-bamberg.de)
+ */
+
+public class SplitMetadataContributor<T> implements MetadataContributor<T> {
+    private final MetadataContributor<T> innerContributor;
+    private final String regex;
+
+    /**
+     * @param innerContributor      The MetadataContributor whose output is split
+     * @param regex                 A regular expression matching the separator between different values
+     */
+    public SplitMetadataContributor(MetadataContributor<T> innerContributor, String regex) {
+        this.innerContributor = innerContributor;
+        this.regex = regex;
+    }
+
+    @Override
+    public void setMetadataFieldMapping(MetadataFieldMapping<T, MetadataContributor<T>> rt) {
+
+    }
+
+    /**
+     * Each metadatum returned by the wrapped MetadataContributor is split into one or more metadata values
+     * based on the provided regular expression.
+     *
+     * @param t The recordType object to retrieve metadata from
+     * @return The collection of processed metadata values
+     */
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(T t) {
+        Collection<MetadatumDTO> metadata = innerContributor.contributeMetadata(t);
+        ArrayList<MetadatumDTO> splitMetadata = new ArrayList<>();
+        for (MetadatumDTO metadatumDTO : metadata) {
+            String[] split = metadatumDTO.getValue().split(regex);
+            for (String splitItem : split) {
+                MetadatumDTO splitMetadatumDTO = new MetadatumDTO();
+                splitMetadatumDTO.setSchema(metadatumDTO.getSchema());
+                splitMetadatumDTO.setElement(metadatumDTO.getElement());
+                splitMetadatumDTO.setQualifier(metadatumDTO.getQualifier());
+                splitMetadatumDTO.setValue(splitItem);
+                splitMetadata.add(splitMetadatumDTO);
+            }
+        }
+        return splitMetadata;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosAttribute2ValueContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosAttribute2ValueContributor.java
new file mode 100644
index 0000000000..66e16f7ae8
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosAttribute2ValueContributor.java
@@ -0,0 +1,160 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadataFieldMapping;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+
+/**
+ * Web Of Science specific implementation of {@link MetadataContributor}
+ * This contributor checks for each node returned for the given path if the node contains "this.attribute"
+ * and then checks if the attribute value is one of the values configured
+ * in the "this.attributeValue2metadata" map, if the value of the current known is taken.
+ * If "this.firstChild" is true, it takes the value of the child of the known.
+ * The mapping and configuration of this class can be found in the following wos-integration.xml file.
+ *
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4Science dot it)
+ */
+public class WosAttribute2ValueContributor implements MetadataContributor<Element> {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String query;
+
+    private String attribute;
+
+    private boolean firstChild;
+
+    private String childName;
+
+    private Map<String, String> prefixToNamespaceMapping;
+
+    private Map<String, MetadataFieldConfig> attributeValue2metadata;
+
+    private MetadataFieldMapping<Element, MetadataContributor<Element>> metadataFieldMapping;
+
+    public WosAttribute2ValueContributor() {}
+
+    public WosAttribute2ValueContributor(String query,
+                          Map<String, String> prefixToNamespaceMapping,
+                          Map<String, MetadataFieldConfig> attributeValue2metadata) {
+        this.query = query;
+        this.prefixToNamespaceMapping = prefixToNamespaceMapping;
+        this.attributeValue2metadata = attributeValue2metadata;
+    }
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element t) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        List<Namespace> namespaces = new ArrayList<Namespace>();
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            namespaces.add(Namespace.getNamespace(prefixToNamespaceMapping.get(ns), ns));
+        }
+        XPathExpression<Object> xpath = XPathFactory.instance().compile(query, Filters.fpassthrough(), null,
+                namespaces);
+        List<Object> nodes = xpath.evaluate(t);
+        for (Object el : nodes) {
+            if (el instanceof Element) {
+                Element element = (Element) el;
+                String attributeValue = element.getAttributeValue(this.attribute);
+                setField(attributeValue, element, values);
+            } else {
+                log.warn("node of type: " + el.getClass());
+            }
+        }
+        return values;
+    }
+
+    private void setField(String attributeValue, Element el, List<MetadatumDTO> values) {
+        for (String id : attributeValue2metadata.keySet()) {
+            if (StringUtils.equals(id, attributeValue)) {
+                if (this.firstChild) {
+                    String value = el.getChild(this.childName).getValue();
+                    values.add(metadataFieldMapping.toDCValue(attributeValue2metadata.get(id), value));
+                } else {
+                    values.add(metadataFieldMapping.toDCValue(attributeValue2metadata.get(id), el.getText()));
+                }
+            }
+        }
+    }
+
+    public MetadataFieldMapping<Element, MetadataContributor<Element>> getMetadataFieldMapping() {
+        return metadataFieldMapping;
+    }
+
+    public void setMetadataFieldMapping(
+        MetadataFieldMapping<Element, MetadataContributor<Element>> metadataFieldMapping) {
+        this.metadataFieldMapping = metadataFieldMapping;
+    }
+
+    @Resource(name = "isiFullprefixMapping")
+    public void setPrefixToNamespaceMapping(Map<String, String> prefixToNamespaceMapping) {
+        this.prefixToNamespaceMapping = prefixToNamespaceMapping;
+    }
+
+    public Map<String, String> getPrefixToNamespaceMapping() {
+        return prefixToNamespaceMapping;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+
+    public Map<String, MetadataFieldConfig> getAttributeValue2metadata() {
+        return attributeValue2metadata;
+    }
+
+    public void setAttributeValue2metadata(Map<String, MetadataFieldConfig> attributeValue2metadata) {
+        this.attributeValue2metadata = attributeValue2metadata;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
+
+    public boolean isFirstChild() {
+        return firstChild;
+    }
+
+    public void setFirstChild(boolean firstChild) {
+        this.firstChild = firstChild;
+    }
+
+    public String getChildName() {
+        return childName;
+    }
+
+    public void setChildName(String childName) {
+        this.childName = childName;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosIdentifierContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosIdentifierContributor.java
new file mode 100644
index 0000000000..cf434c326e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosIdentifierContributor.java
@@ -0,0 +1,71 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+
+/**
+ * This contributor can retrieve the identifiers
+ * configured in "this.identifire2field" from the Web of Science response.
+ * The mapping and configuration of this class can be found in the following wos-integration.xml file.
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4Science dot it)
+ */
+public class WosIdentifierContributor extends SimpleXpathMetadatumContributor {
+
+    protected Map<String, MetadataFieldConfig> identifier2field;
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element element) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        List<Namespace> namespaces = new ArrayList<>();
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            namespaces.add(Namespace.getNamespace(prefixToNamespaceMapping.get(ns), ns));
+        }
+        XPathExpression<Element> xpath =
+                XPathFactory.instance().compile(query, Filters.element(), null, namespaces);
+
+        List<Element> nodes = xpath.evaluate(element);
+        for (Element el : nodes) {
+            String type = el.getAttributeValue("type");
+            setIdentyfier(type, el, values);
+        }
+        return values;
+    }
+
+    private void setIdentyfier(String type, Element el, List<MetadatumDTO> values) {
+        for (String id : identifier2field.keySet()) {
+            if (StringUtils.equals(id, type)) {
+                String value = el.getAttributeValue("value");
+                values.add(metadataFieldMapping.toDCValue(identifier2field.get(id), value));
+            }
+        }
+    }
+
+    public Map<String, MetadataFieldConfig> getIdentifier2field() {
+        return identifier2field;
+    }
+
+    public void setIdentifier2field(Map<String, MetadataFieldConfig> identifier2field) {
+        this.identifier2field = identifier2field;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosIdentifierRidContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosIdentifierRidContributor.java
new file mode 100644
index 0000000000..768ef50e65
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosIdentifierRidContributor.java
@@ -0,0 +1,68 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+
+/**
+ * Web Of Science specific implementation of {@link MetadataContributor}
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4Science dot it)
+ */
+public class WosIdentifierRidContributor extends SimpleXpathMetadatumContributor {
+
+    private final static Logger log = LogManager.getLogger();
+
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(Element t) {
+        List<MetadatumDTO> values = new LinkedList<>();
+        List<Namespace> namespaces = new ArrayList<Namespace>();
+        for (String ns : prefixToNamespaceMapping.keySet()) {
+            namespaces.add(Namespace.getNamespace(prefixToNamespaceMapping.get(ns), ns));
+        }
+        XPathExpression<Object> xpath = XPathFactory.instance().compile(query, Filters.fpassthrough(), null,
+                namespaces);
+        List<Object> nodes = xpath.evaluate(t);
+        for (Object el : nodes) {
+            if (el instanceof Element) {
+                Element element = ((Element) el).getChild("name");
+                if (Objects.nonNull(element)) {
+                    String type = element.getAttributeValue("role");
+                    setIdentyfier(type, element, values);
+                }
+            } else {
+                log.warn("node of type: " + el.getClass());
+            }
+        }
+        return values;
+    }
+
+    private void setIdentyfier(String type, Element el, List<MetadatumDTO> values) {
+        if (StringUtils.equals("researcher_id", type)) {
+            String value = el.getAttributeValue("r_id");
+            if (StringUtils.isNotBlank(value)) {
+                values.add(metadataFieldMapping.toDCValue(this.field, value));
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/pubmed/service/PubmedImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/pubmed/service/PubmedImportMetadataSourceServiceImpl.java
index 4802dcfa17..b30ea22ca4 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/pubmed/service/PubmedImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/pubmed/service/PubmedImportMetadataSourceServiceImpl.java
@@ -14,31 +14,34 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.Callable;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
 import com.google.common.io.CharStreams;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
 import org.dspace.content.Item;
 import org.dspace.importer.external.datamodel.ImportRecord;
 import org.dspace.importer.external.datamodel.Query;
 import org.dspace.importer.external.exception.FileMultipleOccurencesException;
 import org.dspace.importer.external.exception.FileSourceException;
 import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
 import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
 import org.dspace.importer.external.service.components.FileSource;
 import org.dspace.importer.external.service.components.QuerySource;
-import org.jaxen.JaxenException;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Implements a data source for querying PubMed Central
@@ -46,20 +49,23 @@ import org.jaxen.JaxenException;
  * @author Roeland Dillen (roeland at atmire dot com)
  * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
  */
-public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<OMElement>
+public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Element>
     implements QuerySource, FileSource {
 
-    private String baseAddress;
+    private String urlFetch;
+    private String urlSearch;
 
-    // it is protected so that subclass can mock it for testing
-    protected WebTarget pubmedWebTarget;
+    private int attempt = 3;
 
     private List<String> supportedExtensions;
 
+    @Autowired
+    private LiveImportClient liveImportClient;
+
     /**
      * Set the file extensions supported by this metadata service
      * 
-     * @param supportedExtensionsthe file extensions (xml,txt,...) supported by this service
+     * @param supportedExtensions the file extensions (xml,txt,...) supported by this service
      */
     public void setSupportedExtensions(List<String> supportedExtensions) {
         this.supportedExtensions = supportedExtensions;
@@ -185,29 +191,7 @@ public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadat
      * @throws Exception on generic exception
      */
     @Override
-    public void init() throws Exception {
-        Client client = ClientBuilder.newClient();
-        WebTarget webTarget = client.target(baseAddress);
-        pubmedWebTarget = webTarget.queryParam("db", "pubmed");
-    }
-
-    /**
-     * Return the baseAddress set to this object
-     *
-     * @return The String object that represents the baseAddress of this object
-     */
-    public String getBaseAddress() {
-        return baseAddress;
-    }
-
-    /**
-     * Set the baseAddress to this object
-     *
-     * @param baseAddress The String object that represents the baseAddress of this object
-     */
-    public void setBaseAddress(String baseAddress) {
-        this.baseAddress = baseAddress;
-    }
+    public void init() throws Exception {}
 
     private class GetNbRecords implements Callable<Integer> {
 
@@ -224,36 +208,43 @@ public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadat
 
         @Override
         public Integer call() throws Exception {
-            WebTarget getRecordIdsTarget = pubmedWebTarget
-                .queryParam("term", query.getParameterAsClass("query", String.class));
+            URIBuilder uriBuilder = new URIBuilder(urlSearch);
+            uriBuilder.addParameter("db", "pubmed");
+            uriBuilder.addParameter("term", query.getParameterAsClass("query", String.class));
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = StringUtils.EMPTY;
+            int countAttempt = 0;
+            while (StringUtils.isBlank(response) && countAttempt <= attempt) {
+                countAttempt++;
+                response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            }
 
-            getRecordIdsTarget = getRecordIdsTarget.path("esearch.fcgi");
+            if (StringUtils.isBlank(response)) {
+                throw new RuntimeException("After " + attempt
+                        + " attempts to contact the PubMed service, a correct answer could not be received."
+                        + " The request was made with this URL:" + uriBuilder.toString());
+            }
 
-            Invocation.Builder invocationBuilder = getRecordIdsTarget.request(MediaType.TEXT_PLAIN_TYPE);
-
-            Response response = invocationBuilder.get();
-
-            String responseString = response.readEntity(String.class);
-
-            String count = getSingleElementValue(responseString, "Count");
-
-            return Integer.parseInt(count);
+            return Integer.parseInt(getSingleElementValue(response, "Count"));
         }
     }
 
-
     private String getSingleElementValue(String src, String elementName) {
-        OMXMLParserWrapper records = OMXMLBuilderFactory.createOMBuilder(new StringReader(src));
-        OMElement element = records.getDocumentElement();
-        AXIOMXPath xpath = null;
         String value = null;
+
         try {
-            xpath = new AXIOMXPath("//" + elementName);
-            List<OMElement> recordsList = xpath.selectNodes(element);
-            if (!recordsList.isEmpty()) {
-                value = recordsList.get(0).getText();
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(src));
+            Element root = document.getRootElement();
+
+            XPathExpression<Element> xpath =
+                XPathFactory.instance().compile("//" + elementName, Filters.element());
+
+            Element record = xpath.evaluateFirst(root);
+            if (record != null) {
+                value = record.getText();
             }
-        } catch (JaxenException e) {
+        } catch (JDOMException | IOException e) {
             value = null;
         }
         return value;
@@ -280,43 +271,63 @@ public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadat
             Integer start = query.getParameterAsClass("start", Integer.class);
             Integer count = query.getParameterAsClass("count", Integer.class);
 
-            if (count == null || count < 0) {
+            if (Objects.isNull(count) || count < 0) {
                 count = 10;
             }
 
-            if (start == null || start < 0) {
+            if (Objects.isNull(start) || start < 0) {
                 start = 0;
             }
 
             List<ImportRecord> records = new LinkedList<ImportRecord>();
 
-            WebTarget getRecordIdsTarget = pubmedWebTarget.queryParam("term", queryString);
-            getRecordIdsTarget = getRecordIdsTarget.queryParam("retstart", start);
-            getRecordIdsTarget = getRecordIdsTarget.queryParam("retmax", count);
-            getRecordIdsTarget = getRecordIdsTarget.queryParam("usehistory", "y");
-            getRecordIdsTarget = getRecordIdsTarget.path("esearch.fcgi");
+            URIBuilder uriBuilder = new URIBuilder(urlSearch);
+            uriBuilder.addParameter("db", "pubmed");
+            uriBuilder.addParameter("retstart", start.toString());
+            uriBuilder.addParameter("retmax", count.toString());
+            uriBuilder.addParameter("usehistory", "y");
+            uriBuilder.addParameter("term", queryString);
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = StringUtils.EMPTY;
+            int countAttempt = 0;
+            while (StringUtils.isBlank(response) && countAttempt <= attempt) {
+                countAttempt++;
+                response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            }
 
-            Invocation.Builder invocationBuilder = getRecordIdsTarget.request(MediaType.TEXT_PLAIN_TYPE);
+            if (StringUtils.isBlank(response)) {
+                throw new RuntimeException("After " + attempt
+                        + " attempts to contact the PubMed service, a correct answer could not be received."
+                        + " The request was made with this URL:" + uriBuilder.toString());
+            }
 
-            Response response = invocationBuilder.get();
-            String responseString = response.readEntity(String.class);
+            String queryKey = getSingleElementValue(response, "QueryKey");
+            String webEnv = getSingleElementValue(response, "WebEnv");
 
-            String queryKey = getSingleElementValue(responseString, "QueryKey");
-            String webEnv = getSingleElementValue(responseString, "WebEnv");
+            URIBuilder uriBuilder2 = new URIBuilder(urlFetch);
+            uriBuilder2.addParameter("db", "pubmed");
+            uriBuilder2.addParameter("retstart", start.toString());
+            uriBuilder2.addParameter("retmax", count.toString());
+            uriBuilder2.addParameter("WebEnv", webEnv);
+            uriBuilder2.addParameter("query_key", queryKey);
+            uriBuilder2.addParameter("retmode", "xml");
+            Map<String, Map<String, String>> params2 = new HashMap<String, Map<String,String>>();
+            String response2 = StringUtils.EMPTY;
+            countAttempt = 0;
+            while (StringUtils.isBlank(response2) && countAttempt <= attempt) {
+                countAttempt++;
+                response2 = liveImportClient.executeHttpGetRequest(1000, uriBuilder2.toString(), params2);
+            }
 
-            WebTarget getRecordsTarget = pubmedWebTarget.queryParam("WebEnv", webEnv);
-            getRecordsTarget = getRecordsTarget.queryParam("query_key", queryKey);
-            getRecordsTarget = getRecordsTarget.queryParam("retmode", "xml");
-            getRecordsTarget = getRecordsTarget.path("efetch.fcgi");
-            getRecordsTarget = getRecordsTarget.queryParam("retmax", count);
-            getRecordsTarget = getRecordsTarget.queryParam("retstart", start);
+            if (StringUtils.isBlank(response2)) {
+                throw new RuntimeException("After " + attempt
+                        + " attempts to contact the PubMed service, a correct answer could not be received."
+                        + " The request was made with this URL:" + uriBuilder2.toString());
+            }
 
-            invocationBuilder = getRecordsTarget.request(MediaType.TEXT_PLAIN_TYPE);
-            response = invocationBuilder.get();
+            List<Element> elements = splitToRecords(response2);
 
-            List<OMElement> omElements = splitToRecords(response.readEntity(String.class));
-
-            for (OMElement record : omElements) {
+            for (Element record : elements) {
                 records.add(transformSourceRecords(record));
             }
 
@@ -324,15 +335,18 @@ public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadat
         }
     }
 
-    private List<OMElement> splitToRecords(String recordsSrc) {
-        OMXMLParserWrapper records = OMXMLBuilderFactory.createOMBuilder(new StringReader(recordsSrc));
-        OMElement element = records.getDocumentElement();
-        AXIOMXPath xpath = null;
+    private List<Element> splitToRecords(String recordsSrc) {
         try {
-            xpath = new AXIOMXPath("//PubmedArticle");
-            List<OMElement> recordsList = xpath.selectNodes(element);
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(recordsSrc));
+            Element root = document.getRootElement();
+
+            XPathExpression<Element> xpath =
+                XPathFactory.instance().compile("//PubmedArticle", Filters.element());
+
+            List<Element> recordsList = xpath.evaluate(root);
             return recordsList;
-        } catch (JaxenException e) {
+        } catch (JDOMException | IOException e) {
             return null;
         }
     }
@@ -352,23 +366,29 @@ public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadat
 
         @Override
         public ImportRecord call() throws Exception {
-            String id = query.getParameterAsClass("id", String.class);
 
-            WebTarget getRecordTarget = pubmedWebTarget.queryParam("id", id);
-            getRecordTarget = getRecordTarget.queryParam("retmode", "xml");
-            getRecordTarget = getRecordTarget.path("efetch.fcgi");
+            URIBuilder uriBuilder = new URIBuilder(urlFetch);
+            uriBuilder.addParameter("db", "pubmed");
+            uriBuilder.addParameter("retmode", "xml");
+            uriBuilder.addParameter("id", query.getParameterAsClass("id", String.class));
 
-            Invocation.Builder invocationBuilder = getRecordTarget.request(MediaType.TEXT_PLAIN_TYPE);
-
-            Response response = invocationBuilder.get();
-
-            List<OMElement> omElements = splitToRecords(response.readEntity(String.class));
-
-            if (omElements.size() == 0) {
-                return null;
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = StringUtils.EMPTY;
+            int countAttempt = 0;
+            while (StringUtils.isBlank(response) && countAttempt <= attempt) {
+                countAttempt++;
+                response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
             }
 
-            return transformSourceRecords(omElements.get(0));
+            if (StringUtils.isBlank(response)) {
+                throw new RuntimeException("After " + attempt
+                        + " attempts to contact the PubMed service, a correct answer could not be received."
+                        + " The request was made with this URL:" + uriBuilder.toString());
+            }
+
+            List<Element> elements = splitToRecords(response);
+
+            return elements.isEmpty() ? null : transformSourceRecords(elements.get(0));
         }
     }
 
@@ -387,40 +407,57 @@ public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadat
         @Override
         public Collection<ImportRecord> call() throws Exception {
 
-            WebTarget getRecordIdsTarget = pubmedWebTarget
-                .queryParam("term", query.getParameterAsClass("term", String.class));
-            getRecordIdsTarget = getRecordIdsTarget
-                .queryParam("field", query.getParameterAsClass("field", String.class));
-            getRecordIdsTarget = getRecordIdsTarget.queryParam("usehistory", "y");
-            getRecordIdsTarget = getRecordIdsTarget.path("esearch.fcgi");
+            URIBuilder uriBuilder = new URIBuilder(urlSearch);
+            uriBuilder.addParameter("db", "pubmed");
+            uriBuilder.addParameter("usehistory", "y");
+            uriBuilder.addParameter("term", query.getParameterAsClass("term", String.class));
+            uriBuilder.addParameter("field", query.getParameterAsClass("field", String.class));
 
-            Invocation.Builder invocationBuilder = getRecordIdsTarget.request(MediaType.TEXT_PLAIN_TYPE);
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = StringUtils.EMPTY;
+            int countAttempt = 0;
+            while (StringUtils.isBlank(response) && countAttempt <= attempt) {
+                countAttempt++;
+                response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            }
 
-            Response response = invocationBuilder.get();
-            String responseString = response.readEntity(String.class);
+            if (StringUtils.isBlank(response)) {
+                throw new RuntimeException("After " + attempt
+                        + " attempts to contact the PubMed service, a correct answer could not be received."
+                        + " The request was made with this URL:" + uriBuilder.toString());
+            }
 
-            String queryKey = getSingleElementValue(responseString, "QueryKey");
-            String webEnv = getSingleElementValue(responseString, "WebEnv");
+            String webEnv = getSingleElementValue(response, "WebEnv");
+            String queryKey = getSingleElementValue(response, "QueryKey");
 
-            WebTarget getRecordsTarget = pubmedWebTarget.queryParam("WebEnv", webEnv);
-            getRecordsTarget = getRecordsTarget.queryParam("query_key", queryKey);
-            getRecordsTarget = getRecordsTarget.queryParam("retmode", "xml");
-            getRecordsTarget = getRecordsTarget.path("efetch.fcgi");
+            URIBuilder uriBuilder2 = new URIBuilder(urlFetch);
+            uriBuilder2.addParameter("db", "pubmed");
+            uriBuilder2.addParameter("retmode", "xml");
+            uriBuilder2.addParameter("WebEnv", webEnv);
+            uriBuilder2.addParameter("query_key", queryKey);
 
-            invocationBuilder = getRecordsTarget.request(MediaType.TEXT_PLAIN_TYPE);
-            response = invocationBuilder.get();
+            Map<String, Map<String, String>> params2 = new HashMap<String, Map<String,String>>();
+            String response2 = StringUtils.EMPTY;
+            countAttempt = 0;
+            while (StringUtils.isBlank(response2) && countAttempt <= attempt) {
+                countAttempt++;
+                response2 = liveImportClient.executeHttpGetRequest(1000, uriBuilder2.toString(), params2);
+            }
 
-            String xml = response.readEntity(String.class);
-            return parseXMLString(xml);
+            if (StringUtils.isBlank(response2)) {
+                throw new RuntimeException("After " + attempt
+                        + " attempts to contact the PubMed service, a correct answer could not be received."
+                        + " The request was made with this URL:" + uriBuilder2.toString());
+            }
+
+            return parseXMLString(response2);
         }
     }
 
-
     @Override
     public List<ImportRecord> getRecords(InputStream inputStream) throws FileSourceException {
-        String xml = null;
         try (Reader reader = new InputStreamReader(inputStream, "UTF-8")) {
-            xml = CharStreams.toString(reader);
+            String xml = CharStreams.toString(reader);
             return parseXMLString(xml);
         } catch (IOException e) {
             throw new FileSourceException ("Cannot read XML from InputStream", e);
@@ -441,10 +478,27 @@ public class PubmedImportMetadataSourceServiceImpl extends AbstractImportMetadat
 
     private List<ImportRecord> parseXMLString(String xml) {
         List<ImportRecord> records = new LinkedList<ImportRecord>();
-        List<OMElement> omElements = splitToRecords(xml);
-        for (OMElement record : omElements) {
+        List<Element> elements = splitToRecords(xml);
+        for (Element record : elements) {
             records.add(transformSourceRecords(record));
         }
         return records;
     }
-}
+
+    public String getUrlFetch() {
+        return urlFetch;
+    }
+
+    public void setUrlFetch(String urlFetch) {
+        this.urlFetch = urlFetch;
+    }
+
+    public String getUrlSearch() {
+        return urlSearch;
+    }
+
+    public void setUrlSearch(String urlSearch) {
+        this.urlSearch = urlSearch;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeFieldMapping.java
new file mode 100644
index 0000000000..8c8e23fe98
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeFieldMapping.java
@@ -0,0 +1,37 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.pubmedeurope;
+
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the PubmedEurope metadatum fields on the DSpace metadatum fields
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ */
+public class PubmedEuropeFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @Resource(name = "pubmedEuropeMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..1ec0da7420
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeMetadataSourceServiceImpl.java
@@ -0,0 +1,419 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.pubmedeurope;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpException;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.jaxen.JaxenException;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * Implements a data source for querying PubMed Europe
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class PubmedEuropeMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Element>
+        implements QuerySource {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String url;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Override
+    public String getImportSource() {
+        return "pubmedeu";
+    }
+
+    /**
+     * Get a single record from the PubMed Europe.
+     *
+     * @param id                         Identifier for the record
+     * @return                           The first matching record
+     * @throws MetadataSourceException   If the underlying methods throw any exception.
+     */
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByIdCallable(id));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    /**
+     * Find the number of records matching a query;
+     *
+     * @param query a query string to base the search on.
+     * @return the sum of the matching records over this import source
+     * @throws MetadataSourceException if the underlying methods throw any exception.
+     */
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    /**
+     * Find the number of records matching a query;
+     *
+     * @param query                      A query string to base the search on.
+     * @return                           The sum of the matching records over this import source
+     * @throws MetadataSourceException   If the underlying methods throw any exception.
+     */
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    /**
+     * Find records matching a string query.
+     *
+     * @param query                      A query string to base the search on.
+     * @param start                      Offset to start at
+     * @param count                      Number of records to retrieve.
+     * @return                           A set of records. Fully transformed.
+     * @throws MetadataSourceException   If the underlying methods throw any exception.
+     */
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query, count, start));
+    }
+
+    /**
+     * Find records based on a object query.
+     *
+     * @param query                     A query object to base the search on.
+     * @return                          A set of records. Fully transformed.
+     * @throws MetadataSourceException  If the underlying methods throw any exception.
+     */
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query));
+    }
+
+    /**
+     * Get a single record from the PubMed Europe.
+     *
+     * @param query                       A query matching a single record
+     * @return                            The first matching record
+     * @throws MetadataSourceException    If the underlying methods throw any exception.
+     */
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByIdCallable(query));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    /**
+     * Finds records based on query object.
+     *
+     * @param query                        A query object to base the search on.
+     * @return                             A collection of import records.
+     * @throws MetadataSourceException     If the underlying methods throw any exception.
+     */
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        return retry(new FindMatchingRecordCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for PubMed Europe");
+    }
+
+    @Override
+    public void init() throws Exception {}
+
+    public List<ImportRecord> getByPubmedEuropeID(String pubmedID, Integer start, Integer size)
+            throws IOException, HttpException {
+        String query = "(EXT_ID:" + pubmedID + ")";
+        return search(query, size < 1 ? 1 : size, start);
+    }
+
+    /**
+     * This class is a Callable implementation to get PubMed Europe entries based on
+     * query object.
+     * 
+     * This Callable use as query value the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, a Query's map entry with key "query" will be used.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private SearchByQueryCallable(String queryString, Integer maxResult, Integer start) {
+            query = new Query();
+            query.addParameter("query", queryString);
+            query.addParameter("count", maxResult);
+            query.addParameter("start", start);
+        }
+
+        private SearchByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            String queryString = query.getParameterAsClass("query", String.class);
+            return search(queryString, count, start);
+
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get an PubMed Europe entry using PubMed Europe ID
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class SearchByIdCallable implements Callable<List<ImportRecord>> {
+        private Query query;
+
+        private SearchByIdCallable(Query query) {
+            this.query = query;
+        }
+
+        private SearchByIdCallable(String id) {
+            this.query = new Query();
+            query.addParameter("id", id);
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            return getByPubmedEuropeID(query.getParameterAsClass("id", String.class), 1 ,0);
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to search PubMed Europe entries
+     * using author, title and year.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    public class FindMatchingRecordCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private FindMatchingRecordCallable(Query q) {
+            query = q;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            String title = query.getParameterAsClass("title", String.class);
+            String author = query.getParameterAsClass("author", String.class);
+            Integer year = query.getParameterAsClass("year", Integer.class);
+            Integer maxResult = query.getParameterAsClass("maxResult", Integer.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            return search(title, author, year, maxResult, start);
+        }
+
+    }
+
+    /**
+     * This class is a Callable implementation to count the number
+     * of entries for an PubMed Europe query.
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class CountByQueryCallable implements Callable<Integer> {
+        private Query query;
+
+
+        private CountByQueryCallable(String queryString) {
+            query = new Query();
+            query.addParameter("query", queryString);
+        }
+
+        private CountByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            try {
+                return count(query.getParameterAsClass("query", String.class));
+            } catch (Exception e) {
+                throw new RuntimeException();
+            }
+        }
+    }
+
+    /**
+     * Returns the total number of PubMed Europe publications returned by a specific query
+     * 
+     * @param query                      A keyword or combination of keywords to be searched
+     * @throws URISyntaxException        If URI syntax error
+     * @throws ClientProtocolException   The client protocol exception
+     * @throws IOException               If IO error
+     * @throws JaxenException            If Xpath evaluation failed
+     */
+    public Integer count(String query) throws URISyntaxException, ClientProtocolException, IOException, JaxenException {
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = liveImportClient.executeHttpGetRequest(1000, buildURI(1, query), params);
+
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(response));
+            Element root = document.getRootElement();
+            Element element = root.getChild("hitCount");
+            return Integer.parseInt(element.getValue());
+        } catch (JDOMException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    public List<ImportRecord> search(String title, String author, int year, int count, int start)
+            throws IOException {
+        StringBuffer query = new StringBuffer();
+        query.append("(");
+        if (StringUtils.isNotBlank(title)) {
+            query.append("TITLE:").append(title);
+            query.append(")");
+        }
+        if (StringUtils.isNotBlank(author)) {
+            // Search for a surname and (optionally) initial(s) in publication author lists
+            // AUTH:einstein, AUTH:”Smith AB”
+            String splitRegex = "(\\s*,\\s+|\\s*;\\s+|\\s*;+|\\s*,+|\\s+)";
+            String[] authors = author.split(splitRegex);
+            if (query.length() > 0) {
+                query.append(" AND ");
+            }
+            query.append("(");
+            int countAuthors = 0;
+            for (String auth : authors) {
+                countAuthors++;
+                query.append("AUTH:\"").append(auth).append("\"");
+                if (countAuthors < authors.length) {
+                    query.append(" AND ");
+                }
+            }
+            query.append(")");
+        }
+        if (year != -1) {
+            if (query.length() > 0) {
+                query.append(" AND ");
+            }
+            query.append("( PUB_YEAR:").append(year).append(")");
+        }
+        query.append(")");
+        return search(query.toString(), count, start);
+    }
+
+    /**
+     * Returns a list of PubMed Europe publication records
+     * 
+     * @param query           A keyword or combination of keywords to be searched
+     * @param size           The number of search results per page
+     * @param start           Start number for the acquired search result list
+     * @throws IOException    If IO error
+     */
+    public List<ImportRecord> search(String query, Integer size, Integer start) throws IOException {
+        List<ImportRecord> results = new ArrayList<>();
+        try {
+            URIBuilder uriBuilder = new URIBuilder(this.url);
+            uriBuilder.addParameter("format", "xml");
+            uriBuilder.addParameter("resulttype", "core");
+            uriBuilder.addParameter("pageSize", String.valueOf(size));
+            uriBuilder.addParameter("query", query);
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            boolean lastPage = false;
+            int skipped = 0;
+            while (!lastPage || results.size() < size) {
+                String response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+                String cursorMark = StringUtils.EMPTY;
+                if (StringUtils.isNotBlank(response)) {
+                    SAXBuilder saxBuilder = new SAXBuilder();
+                    Document document = saxBuilder.build(new StringReader(response));
+                    XPathFactory xpfac = XPathFactory.instance();
+                    XPathExpression<Element> xPath = xpfac.compile("//responseWrapper/resultList/result",
+                            Filters.element());
+                    List<Element> records = xPath.evaluate(document);
+                    if (records.size() > 0) {
+                        for (Element item : records) {
+                            if (start > skipped) {
+                                skipped++;
+                            } else {
+                                results.add(transformSourceRecords(item));
+                            }
+                        }
+                    } else {
+                        lastPage = true;
+                        break;
+                    }
+                    Element root = document.getRootElement();
+                    Element nextCursorMark = root.getChild("nextCursorMark");
+                    cursorMark = Objects.nonNull(nextCursorMark) ? nextCursorMark.getValue() : StringUtils.EMPTY;
+                }
+                if (StringUtils.isNotBlank(cursorMark)) {
+                    uriBuilder.setParameter("cursorMar", cursorMark);
+                } else {
+                    lastPage = true;
+                }
+            }
+        } catch (URISyntaxException | JDOMException e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        return results;
+    }
+
+    private String buildURI(Integer pageSize, String query) throws URISyntaxException {
+        URIBuilder uriBuilder = new URIBuilder(this.url);
+        uriBuilder.addParameter("format", "xml");
+        uriBuilder.addParameter("resulttype", "core");
+        uriBuilder.addParameter("pageSize", String.valueOf(pageSize));
+        uriBuilder.addParameter("query", query);
+        return uriBuilder.toString();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/ris/service/RisImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/ris/service/RisImportMetadataSourceServiceImpl.java
index 2574e187df..1f460c19e6 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/ris/service/RisImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/ris/service/RisImportMetadataSourceServiceImpl.java
@@ -126,10 +126,10 @@ public class RisImportMetadataSourceServiceImpl extends AbstractPlainMetadataSou
     }
 
     /**
-     * Retrieve the MetadataFieldMapping containing the mapping between RecordType
+     * Set the MetadataFieldMapping containing the mapping between RecordType
      * (in this case PlainMetadataSourceDto.class) and Metadata
      *
-     * @return The configured MetadataFieldMapping
+     * @param metadataFieldMap The configured MetadataFieldMapping
      */
     @Override
     @SuppressWarnings("unchecked")
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloFieldMapping.java
new file mode 100644
index 0000000000..0d7183a1f0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloFieldMapping.java
@@ -0,0 +1,37 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.scielo.service;
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the Scielo metadatum fields on the DSpace metadatum fields
+ *
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4science dot it)
+ */
+@SuppressWarnings("rawtypes")
+public class ScieloFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and
+     *                         metadata that will be set to the item.
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    @Resource(name = "scieloMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..4f83ffe978
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloImportMetadataSourceServiceImpl.java
@@ -0,0 +1,263 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.scielo.service;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.el.MethodNotFoundException;
+import javax.ws.rs.BadRequestException;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.FileSourceException;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying Scielo
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4Science dot it)
+ */
+public class ScieloImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Map<String,List<String>>>
+        implements QuerySource {
+
+    /**
+     * This pattern is used when reading the Scielo response,
+     * to check if the fields you are reading is in rid format
+     */
+    private static final String PATTERN = "^([A-Z][A-Z0-9])  - (.*)$";
+
+    /**
+     * This pattern is used to verify correct format of ScieloId
+     */
+    private static final String ID_PATTERN  = "^(.....)-(.*)-(...)$";
+
+    private int timeout = 1000;
+
+    private String url;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Override
+    public void init() throws Exception {}
+
+    @Override
+    public String getImportSource() {
+        return "scielo";
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query, count, start));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query));
+    }
+
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByQueryCallable(query));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new FindByIdCallable(id));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        return retry(new SearchNBByQueryCallable(query));
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for Scielo");
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for Scielo");
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for Scielo");
+    }
+
+    /**
+     * This class is a Callable implementation to count the number of entries for an Scielo query
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchNBByQueryCallable implements Callable<Integer> {
+
+        private String query;
+
+        private SearchNBByQueryCallable(String queryString) {
+            this.query = queryString;
+        }
+
+        private SearchNBByQueryCallable(Query query) {
+            this.query = query.getParameterAsClass("query", String.class);
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            URIBuilder uriBuilder = new URIBuilder(url + URLEncoder.encode(query, StandardCharsets.UTF_8));
+            String resp = liveImportClient.executeHttpGetRequest(timeout, uriBuilder.toString(), params);
+            Map<Integer, Map<String, List<String>>> records = getRecords(resp);
+            return Objects.nonNull(records.size()) ? records.size() : 0;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get an Scielo entry using ScieloID
+     * The ScieloID to use can be passed through the constructor as a String
+     * or as Query's map entry, with the key "id".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class FindByIdCallable implements Callable<List<ImportRecord>> {
+
+        private String id;
+
+        private FindByIdCallable(String id) {
+            this.id = id;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            String scieloId = id.trim();
+            Pattern risPattern = Pattern.compile(ID_PATTERN);
+            Matcher risMatcher = risPattern.matcher(scieloId);
+            if (risMatcher.matches()) {
+                Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+                URIBuilder uriBuilder = new URIBuilder(url + URLEncoder.encode(scieloId, StandardCharsets.UTF_8));
+                String resp = liveImportClient.executeHttpGetRequest(timeout, uriBuilder.toString(), params);
+                Map<Integer, Map<String, List<String>>> records = getRecords(resp);
+                if (Objects.nonNull(records) & !records.isEmpty()) {
+                    results.add(transformSourceRecords(records.get(1)));
+                }
+            } else {
+                throw new BadRequestException("id provided : " + scieloId + " is not an ScieloID");
+            }
+            return results;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get Scielo entries based on query object.
+     * This Callable use as query value the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, a Query's map entry with key "query" will be used.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private SearchByQueryCallable(String queryString, Integer maxResult, Integer start) {
+            query = new Query();
+            query.addParameter("query", queryString);
+            query.addParameter("start", start);
+            query.addParameter("count", maxResult);
+        }
+
+        private SearchByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            String q = query.getParameterAsClass("query", String.class);
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            URIBuilder uriBuilder = new URIBuilder(url + URLEncoder.encode(q, StandardCharsets.UTF_8));
+            uriBuilder.addParameter("start", start.toString());
+            uriBuilder.addParameter("count", count.toString());
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String resp = liveImportClient.executeHttpGetRequest(timeout, uriBuilder.toString(), params);
+            Map<Integer, Map<String, List<String>>> records = getRecords(resp);
+            for (int record : records.keySet()) {
+                results.add(transformSourceRecords(records.get(record)));
+            }
+            return results;
+        }
+    }
+
+    private Map<Integer, Map<String,List<String>>> getRecords(String resp) throws FileSourceException {
+        Map<Integer, Map<String, List<String>>> records = new HashMap<Integer, Map<String,List<String>>>();
+        BufferedReader reader;
+        int countRecord = 0;
+        try {
+            reader = new BufferedReader(new StringReader(resp));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.isEmpty() || line.equals("") || line.matches("^\\s*$")) {
+                    continue;
+                }
+                line = line.replaceAll("\\uFEFF", "").trim();
+                Pattern risPattern = Pattern.compile(PATTERN);
+                Matcher risMatcher = risPattern.matcher(line);
+                if (risMatcher.matches()) {
+                    if (risMatcher.group(1).equals("TY") & risMatcher.group(2).equals("JOUR")) {
+                        countRecord ++;
+                        Map<String,List<String>> newMap = new HashMap<String, List<String>>();
+                        records.put(countRecord, newMap);
+                    } else {
+                        Map<String, List<String>> tag2values = records.get(countRecord);
+                        List<String> values = tag2values.get(risMatcher.group(1));
+                        if (Objects.isNull(values)) {
+                            List<String> newValues = new ArrayList<String>();
+                            newValues.add(risMatcher.group(2));
+                            tag2values.put(risMatcher.group(1), newValues);
+                        } else {
+                            values.add(risMatcher.group(2));
+                            tag2values.put(risMatcher.group(1), values);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new FileSourceException("Cannot parse RIS file", e);
+        }
+        return records;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusFieldMapping.java
new file mode 100644
index 0000000000..c8143339b4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusFieldMapping.java
@@ -0,0 +1,38 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.scopus.service;
+
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the Scopus metadatum fields on the DSpace metadatum fields
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ */
+public class ScopusFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @Resource(name = "scopusMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..d0c2fb078a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusImportMetadataSourceServiceImpl.java
@@ -0,0 +1,421 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.scopus.service;
+
+import static org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl.URI_PARAMETERS;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.DoiCheck;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying Scopus
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science dot com)
+ */
+public class ScopusImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Element>
+        implements QuerySource {
+
+    private int timeout = 1000;
+
+    int itemPerPage = 25;
+
+    private String url;
+    private String apiKey;
+    private String instKey;
+    private String viewMode;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    public LiveImportClient getLiveImportClient() {
+        return liveImportClient;
+    }
+
+    public void setLiveImportClient(LiveImportClient liveImportClient) {
+        this.liveImportClient = liveImportClient;
+    }
+
+    @Override
+    public void init() throws Exception {}
+
+    /**
+     * The string that identifies this import implementation. Preferable a URI
+     *
+     * @return the identifying uri
+     */
+    @Override
+    public String getImportSource() {
+        return "scopus";
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        if (isEID(query)) {
+            return retry(new FindByIdCallable(query)).size();
+        }
+        if (DoiCheck.isDoi(query)) {
+            query = DoiCheck.purgeDoiValue(query);
+        }
+        return retry(new SearchNBByQueryCallable(query));
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        if (isEID(query.toString())) {
+            return retry(new FindByIdCallable(query.toString())).size();
+        }
+        if (DoiCheck.isDoi(query.toString())) {
+            query.addParameter("query", DoiCheck.purgeDoiValue(query.toString()));
+        }
+        return retry(new SearchNBByQueryCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start,
+            int count) throws MetadataSourceException {
+        if (isEID(query)) {
+            return retry(new FindByIdCallable(query));
+        }
+        if (DoiCheck.isDoi(query)) {
+            query = DoiCheck.purgeDoiValue(query);
+        }
+        return retry(new SearchByQueryCallable(query, count, start));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query)
+            throws MetadataSourceException {
+        if (isEID(query.toString())) {
+            return retry(new FindByIdCallable(query.toString()));
+        }
+        if (DoiCheck.isDoi(query.toString())) {
+            query.addParameter("query", DoiCheck.purgeDoiValue(query.toString()));
+        }
+        return retry(new SearchByQueryCallable(query));
+    }
+
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        List<ImportRecord> records = null;
+        if (DoiCheck.isDoi(query.toString())) {
+            query.addParameter("query", DoiCheck.purgeDoiValue(query.toString()));
+        }
+        if (isEID(query.toString())) {
+            records = retry(new FindByIdCallable(query.toString()));
+        } else {
+            records = retry(new SearchByQueryCallable(query));
+        }
+        return records == null || records.isEmpty() ? null : records.get(0);
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item)
+            throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for Scopus");
+    }
+
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new FindByIdCallable(id));
+        return records == null || records.isEmpty() ? null : records.get(0);
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query)
+            throws MetadataSourceException {
+        if (isEID(query.toString())) {
+            return retry(new FindByIdCallable(query.toString()));
+        }
+        if (DoiCheck.isDoi(query.toString())) {
+            query.addParameter("query", DoiCheck.purgeDoiValue(query.toString()));
+        }
+        return retry(new FindByQueryCallable(query));
+    }
+
+    private boolean isEID(String query) {
+        Pattern pattern = Pattern.compile("2-s2\\.0-\\d+");
+        Matcher match = pattern.matcher(query);
+        if (match.matches()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * This class implements a callable to get the numbers of result
+     */
+    private class SearchNBByQueryCallable implements Callable<Integer> {
+
+        private String query;
+
+        private SearchNBByQueryCallable(String queryString) {
+            this.query = queryString;
+        }
+
+        private SearchNBByQueryCallable(Query query) {
+            this.query = query.getParameterAsClass("query", String.class);
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            if (StringUtils.isNotBlank(apiKey)) {
+                // Execute the request.
+                Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+                Map<String, String> requestParams = getRequestParameters(query, null, null, null);
+                params.put(URI_PARAMETERS, requestParams);
+                String response = liveImportClient.executeHttpGetRequest(timeout, url, params);
+
+                SAXBuilder saxBuilder = new SAXBuilder();
+                Document document = saxBuilder.build(new StringReader(response));
+                Element root = document.getRootElement();
+
+                List<Namespace> namespaces = Arrays.asList(
+                     Namespace.getNamespace("opensearch", "http://a9.com/-/spec/opensearch/1.1/"));
+                XPathExpression<Element> xpath = XPathFactory.instance()
+                          .compile("opensearch:totalResults", Filters.element(), null, namespaces);
+
+                Element count = xpath.evaluateFirst(root);
+                try {
+                    return Integer.parseInt(count.getText());
+                } catch (NumberFormatException e) {
+                    return null;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get a Scopus entry using EID
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class FindByIdCallable implements Callable<List<ImportRecord>> {
+
+        private String eid;
+
+        private FindByIdCallable(String eid) {
+            this.eid = eid;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            String queryString = "EID(" + eid.replace("!", "/") + ")";
+            if (StringUtils.isNotBlank(apiKey)) {
+                Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+                Map<String, String> requestParams = getRequestParameters(queryString, viewMode, null, null);
+                params.put(URI_PARAMETERS, requestParams);
+                String response = liveImportClient.executeHttpGetRequest(timeout, url, params);
+                List<Element> elements = splitToRecords(response);
+                for (Element record : elements) {
+                    results.add(transformSourceRecords(record));
+                }
+            }
+            return results;
+        }
+    }
+
+    /**
+     * This class implements a callable to get the items based on query parameters
+     */
+    private class FindByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private String title;
+        private String author;
+        private Integer year;
+        private Integer start;
+        private Integer count;
+
+        private FindByQueryCallable(Query query) {
+            this.title = query.getParameterAsClass("title", String.class);
+            this.year = query.getParameterAsClass("year", Integer.class);
+            this.author = query.getParameterAsClass("author", String.class);
+            this.start = query.getParameterAsClass("start", Integer.class) != null ?
+                query.getParameterAsClass("start", Integer.class) : 0;
+            this.count = query.getParameterAsClass("count", Integer.class) != null ?
+                query.getParameterAsClass("count", Integer.class) : 20;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            String queryString = "";
+            StringBuffer query = new StringBuffer();
+            if (StringUtils.isNotBlank(title)) {
+                query.append("title(").append(title).append("");
+            }
+            if (StringUtils.isNotBlank(author)) {
+                // [FAU]
+                if (query.length() > 0) {
+                    query.append(" AND ");
+                }
+                query.append("AUTH(").append(author).append(")");
+            }
+            if (year != -1) {
+                // [DP]
+                if (query.length() > 0) {
+                    query.append(" AND ");
+                }
+                query.append("PUBYEAR IS ").append(year);
+            }
+            queryString = query.toString();
+
+            if (apiKey != null && !apiKey.equals("")) {
+                Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+                Map<String, String> requestParams = getRequestParameters(queryString, viewMode, start, count);
+                params.put(URI_PARAMETERS, requestParams);
+                String response = liveImportClient.executeHttpGetRequest(timeout, url, params);
+                List<Element> elements = splitToRecords(response);
+                for (Element record : elements) {
+                    results.add(transformSourceRecords(record));
+                }
+            }
+            return results;
+        }
+    }
+
+    /**
+     * Find records matching a string query.
+     *
+     * @param query    A query string to base the search on.
+     * @param start    Offset to start at
+     * @param count    Number of records to retrieve.
+     * @return         A set of records. Fully transformed.
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+        private Query query;
+
+
+        private SearchByQueryCallable(String queryString, Integer maxResult, Integer start) {
+            query = new Query();
+            query.addParameter("query", queryString);
+            query.addParameter("start", start);
+            query.addParameter("count", maxResult);
+        }
+
+        private SearchByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            String queryString = query.getParameterAsClass("query", String.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            if (StringUtils.isNotBlank(apiKey)) {
+                Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+                Map<String, String> requestParams = getRequestParameters(queryString, viewMode, start, count);
+                params.put(URI_PARAMETERS, requestParams);
+                String response = liveImportClient.executeHttpGetRequest(timeout, url, params);
+                List<Element> elements = splitToRecords(response);
+                for (Element record : elements) {
+                    results.add(transformSourceRecords(record));
+                }
+            }
+            return results;
+        }
+    }
+
+    private Map<String, String> getRequestParameters(String query, String viewMode, Integer start, Integer count) {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("httpAccept", "application/xml");
+        params.put("apiKey", apiKey);
+        params.put("query", query);
+
+        if (StringUtils.isNotBlank(instKey)) {
+            params.put("insttoken", instKey);
+        }
+        if (StringUtils.isNotBlank(viewMode)) {
+            params.put("view", viewMode);
+        }
+
+        params.put("start", (Objects.nonNull(start) ? start + "" : "0"));
+        params.put("count", (Objects.nonNull(count) ? count + "" : "20"));
+        return params;
+    }
+
+    private List<Element> splitToRecords(String recordsSrc) {
+        try {
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(recordsSrc));
+            Element root = document.getRootElement();
+            List<Element> records = root.getChildren("entry",Namespace.getNamespace("http://www.w3.org/2005/Atom"));
+            return records;
+        } catch (JDOMException | IOException e) {
+            return new ArrayList<Element>();
+        }
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getViewMode() {
+        return viewMode;
+    }
+
+    public void setViewMode(String viewMode) {
+        this.viewMode = viewMode;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public String getInstKey() {
+        return instKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public void setInstKey(String instKey) {
+        this.instKey = instKey;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/service/DoiCheck.java b/dspace-api/src/main/java/org/dspace/importer/external/service/DoiCheck.java
new file mode 100644
index 0000000000..95d42e3a27
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/service/DoiCheck.java
@@ -0,0 +1,47 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Utility class that provides methods to check if a given string is a DOI
+ *
+ * @author Corrado Lombardi (corrado.lombardi at 4science.it)
+ */
+public class DoiCheck {
+
+    private static final List<String> DOI_PREFIXES = Arrays.asList("http://dx.doi.org/", "https://dx.doi.org/");
+
+    private static final Pattern PATTERN = Pattern.compile("10.\\d{4,9}/[-._;()/:A-Z0-9]+" +
+                                                               "|10.1002/[^\\s]+" +
+                                                               "|10.\\d{4}/\\d+-\\d+X?(\\d+)" +
+                                                               "\\d+<[\\d\\w]+:[\\d\\w]*>\\d+.\\d+.\\w+;\\d" +
+                                                               "|10.1021/\\w\\w\\d++" +
+                                                               "|10.1207/[\\w\\d]+\\&\\d+_\\d+",
+                                                           Pattern.CASE_INSENSITIVE);
+
+    private DoiCheck() {}
+
+    public static boolean isDoi(final String value) {
+        Matcher m = PATTERN.matcher(purgeDoiValue(value));
+        return m.matches();
+    }
+
+    public static String purgeDoiValue(final String query) {
+        String value = query.replaceAll(",", "");
+        for (final String prefix : DOI_PREFIXES) {
+            value = value.replaceAll(prefix, "");
+        }
+        return value.trim();
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractPlainMetadataSource.java b/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractPlainMetadataSource.java
index 019cf33177..5d83b9a7cc 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractPlainMetadataSource.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractPlainMetadataSource.java
@@ -42,7 +42,7 @@ public abstract class AbstractPlainMetadataSource
     /**
      * Set the file extensions supported by this metadata service
      * 
-     * @param supportedExtensionsthe file extensions (xml,txt,...) supported by this service
+     * @param supportedExtensions the file extensions (xml,txt,...) supported by this service
      */
     public void setSupportedExtensions(List<String> supportedExtensions) {
         this.supportedExtensions = supportedExtensions;
@@ -57,7 +57,7 @@ public abstract class AbstractPlainMetadataSource
      * Return a list of ImportRecord constructed from input file. This list is based on
      * the results retrieved from the file (InputStream) parsed through abstract method readData
      *
-     * @param InputStream The inputStream of the file
+     * @param is The inputStream of the file
      * @return A list of {@link ImportRecord}
      * @throws FileSourceException if, for any reason, the file is not parsable
      */
@@ -76,7 +76,7 @@ public abstract class AbstractPlainMetadataSource
      * the result retrieved from the file (InputStream) parsed through abstract method
      * "readData" implementation
      *
-     * @param InputStream The inputStream of the file
+     * @param is The inputStream of the file
      * @return An {@link ImportRecord} matching the file content
      * @throws FileSourceException if, for any reason, the file is not parsable
      * @throws FileMultipleOccurencesException if the file contains more than one entry
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/service/components/FileSource.java b/dspace-api/src/main/java/org/dspace/importer/external/service/components/FileSource.java
index 5bef0984df..13c81d1516 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/service/components/FileSource.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/service/components/FileSource.java
@@ -30,7 +30,7 @@ public interface FileSource extends MetadataSource {
     /**
      * Return a list of ImportRecord constructed from input file.
      *
-     * @param InputStream The inputStream of the file
+     * @param inputStream The inputStream of the file
      * @return A list of {@link ImportRecord}
      * @throws FileSourceException if, for any reason, the file is not parsable
      */
@@ -40,7 +40,7 @@ public interface FileSource extends MetadataSource {
     /**
      * Return an ImportRecord constructed from input file.
      *
-     * @param InputStream The inputStream of the file
+     * @param inputStream The inputStream of the file
      * @return An {@link ImportRecord} matching the file content
      * @throws FileSourceException if, for any reason, the file is not parsable
      * @throws FileMultipleOccurencesException if the file contains more than one entry
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/vufind/VuFindImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/vufind/VuFindImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..a4f90fa5ba
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/vufind/VuFindImportMetadataSourceServiceImpl.java
@@ -0,0 +1,339 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.vufind;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import javax.el.MethodNotFoundException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying VuFind
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class VuFindImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<String>
+        implements QuerySource {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private String url;
+    private String urlSearch;
+
+    private String fields;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    public VuFindImportMetadataSourceServiceImpl(String fields) {
+        this.fields = fields;
+    }
+
+    @Override
+    public String getImportSource() {
+        return "VuFind";
+    }
+
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        String records = retry(new GetByVuFindIdCallable(id, fields));
+        List<ImportRecord> importRecords = extractMetadataFromRecordList(records);
+        return importRecords != null && !importRecords.isEmpty() ? importRecords.get(0) : null;
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        String records = retry(new SearchByQueryCallable(query, count, start, fields));
+        return extractMetadataFromRecordList(records);
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        String records = retry(new SearchByQueryCallable(query, fields));
+        return extractMetadataFromRecordList(records);
+    }
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        String records = retry(new SearchByQueryCallable(query, fields));
+        List<ImportRecord> importRecords = extractMetadataFromRecordList(records);
+        return importRecords != null && !importRecords.isEmpty() ? importRecords.get(0) : null;
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        String records = retry(new FindMatchingRecordsCallable(query));
+        return extractMetadataFromRecordList(records);
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for VuFind");
+    }
+
+    @Override
+    public void init() throws Exception {}
+
+    /**
+     * This class is a Callable implementation to count the number of entries for an VuFind query.
+     * This Callable use as query value to CrossRef the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, the value of the Query's
+     * map with the key "query" will be used.
+     *
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class CountByQueryCallable implements Callable<Integer> {
+
+        private Query query;
+
+        public CountByQueryCallable(String queryString) {
+            query = new Query();
+            query.addParameter("query", queryString);
+        }
+
+        public CountByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            Integer start = 0;
+            Integer count = 1;
+            int page = start / count + 1;
+            URIBuilder uriBuilder = new URIBuilder(urlSearch);
+            uriBuilder.addParameter("type", "AllField");
+            uriBuilder.addParameter("page", String.valueOf(page));
+            uriBuilder.addParameter("limit", count.toString());
+            uriBuilder.addParameter("prettyPrint", String.valueOf(true));
+            uriBuilder.addParameter("lookfor", query.getParameterAsClass("query", String.class));
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String responseString = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            JsonNode node = convertStringJsonToJsonNode(responseString);
+            JsonNode resultCountNode = node.get("resultCount");
+            return resultCountNode.intValue();
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get an VuFind entry using VuFind id
+     * The id to use can be passed through the constructor as a String or as Query's map entry, with the key "id".
+     *
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class GetByVuFindIdCallable implements Callable<String> {
+
+        private String id;
+
+        private String fields;
+
+        public GetByVuFindIdCallable(String id, String fields) {
+            this.id = id;
+            if (fields != null && fields.length() > 0) {
+                this.fields = fields;
+            } else {
+                this.fields = null;
+            }
+        }
+
+        @Override
+        public String call() throws Exception {
+            URIBuilder uriBuilder = new URIBuilder(url);
+            uriBuilder.addParameter("id", id);
+            uriBuilder.addParameter("prettyPrint", "false");
+            if (StringUtils.isNotBlank(fields)) {
+                for (String field : fields.split(",")) {
+                    uriBuilder.addParameter("field[]", field);
+                }
+            }
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            String response = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+            return response;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get VuFind entries based on query object.
+     * This Callable use as query value the string queryString passed to constructor.
+     * If the object will be construct through Query.class instance, a Query's map entry with key "query" will be used.
+     * Pagination is supported too, using the value of the Query's map with keys "start" and "count".
+     *
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<String> {
+
+        private Query query;
+
+        private String fields;
+
+        public SearchByQueryCallable(String queryString, Integer maxResult, Integer start, String fields) {
+            query = new Query();
+            query.addParameter("query", queryString);
+            query.addParameter("count", maxResult);
+            query.addParameter("start", start);
+            if (StringUtils.isNotBlank(fields)) {
+                this.fields = fields;
+            } else {
+                this.fields = null;
+            }
+        }
+
+        public SearchByQueryCallable(Query query, String fields) {
+            this.query = query;
+            if (StringUtils.isNotBlank(fields)) {
+                this.fields = fields;
+            } else {
+                this.fields = null;
+            }
+        }
+
+        @Override
+        public String call() throws Exception {
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            int page = count != 0 ? start / count : 0;
+            URIBuilder uriBuilder = new URIBuilder(urlSearch);
+            uriBuilder.addParameter("type", "AllField");
+            //page looks 1 based (start = 0, count = 20 -> page = 0)
+            uriBuilder.addParameter("page", String.valueOf(page + 1));
+            uriBuilder.addParameter("limit", count.toString());
+            uriBuilder.addParameter("prettyPrint", String.valueOf(true));
+            uriBuilder.addParameter("lookfor", query.getParameterAsClass("query", String.class));
+            if (StringUtils.isNotBlank(fields)) {
+                for (String field : fields.split(",")) {
+                    uriBuilder.addParameter("field[]", field);
+                }
+            }
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            return liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+        }
+
+    }
+
+    /**
+     * This class is a Callable implementation to search VuFind entries using author and title.
+     *
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    public class FindMatchingRecordsCallable implements Callable<String> {
+
+        private Query query;
+
+        private String fields;
+
+        public FindMatchingRecordsCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public String call() throws Exception {
+            String author = query.getParameterAsClass("author", String.class);
+            String title = query.getParameterAsClass("title", String.class);
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            int page = count != 0 ? start / count : 0;
+            URIBuilder uriBuilder = new URIBuilder(url);
+            uriBuilder.addParameter("type", "AllField");
+            //pagination is 1 based (first page: start = 0, count = 20 -> page = 0 -> +1 = 1)
+            uriBuilder.addParameter("page", String.valueOf(page ++));
+            uriBuilder.addParameter("limit", count.toString());
+            uriBuilder.addParameter("prettyPrint", "true");
+            if (fields != null && !fields.isEmpty()) {
+                for (String field : fields.split(",")) {
+                    uriBuilder.addParameter("field[]", field);
+                }
+            }
+            String filter = StringUtils.EMPTY;
+            if (StringUtils.isNotBlank(author)) {
+                filter = "author:" + author;
+            }
+            if (StringUtils.isNotBlank(title)) {
+                if (StringUtils.isNotBlank(filter)) {
+                    filter = filter + " AND title:" + title;
+                } else {
+                    filter = "title:" + title;
+                }
+            }
+            uriBuilder.addParameter("lookfor", filter);
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+            return liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
+        }
+
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode body = null;
+        try {
+            body = mapper.readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return body;
+    }
+
+    private List<ImportRecord> extractMetadataFromRecordList(String records) {
+        List<ImportRecord> recordsResult = new ArrayList<>();
+        JsonNode jsonNode = convertStringJsonToJsonNode(records);
+        JsonNode node = jsonNode.get("records");
+        if (Objects.nonNull(node) && node.isArray()) {
+            Iterator<JsonNode> nodes = node.iterator();
+            while (nodes.hasNext()) {
+                recordsResult.add(transformSourceRecords(nodes.next().toString()));
+            }
+        }
+        return recordsResult;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUrlSearch() {
+        return urlSearch;
+    }
+
+    public void setUrlSearch(String urlSearch) {
+        this.urlSearch = urlSearch;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/vufind/metadatamapping/VuFindFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/vufind/metadatamapping/VuFindFieldMapping.java
new file mode 100644
index 0000000000..b14927a14c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/vufind/metadatamapping/VuFindFieldMapping.java
@@ -0,0 +1,39 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.vufind.metadatamapping;
+
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the VuFind metadatum fields on the DSpace metadatum fields
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+@SuppressWarnings("rawtypes")
+public class VuFindFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    @Resource(name = "vufindMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSFieldMapping.java
new file mode 100644
index 0000000000..be4acfbcea
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSFieldMapping.java
@@ -0,0 +1,37 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.wos.service;
+import java.util.Map;
+import javax.annotation.Resource;
+
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the Web of Science metadatum fields on the DSpace metadatum fields
+ *
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4science dot it)
+ */
+@SuppressWarnings("rawtypes")
+public class WOSFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve
+     *                         metadata and metadata that will be set to the item.
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    @Resource(name = "wosMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..2ccdc12b8d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSImportMetadataSourceServiceImpl.java
@@ -0,0 +1,329 @@
+/**
+ * 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/
+ */
+package org.dspace.importer.external.wos.service;
+
+import static org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl.HEADER_PARAMETERS;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.DoiCheck;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying Web of Science.
+ * 
+ * @author Boychuk Mykhaylo (boychuk.mykhaylo at 4Science dot it)
+ */
+public class WOSImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Element>
+        implements QuerySource {
+
+    private final static Logger log = LogManager.getLogger();
+
+    private static final String AI_PATTERN  = "^AI=(.*)";
+    private static final Pattern ISI_PATTERN = Pattern.compile("^\\d{15}$");
+
+    private int timeout = 1000;
+
+    private String url;
+    private String urlSearch;
+    private String apiKey;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Override
+    public void init() throws Exception {}
+
+    /**
+     * The string that identifies this import implementation. Preferable a URI
+     *
+     * @return the identifying uri
+     */
+    @Override
+    public String getImportSource() {
+        return "wos";
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query, count, start));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query));
+    }
+
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByQueryCallable(query));
+        return records == null || records.isEmpty() ? null : records.get(0);
+    }
+
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new FindByIdCallable(id));
+        return records == null || records.isEmpty() ? null : records.get(0);
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        return retry(new SearchNBByQueryCallable(query));
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for WOS");
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for WOS");
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for WOS");
+    }
+
+    /**
+     * This class implements a callable to get the numbers of result
+     */
+    private class SearchNBByQueryCallable implements Callable<Integer> {
+
+        private String query;
+
+        private SearchNBByQueryCallable(String queryString) {
+            this.query = queryString;
+        }
+
+        private SearchNBByQueryCallable(Query query) {
+            this.query = query.getParameterAsClass("query", String.class);
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            if (StringUtils.isNotBlank(apiKey)) {
+                String queryString = URLEncoder.encode(checkQuery(query), StandardCharsets.UTF_8);
+                String url = urlSearch + queryString + "&count=1&firstRecord=1";
+                Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+                params.put(HEADER_PARAMETERS, getRequestParameters());
+                String response = liveImportClient.executeHttpGetRequest(timeout, url, params);
+
+                SAXBuilder saxBuilder = new SAXBuilder();
+                Document document = saxBuilder.build(new StringReader(response));
+                Element root = document.getRootElement();
+                XPathExpression<Element> xpath = XPathFactory.instance().compile("//*[@name=\"RecordsFound\"]",
+                                                 Filters.element(), null);
+                Element tot = xpath.evaluateFirst(root);
+                return Integer.valueOf(tot.getValue());
+            }
+            return null;
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get a Web of Science entry using Doi
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class FindByIdCallable implements Callable<List<ImportRecord>> {
+
+        private String doi;
+
+        private FindByIdCallable(String doi) {
+            this.doi = URLEncoder.encode(doi, StandardCharsets.UTF_8);
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            if (StringUtils.isNotBlank(apiKey)) {
+                String urlString = url + this.doi + "?databaseId=WOS&lang=en&count=10&firstRecord=1";
+                Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+                params.put(HEADER_PARAMETERS, getRequestParameters());
+                String response = liveImportClient.executeHttpGetRequest(timeout, urlString, params);
+
+                List<Element> elements = splitToRecords(response);
+                for (Element record : elements) {
+                    results.add(transformSourceRecords(record));
+                }
+            }
+            return results;
+        }
+    }
+
+    /**
+     * Find records matching a string query.
+     *
+     * @param query    A query string to base the search on.
+     * @param start    Offset to start at
+     * @param count    Number of records to retrieve.
+     * @return         A set of records. Fully transformed.
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private SearchByQueryCallable(String queryString, Integer maxResult, Integer start) {
+            query = new Query();
+            query.addParameter("query", queryString);
+            query.addParameter("start", start);
+            query.addParameter("count", maxResult);
+        }
+
+        private SearchByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            List<ImportRecord> results = new ArrayList<>();
+            String queryString = checkQuery(query.getParameterAsClass("query", String.class));
+            Integer start = query.getParameterAsClass("start", Integer.class);
+            Integer count = query.getParameterAsClass("count", Integer.class);
+            if (StringUtils.isNotBlank(apiKey)) {
+                Map<String, Map<String, String>> params = new HashMap<String, Map<String,String>>();
+                params.put(HEADER_PARAMETERS, getRequestParameters());
+                String url = urlSearch + URLEncoder.encode(queryString, StandardCharsets.UTF_8)
+                                                 + "&count=" + count + "&firstRecord=" + (start + 1);
+                String response = liveImportClient.executeHttpGetRequest(timeout, url, params);
+
+                List<Element> omElements = splitToRecords(response);
+                for (Element el : omElements) {
+                    results.add(transformSourceRecords(el));
+                }
+            }
+            return results;
+        }
+
+    }
+
+    private Map<String, String> getRequestParameters() {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("Accept", "application/xml");
+        params.put("X-ApiKey", this.apiKey);
+        return params;
+    }
+
+    /**
+     * This method check if the query contain
+     * "AI=(...)" Author Identifier or a DOI "DO=(query)"
+     * or Accession Number "UT=(query)".
+     * Otherwise the value is placed in TS=(query) tag
+     * that searches for topic terms in the following fields within a document:
+     * Title, Abstract, Author keywords, Keywords Plus
+     * 
+     * @param query
+     */
+    private String checkQuery(String query) {
+        Pattern risPattern = Pattern.compile(AI_PATTERN);
+        Matcher risMatcher = risPattern.matcher(query.trim());
+        if (risMatcher.matches()) {
+            return query;
+        }
+        if (DoiCheck.isDoi(query)) {
+            // FIXME: workaround to be removed once fixed by the community the double post of query param
+            if (query.startsWith(",")) {
+                query = query.substring(1);
+            }
+            return "DO=(" + query + ")";
+        } else if (isIsi(query)) {
+            return "UT=(" + query + ")";
+        }
+        StringBuilder queryBuilder =  new StringBuilder("TS=(");
+        queryBuilder.append(query).append(")");
+        return queryBuilder.toString();
+    }
+
+    private boolean isIsi(String query) {
+        if (query.startsWith("WOS:")) {
+            return true;
+        }
+        Matcher matcher = ISI_PATTERN.matcher(query.trim());
+        return matcher.matches();
+    }
+
+    private List<Element> splitToRecords(String recordsSrc) {
+        try {
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(recordsSrc));
+            Element root = document.getRootElement();
+            String cData = XPathFactory.instance().compile("//*[@name=\"Records\"]",
+                           Filters.element(), null).evaluate(root).get(0).getValue().trim();
+            Document intDocument = saxBuilder.build(new StringReader(cData));
+            XPathExpression<Element> xPath = XPathFactory.instance().compile("*", Filters.element(), null);
+            List<Element> records = xPath.evaluate(intDocument.getRootElement());
+            if (CollectionUtils.isNotEmpty(records)) {
+                return records;
+            }
+        } catch (JDOMException | IOException e) {
+            log.error(e.getMessage());
+            return new ArrayList<Element>();
+        }
+        return new ArrayList<Element>();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUrlSearch() {
+        return urlSearch;
+    }
+
+    public void setUrlSearch(String urlSearch) {
+        this.urlSearch = urlSearch;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/license/CCLicenseConnectorService.java b/dspace-api/src/main/java/org/dspace/license/CCLicenseConnectorService.java
index 0c061d2d64..64450b796c 100644
--- a/dspace-api/src/main/java/org/dspace/license/CCLicenseConnectorService.java
+++ b/dspace-api/src/main/java/org/dspace/license/CCLicenseConnectorService.java
@@ -10,7 +10,7 @@ package org.dspace.license;
 import java.io.IOException;
 import java.util.Map;
 
-import org.jdom.Document;
+import org.jdom2.Document;
 
 /**
  * Service interface class for the Creative commons license connector service.
diff --git a/dspace-api/src/main/java/org/dspace/license/CCLicenseConnectorServiceImpl.java b/dspace-api/src/main/java/org/dspace/license/CCLicenseConnectorServiceImpl.java
index 792c25d629..cdecadba52 100644
--- a/dspace-api/src/main/java/org/dspace/license/CCLicenseConnectorServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/license/CCLicenseConnectorServiceImpl.java
@@ -32,13 +32,14 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.services.ConfigurationService;
-import org.jaxen.JaxenException;
-import org.jaxen.jdom.JDOMXPath;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.xml.sax.InputSource;
@@ -96,7 +97,7 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
         List<String> licenses;
         try (CloseableHttpResponse response = client.execute(httpGet)) {
             licenses = retrieveLicenses(response);
-        } catch (JDOMException | JaxenException | IOException e) {
+        } catch (JDOMException | IOException e) {
             log.error("Error while retrieving the license details using url: " + uri, e);
             licenses = Collections.emptyList();
         }
@@ -105,12 +106,12 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
 
         for (String license : licenses) {
 
-            String licenseUri = ccLicenseUrl + "/license/" + license;
+            String licenseUri = ccLicenseUrl + "/license/" + license + "?locale=" + language;
             HttpGet licenseHttpGet = new HttpGet(licenseUri);
             try (CloseableHttpResponse response = client.execute(licenseHttpGet)) {
                 CCLicense ccLicense = retrieveLicenseObject(license, response);
                 ccLicenses.put(ccLicense.getLicenseId(), ccLicense);
-            } catch (JaxenException | JDOMException | IOException e) {
+            } catch (JDOMException | IOException e) {
                 log.error("Error while retrieving the license details using url: " + licenseUri, e);
             }
         }
@@ -125,25 +126,23 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
      * @param response The response from the API
      * @return a list of license identifiers for which details need to be retrieved
      * @throws IOException
-     * @throws JaxenException
      * @throws JDOMException
      */
     private List<String> retrieveLicenses(CloseableHttpResponse response)
-            throws IOException, JaxenException, JDOMException {
+            throws IOException, JDOMException {
 
         List<String> domains = new LinkedList<>();
         String[] excludedLicenses = configurationService.getArrayProperty("cc.license.classfilter");
 
-
         String responseString = EntityUtils.toString(response.getEntity());
-        JDOMXPath licenseClassXpath = new JDOMXPath("//licenses/license");
-
+        XPathExpression<Element> licenseClassXpath =
+            XPathFactory.instance().compile("//licenses/license", Filters.element());
 
         try (StringReader stringReader = new StringReader(responseString)) {
             InputSource is = new InputSource(stringReader);
-            org.jdom.Document classDoc = this.parser.build(is);
+            org.jdom2.Document classDoc = this.parser.build(is);
 
-            List<Element> elements = licenseClassXpath.selectNodes(classDoc);
+            List<Element> elements = licenseClassXpath.evaluate(classDoc);
             for (Element element : elements) {
                 String licenseId = getSingleNodeValue(element, "@id");
                 if (StringUtils.isNotBlank(licenseId) && !ArrayUtils.contains(excludedLicenses, licenseId)) {
@@ -163,30 +162,29 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
      * @param response  for a specific CC License response
      * @return the corresponding CC License Object
      * @throws IOException
-     * @throws JaxenException
      * @throws JDOMException
      */
     private CCLicense retrieveLicenseObject(final String licenseId, CloseableHttpResponse response)
-            throws IOException, JaxenException, JDOMException {
+            throws IOException, JDOMException {
 
         String responseString = EntityUtils.toString(response.getEntity());
 
-
-        JDOMXPath licenseClassXpath = new JDOMXPath("//licenseclass");
-        JDOMXPath licenseFieldXpath = new JDOMXPath("field");
-
+        XPathExpression<Object> licenseClassXpath =
+            XPathFactory.instance().compile("//licenseclass", Filters.fpassthrough());
+        XPathExpression<Element> licenseFieldXpath =
+            XPathFactory.instance().compile("field", Filters.element());
 
         try (StringReader stringReader = new StringReader(responseString)) {
             InputSource is = new InputSource(stringReader);
 
-            org.jdom.Document classDoc = this.parser.build(is);
+            org.jdom2.Document classDoc = this.parser.build(is);
 
-            Object element = licenseClassXpath.selectSingleNode(classDoc);
+            Object element = licenseClassXpath.evaluateFirst(classDoc);
             String licenseLabel = getSingleNodeValue(element, "label");
 
             List<CCLicenseField> ccLicenseFields = new LinkedList<>();
 
-            List<Element> licenseFields = licenseFieldXpath.selectNodes(element);
+            List<Element> licenseFields = licenseFieldXpath.evaluate(element);
             for (Element licenseField : licenseFields) {
                 CCLicenseField ccLicenseField = parseLicenseField(licenseField);
                 ccLicenseFields.add(ccLicenseField);
@@ -196,13 +194,14 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
         }
     }
 
-    private CCLicenseField parseLicenseField(final Element licenseField) throws JaxenException {
+    private CCLicenseField parseLicenseField(final Element licenseField) {
         String id = getSingleNodeValue(licenseField, "@id");
         String label = getSingleNodeValue(licenseField, "label");
         String description = getSingleNodeValue(licenseField, "description");
 
-        JDOMXPath enumXpath = new JDOMXPath("enum");
-        List<Element> enums = enumXpath.selectNodes(licenseField);
+        XPathExpression<Element> enumXpath =
+            XPathFactory.instance().compile("enum", Filters.element());
+        List<Element> enums = enumXpath.evaluate(licenseField);
 
         List<CCLicenseFieldEnum> ccLicenseFieldEnumList = new LinkedList<>();
 
@@ -215,7 +214,7 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
 
     }
 
-    private CCLicenseFieldEnum parseEnum(final Element enumElement) throws JaxenException {
+    private CCLicenseFieldEnum parseEnum(final Element enumElement) {
         String id = getSingleNodeValue(enumElement, "@id");
         String label = getSingleNodeValue(enumElement, "label");
         String description = getSingleNodeValue(enumElement, "description");
@@ -236,9 +235,10 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
         }
     }
 
-    private String getSingleNodeValue(final Object t, String query) throws JaxenException {
-        JDOMXPath xpath = new JDOMXPath(query);
-        Object singleNode = xpath.selectSingleNode(t);
+    private String getSingleNodeValue(final Object t, String query) {
+        XPathExpression xpath =
+            XPathFactory.instance().compile(query, Filters.fpassthrough());
+        Object singleNode = xpath.evaluateFirst(t);
 
         return getNodeValue(singleNode);
     }
@@ -273,7 +273,7 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
 
         try (CloseableHttpResponse response = client.execute(httpPost)) {
             return retrieveLicenseUri(response);
-        } catch (JDOMException | JaxenException | IOException e) {
+        } catch (JDOMException | IOException e) {
             log.error("Error while retrieving the license uri for license : " + licenseId + " with answers "
                               + answerMap.toString(), e);
         }
@@ -286,21 +286,20 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
      * @param response for a specific CC License URI response
      * @return the corresponding CC License URI as a string
      * @throws IOException
-     * @throws JaxenException
      * @throws JDOMException
      */
     private String retrieveLicenseUri(final CloseableHttpResponse response)
-            throws IOException, JaxenException, JDOMException {
+            throws IOException, JDOMException {
 
         String responseString = EntityUtils.toString(response.getEntity());
-        JDOMXPath licenseClassXpath = new JDOMXPath("//result/license-uri");
-
+        XPathExpression<Object> licenseClassXpath =
+            XPathFactory.instance().compile("//result/license-uri", Filters.fpassthrough());
 
         try (StringReader stringReader = new StringReader(responseString)) {
             InputSource is = new InputSource(stringReader);
-            org.jdom.Document classDoc = this.parser.build(is);
+            org.jdom2.Document classDoc = this.parser.build(is);
 
-            Object node = licenseClassXpath.selectSingleNode(classDoc);
+            Object node = licenseClassXpath.evaluateFirst(classDoc);
             String nodeValue = getNodeValue(node);
 
             if (StringUtils.isNotBlank(nodeValue)) {
@@ -364,12 +363,7 @@ public class CCLicenseConnectorServiceImpl implements CCLicenseConnectorService,
      * @return the license name
      */
     public String retrieveLicenseName(final Document doc) {
-        try {
-            return getSingleNodeValue(doc, "//result/license-name");
-        } catch (JaxenException e) {
-            log.error("Error while retrieving the license name from the license document", e);
-        }
-        return null;
+        return getSingleNodeValue(doc, "//result/license-name");
     }
 
 }
diff --git a/dspace-api/src/main/java/org/dspace/license/CreativeCommonsServiceImpl.java b/dspace-api/src/main/java/org/dspace/license/CreativeCommonsServiceImpl.java
index ccc660b63b..c9c8127d18 100644
--- a/dspace-api/src/main/java/org/dspace/license/CreativeCommonsServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/license/CreativeCommonsServiceImpl.java
@@ -40,8 +40,8 @@ import org.dspace.core.Utils;
 import org.dspace.license.service.CreativeCommonsService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Document;
-import org.jdom.transform.JDOMSource;
+import org.jdom2.Document;
+import org.jdom2.transform.JDOMSource;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -430,9 +430,10 @@ public class CreativeCommonsServiceImpl implements CreativeCommonsService, Initi
 
     }
 
-    private void addLicenseField(Context context, Item item, String field, String value) throws SQLException {
+    private void addLicenseField(Context context, Item item, String field, String language, String value)
+        throws SQLException {
         String[] params = splitField(field);
-        itemService.addMetadata(context, item, params[0], params[1], params[2], params[3], value);
+        itemService.addMetadata(context, item, params[0], params[1], params[2], language, value);
 
     }
 
@@ -605,7 +606,10 @@ public class CreativeCommonsServiceImpl implements CreativeCommonsService, Initi
             }
         }
 
-        updateJurisdiction(fullParamMap);
+        // Replace the jurisdiction unless default value is set to none
+        if (!"none".equals(jurisdiction)) {
+            updateJurisdiction(fullParamMap);
+        }
 
         return fullParamMap;
     }
@@ -688,12 +692,12 @@ public class CreativeCommonsServiceImpl implements CreativeCommonsService, Initi
         String uriField = getCCField("uri");
         String nameField = getCCField("name");
 
-        addLicenseField(context, item, uriField, licenseUri);
+        addLicenseField(context, item, uriField, null, licenseUri);
         if (configurationService.getBooleanProperty("cc.submit.addbitstream")) {
             setLicenseRDF(context, item, fetchLicenseRDF(doc));
         }
         if (configurationService.getBooleanProperty("cc.submit.setname")) {
-            addLicenseField(context, item, nameField, licenseName);
+            addLicenseField(context, item, nameField, "en", licenseName);
         }
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/license/service/CreativeCommonsService.java b/dspace-api/src/main/java/org/dspace/license/service/CreativeCommonsService.java
index 1f5f1ddd02..0f4911aa3e 100644
--- a/dspace-api/src/main/java/org/dspace/license/service/CreativeCommonsService.java
+++ b/dspace-api/src/main/java/org/dspace/license/service/CreativeCommonsService.java
@@ -18,7 +18,7 @@ import org.dspace.content.Bitstream;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.license.CCLicense;
-import org.jdom.Document;
+import org.jdom2.Document;
 
 /**
  * Service interface class for the Creative commons licensing.
diff --git a/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
new file mode 100644
index 0000000000..33edea112e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
@@ -0,0 +1,211 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid;
+
+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 javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.dspace.content.Item;
+import org.dspace.core.ReloadableEntity;
+import org.hibernate.annotations.Type;
+
+/**
+ * The ORCID history entity that it contains information relating to an attempt
+ * to synchronize the DSpace items and information on ORCID. While the entity
+ * {@link OrcidQueue} contains the data to be synchronized with ORCID, this
+ * entity instead contains the data synchronized with ORCID, with the result of
+ * the synchronization. Each record in this table is associated with a profile
+ * item and the entity synchronized (which can be the profile itself, a
+ * publication or a project/funding). If the entity is the profile itself then
+ * the metadata field contains the signature of the information synchronized.
+ * 
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Entity
+@Table(name = "orcid_history")
+public class OrcidHistory implements ReloadableEntity<Integer> {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "orcid_history_id_seq")
+    @SequenceGenerator(name = "orcid_history_id_seq", sequenceName = "orcid_history_id_seq", allocationSize = 1)
+    private Integer id;
+
+    /**
+     * The profile item.
+     */
+    @ManyToOne
+    @JoinColumn(name = "owner_id")
+    protected Item profileItem;
+
+    /**
+     * The synchronized item.
+     */
+    @ManyToOne
+    @JoinColumn(name = "entity_id")
+    private Item entity;
+
+    /**
+     * The identifier of the synchronized resource on ORCID side. For more details
+     * see https://info.orcid.org/faq/what-is-a-put-code/
+     */
+    @Column(name = "put_code")
+    private String putCode;
+
+    /**
+     * The record type. Could be publication, funding or a profile's section.
+     */
+    @Column(name = "record_type")
+    private String recordType;
+
+    /**
+     * A description of the synchronized resource.
+     */
+    @Column(name = "description")
+    private String description;
+
+    /**
+     * The signature of the synchronized metadata. This is used when the entity is
+     * the owner itself.
+     */
+    @Lob
+    @Type(type = "org.dspace.storage.rdbms.hibernate.DatabaseAwareLobType")
+    @Column(name = "metadata")
+    private String metadata;
+
+    /**
+     * The operation performed on ORCID.
+     */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "operation")
+    private OrcidOperation operation;
+
+    /**
+     * The response message incoming from ORCID.
+     */
+    @Lob
+    @Type(type = "org.dspace.storage.rdbms.hibernate.DatabaseAwareLobType")
+    @Column(name = "response_message")
+    private String responseMessage;
+
+    /**
+     * The timestamp of the synchronization attempt.
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "timestamp_last_attempt")
+    private Date timestamp = new Date();
+
+    /**
+     * The HTTP status incoming from ORCID.
+     */
+    @Column(name = "status")
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    @Override
+    public Integer getID() {
+        return id;
+    }
+
+    public Item getProfileItem() {
+        return profileItem;
+    }
+
+    public void setProfileItem(Item profileItem) {
+        this.profileItem = profileItem;
+    }
+
+    public Item getEntity() {
+        return entity;
+    }
+
+    public void setEntity(Item entity) {
+        this.entity = entity;
+    }
+
+    public String getPutCode() {
+        return putCode;
+    }
+
+    public void setPutCode(String putCode) {
+        this.putCode = putCode;
+    }
+
+    public String getResponseMessage() {
+        return responseMessage;
+    }
+
+    public void setResponseMessage(String responseMessage) {
+        this.responseMessage = responseMessage;
+    }
+
+    public String getRecordType() {
+        return recordType;
+    }
+
+    public void setRecordType(String recordType) {
+        this.recordType = recordType;
+    }
+
+    public String getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(String metadata) {
+        this.metadata = metadata;
+    }
+
+    public OrcidOperation getOperation() {
+        return operation;
+    }
+
+    public void setOperation(OrcidOperation operation) {
+        this.operation = operation;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Date getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Date timestamp) {
+        this.timestamp = timestamp;
+    }
+
+}
diff --git a/dspace-services/src/main/java/org/dspace/services/caching/package-info.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidOperation.java
similarity index 51%
rename from dspace-services/src/main/java/org/dspace/services/caching/package-info.java
rename to dspace-api/src/main/java/org/dspace/orcid/OrcidOperation.java
index a73e0d3eaa..381e35e84d 100644
--- a/dspace-services/src/main/java/org/dspace/services/caching/package-info.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidOperation.java
@@ -5,9 +5,16 @@
  *
  * http://www.dspace.org/license/
  */
+package org.dspace.orcid;
 
 /**
- * Implementation of the core Caching service.
+ * Enum that models an ORCID synchronization operation.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
  */
-
-package org.dspace.services.caching;
+public enum OrcidOperation {
+    INSERT,
+    UPDATE,
+    DELETE;
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
new file mode 100644
index 0000000000..4794e89008
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
@@ -0,0 +1,219 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid;
+
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+import java.util.Objects;
+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 javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.dspace.content.Item;
+import org.dspace.core.ReloadableEntity;
+import org.hibernate.annotations.Type;
+
+/**
+ * Entity that model a record on the ORCID synchronization queue. Each record in
+ * this table is associated with an profile item and the entity to be
+ * synchronized (which can be the profile itself, a publication or a
+ * project/funding). If the entity is the profile itself then the metadata field
+ * contains the signature of the information to be synchronized.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Entity
+@Table(name = "orcid_queue")
+public class OrcidQueue implements ReloadableEntity<Integer> {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "orcid_queue_id_seq")
+    @SequenceGenerator(name = "orcid_queue_id_seq", sequenceName = "orcid_queue_id_seq", allocationSize = 1)
+    private Integer id;
+
+    /**
+     * The profile item.
+     */
+    @ManyToOne
+    @JoinColumn(name = "owner_id")
+    protected Item profileItem;
+
+    /**
+     * The entity to be synchronized.
+     */
+    @ManyToOne
+    @JoinColumn(name = "entity_id")
+    private Item entity;
+
+    /**
+     * A description of the resource to be synchronized.
+     */
+    @Column(name = "description")
+    private String description;
+
+    /**
+     * The identifier of the resource to be synchronized on ORCID side (in case of
+     * update or deletion). For more details see
+     * https://info.orcid.org/faq/what-is-a-put-code/
+     */
+    @Column(name = "put_code")
+    private String putCode;
+
+    /**
+     * The record type. Could be publication, funding or a profile's section.
+     */
+    @Column(name = "record_type")
+    private String recordType;
+
+    /**
+     * The signature of the metadata to be synchronized. This is used when the
+     * entity is the owner itself.
+     */
+    @Lob
+    @Column(name = "metadata")
+    @Type(type = "org.dspace.storage.rdbms.hibernate.DatabaseAwareLobType")
+    private String metadata;
+
+    /**
+     * The operation to be performed on ORCID.
+     */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "operation")
+    private OrcidOperation operation;
+
+    /**
+     * Synchronization attempts already made for a particular record.
+     */
+    @Column(name = "attempts")
+    private Integer attempts = 0;
+
+    public boolean isInsertAction() {
+        return entity != null && isEmpty(putCode);
+    }
+
+    public boolean isUpdateAction() {
+        return entity != null && isNotEmpty(putCode);
+    }
+
+    public boolean isDeleteAction() {
+        return entity == null && isNotEmpty(putCode);
+    }
+
+    public void setID(Integer id) {
+        this.id = id;
+    }
+
+    @Override
+    public Integer getID() {
+        return this.id;
+    }
+
+    public Item getProfileItem() {
+        return profileItem;
+    }
+
+    public void setProfileItem(Item profileItem) {
+        this.profileItem = profileItem;
+    }
+
+    public Item getEntity() {
+        return entity;
+    }
+
+    public void setEntity(Item entity) {
+        this.entity = entity;
+    }
+
+    public String getPutCode() {
+        return putCode;
+    }
+
+    public void setPutCode(String putCode) {
+        this.putCode = putCode;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        OrcidQueue other = (OrcidQueue) obj;
+        return Objects.equals(id, other.id);
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getRecordType() {
+        return recordType;
+    }
+
+    public void setRecordType(String recordType) {
+        this.recordType = recordType;
+    }
+
+    public String getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(String metadata) {
+        this.metadata = metadata;
+    }
+
+    public OrcidOperation getOperation() {
+        return operation;
+    }
+
+    public void setOperation(OrcidOperation operation) {
+        this.operation = operation;
+    }
+
+    public Integer getAttempts() {
+        return attempts;
+    }
+
+    public void setAttempts(Integer attempts) {
+        this.attempts = attempts;
+    }
+
+    @Override
+    public String toString() {
+        return "OrcidQueue [id=" + id + ", profileItem=" + profileItem + ", entity=" + entity + ", description="
+            + description
+            + ", putCode=" + putCode + ", recordType=" + recordType + ", metadata=" + metadata + ", operation="
+            + operation + "]";
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
new file mode 100644
index 0000000000..def289daf4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
@@ -0,0 +1,85 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.dspace.content.Item;
+import org.dspace.core.ReloadableEntity;
+import org.dspace.eperson.EPerson;
+
+/**
+ * Entity that stores ORCID access-token related to a given eperson or a given
+ * profile item.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Entity
+@Table(name = "orcid_token")
+public class OrcidToken implements ReloadableEntity<Integer> {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "orcid_token_id_seq")
+    @SequenceGenerator(name = "orcid_token_id_seq", sequenceName = "orcid_token_id_seq", allocationSize = 1)
+    private Integer id;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "eperson_id")
+    protected EPerson ePerson;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "profile_item_id")
+    private Item profileItem;
+
+    @Column(name = "access_token")
+    private String accessToken;
+
+    @Override
+    public Integer getID() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public EPerson getEPerson() {
+        return ePerson;
+    }
+
+    public void setEPerson(EPerson eperson) {
+        this.ePerson = eperson;
+    }
+
+    public Item getProfileItem() {
+        return profileItem;
+    }
+
+    public void setProfileItem(Item profileItem) {
+        this.profileItem = profileItem;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClient.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClient.java
new file mode 100644
index 0000000000..99d1920aa5
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClient.java
@@ -0,0 +1,164 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.client;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.orcid.jaxb.model.v3.release.record.Person;
+import org.orcid.jaxb.model.v3.release.record.WorkBulk;
+import org.orcid.jaxb.model.v3.release.record.summary.Works;
+
+/**
+ * Interface for classes that allow to contact ORCID.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidClient {
+
+    /**
+     * Retrieves an /read-public access token using a client-credentials OAuth flow,
+     * or 2-step OAuth.
+     *
+     * @return                      the ORCID token
+     * @throws OrcidClientException if some error occurs during the exchange
+     */
+    OrcidTokenResponseDTO getReadPublicAccessToken();
+
+    /**
+     * Exchange the authorization code for an ORCID iD and 3-legged access token.
+     * The authorization code expires upon use.
+     *
+     * @param  code                 the authorization code
+     * @return                      the ORCID token
+     * @throws OrcidClientException if some error occurs during the exchange
+     */
+    OrcidTokenResponseDTO getAccessToken(String code);
+
+    /**
+     * Retrieves a summary of the ORCID person related to the given orcid.
+     *
+     * @param  accessToken          the access token
+     * @param  orcid                the orcid id of the record to retrieve
+     * @return                      the Person
+     * @throws OrcidClientException if some error occurs during the search
+     */
+    Person getPerson(String accessToken, String orcid);
+
+    /**
+     * Retrieves all the works related to the given orcid.
+     *
+     * @param  accessToken          the access token
+     * @param  orcid                the orcid id related to the works
+     * @return                      the Works
+     * @throws OrcidClientException if some error occurs during the search
+     */
+    Works getWorks(String accessToken, String orcid);
+
+    /**
+     * Retrieves all the works related to the given orcid.
+     *
+     * @param  orcid                the orcid id related to the works
+     * @return                      the Works
+     * @throws OrcidClientException if some error occurs during the search
+     */
+    Works getWorks(String orcid);
+
+    /**
+     * Retrieves all the works with the given putCodes related to the given orcid
+     *
+     * @param  accessToken          the access token
+     * @param  orcid                the orcid id
+     * @param  putCodes             the putCodes of the works to retrieve
+     * @return                      the Works
+     * @throws OrcidClientException if some error occurs during the search
+     */
+    WorkBulk getWorkBulk(String accessToken, String orcid, List<String> putCodes);
+
+    /**
+     * Retrieves all the works with the given putCodes related to the given orcid
+     *
+     * @param  orcid                the orcid id
+     * @param  putCodes             the putCodes of the works to retrieve
+     * @return                      the Works
+     * @throws OrcidClientException if some error occurs during the search
+     */
+    WorkBulk getWorkBulk(String orcid, List<String> putCodes);
+
+    /**
+     * Retrieves an object from ORCID with the given putCode related to the given
+     * orcid.
+     *
+     * @param  accessToken              the access token
+     * @param  orcid                    the orcid id
+     * @param  putCode                  the object's put code
+     * @param  clazz                    the object's class
+     * @return                          the Object, if any
+     * @throws OrcidClientException     if some error occurs during the search
+     * @throws IllegalArgumentException if the given object class is not an valid
+     *                                  ORCID object
+     */
+    <T> Optional<T> getObject(String accessToken, String orcid, String putCode, Class<T> clazz);
+
+    /**
+     * Retrieves an object from ORCID with the given putCode related to the given
+     * orcid using the public API.
+     *
+     * @param  orcid                    the orcid id
+     * @param  putCode                  the object's put code
+     * @param  clazz                    the object's class
+     * @return                          the Object, if any
+     * @throws OrcidClientException     if some error occurs during the search
+     * @throws IllegalArgumentException if the given object class is not an valid
+     *                                  ORCID object
+     */
+    <T> Optional<T> getObject(String orcid, String putCode, Class<T> clazz);
+
+    /**
+     * Push the given object to ORCID.
+     *
+     * @param  accessToken              the access token
+     * @param  orcid                    the orcid id
+     * @param  object                   the orcid object to push
+     * @return                          the orcid response if no error occurs
+     * @throws OrcidClientException     if some error occurs during the push
+     * @throws IllegalArgumentException if the given object is not an valid ORCID
+     *                                  object
+     */
+    OrcidResponse push(String accessToken, String orcid, Object object);
+
+    /**
+     * Update the object with the given putCode.
+     *
+     * @param  accessToken              the access token
+     * @param  orcid                    the orcid id
+     * @param  object                   the orcid object to push
+     * @param  putCode                  the put code of the resource to delete
+     * @return                          the orcid response if no error occurs
+     * @throws OrcidClientException     if some error occurs during the push
+     * @throws IllegalArgumentException if the given object is not an valid ORCID
+     *                                  object
+     */
+    OrcidResponse update(String accessToken, String orcid, Object object, String putCode);
+
+    /**
+     * Delete the ORCID object with the given putCode on the given path.
+     *
+     * @param  accessToken          the access token
+     * @param  orcid                the orcid id
+     * @param  putCode              the put code of the resource to delete
+     * @param  path                 the path of the resource to delete
+     * @return                      the orcid response if no error occurs
+     * @throws OrcidClientException if some error occurs during the search
+     */
+    OrcidResponse deleteByPutCode(String accessToken, String orcid, String putCode, String path);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
new file mode 100644
index 0000000000..3e7ca7b210
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
@@ -0,0 +1,394 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.client;
+
+import static org.apache.http.client.methods.RequestBuilder.delete;
+import static org.apache.http.client.methods.RequestBuilder.get;
+import static org.apache.http.client.methods.RequestBuilder.post;
+import static org.apache.http.client.methods.RequestBuilder.put;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.util.ThrowingSupplier;
+import org.orcid.jaxb.model.v3.release.record.Address;
+import org.orcid.jaxb.model.v3.release.record.Funding;
+import org.orcid.jaxb.model.v3.release.record.Keyword;
+import org.orcid.jaxb.model.v3.release.record.OtherName;
+import org.orcid.jaxb.model.v3.release.record.Person;
+import org.orcid.jaxb.model.v3.release.record.PersonExternalIdentifier;
+import org.orcid.jaxb.model.v3.release.record.ResearcherUrl;
+import org.orcid.jaxb.model.v3.release.record.Work;
+import org.orcid.jaxb.model.v3.release.record.WorkBulk;
+import org.orcid.jaxb.model.v3.release.record.summary.Works;
+
+/**
+ * Implementation of {@link OrcidClient}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidClientImpl implements OrcidClient {
+
+    /**
+     * Mapping between ORCID JAXB models and the sub-paths on ORCID API.
+     */
+    private static final Map<Class<?>, String> PATHS_MAP = initializePathsMap();
+
+    private final OrcidConfiguration orcidConfiguration;
+
+    private final ObjectMapper objectMapper;
+
+    public OrcidClientImpl(OrcidConfiguration orcidConfiguration) {
+        this.orcidConfiguration = orcidConfiguration;
+        this.objectMapper = new ObjectMapper();
+    }
+
+    private static Map<Class<?>, String> initializePathsMap() {
+        Map<Class<?>, String> map = new HashMap<Class<?>, String>();
+        map.put(Work.class, OrcidEntityType.PUBLICATION.getPath());
+        map.put(Funding.class, OrcidEntityType.FUNDING.getPath());
+        map.put(Address.class, OrcidProfileSectionType.COUNTRY.getPath());
+        map.put(OtherName.class, OrcidProfileSectionType.OTHER_NAMES.getPath());
+        map.put(ResearcherUrl.class, OrcidProfileSectionType.RESEARCHER_URLS.getPath());
+        map.put(PersonExternalIdentifier.class, OrcidProfileSectionType.EXTERNAL_IDS.getPath());
+        map.put(Keyword.class, OrcidProfileSectionType.KEYWORDS.getPath());
+        return map;
+    }
+
+    @Override
+    public OrcidTokenResponseDTO getAccessToken(String code) {
+
+        List<NameValuePair> params = new ArrayList<NameValuePair>();
+        params.add(new BasicNameValuePair("code", code));
+        params.add(new BasicNameValuePair("grant_type", "authorization_code"));
+        params.add(new BasicNameValuePair("client_id", orcidConfiguration.getClientId()));
+        params.add(new BasicNameValuePair("client_secret", orcidConfiguration.getClientSecret()));
+
+        HttpUriRequest httpUriRequest = RequestBuilder.post(orcidConfiguration.getTokenEndpointUrl())
+            .addHeader("Content-Type", "application/x-www-form-urlencoded")
+            .addHeader("Accept", "application/json")
+            .setEntity(new UrlEncodedFormEntity(params, Charset.defaultCharset()))
+            .build();
+
+        return executeAndParseJson(httpUriRequest, OrcidTokenResponseDTO.class);
+
+    }
+
+    @Override
+    public Person getPerson(String accessToken, String orcid) {
+        HttpUriRequest httpUriRequest = buildGetUriRequest(accessToken, "/" + orcid + "/person");
+        return executeAndUnmarshall(httpUriRequest, false, Person.class);
+    }
+
+    @Override
+    public Works getWorks(String accessToken, String orcid) {
+        HttpUriRequest httpUriRequest = buildGetUriRequest(accessToken, "/" + orcid + "/works");
+        Works works = executeAndUnmarshall(httpUriRequest, true, Works.class);
+        return works != null ? works : new Works();
+    }
+
+    @Override
+    public Works getWorks(String orcid) {
+        HttpUriRequest httpUriRequest = buildGetUriRequestToPublicEndpoint("/" + orcid + "/works");
+        Works works = executeAndUnmarshall(httpUriRequest, true, Works.class);
+        return works != null ? works : new Works();
+    }
+
+    @Override
+    public WorkBulk getWorkBulk(String accessToken, String orcid, List<String> putCodes) {
+        String putCode = String.join(",", putCodes);
+        HttpUriRequest httpUriRequest = buildGetUriRequest(accessToken, "/" + orcid + "/works/" + putCode);
+        WorkBulk workBulk = executeAndUnmarshall(httpUriRequest, true, WorkBulk.class);
+        return workBulk != null ? workBulk : new WorkBulk();
+    }
+
+    @Override
+    public WorkBulk getWorkBulk(String orcid, List<String> putCodes) {
+        String putCode = String.join(",", putCodes);
+        HttpUriRequest httpUriRequest = buildGetUriRequestToPublicEndpoint("/" + orcid + "/works/" + putCode);
+        WorkBulk workBulk = executeAndUnmarshall(httpUriRequest, true, WorkBulk.class);
+        return workBulk != null ? workBulk : new WorkBulk();
+    }
+
+    @Override
+    public <T> Optional<T> getObject(String accessToken, String orcid, String putCode, Class<T> clazz) {
+        String path = getOrcidPathFromOrcidObjectType(clazz);
+        HttpUriRequest httpUriRequest = buildGetUriRequest(accessToken, "/" + orcid + path + "/" + putCode);
+        return Optional.ofNullable(executeAndUnmarshall(httpUriRequest, true, clazz));
+    }
+
+    @Override
+    public <T> Optional<T> getObject(String orcid, String putCode, Class<T> clazz) {
+        String path = getOrcidPathFromOrcidObjectType(clazz);
+        HttpUriRequest httpUriRequest = buildGetUriRequestToPublicEndpoint("/" + orcid + path + "/" + putCode);
+        return Optional.ofNullable(executeAndUnmarshall(httpUriRequest, true, clazz));
+    }
+
+    @Override
+    public OrcidResponse push(String accessToken, String orcid, Object object) {
+        String path = getOrcidPathFromOrcidObjectType(object.getClass());
+        return execute(buildPostUriRequest(accessToken, "/" + orcid + path, object), false);
+    }
+
+    @Override
+    public OrcidResponse update(String accessToken, String orcid, Object object, String putCode) {
+        String path = getOrcidPathFromOrcidObjectType(object.getClass());
+        return execute(buildPutUriRequest(accessToken, "/" + orcid + path + "/" + putCode, object), false);
+    }
+
+    @Override
+    public OrcidResponse deleteByPutCode(String accessToken, String orcid, String putCode, String path) {
+        return execute(buildDeleteUriRequest(accessToken, "/" + orcid + path + "/" + putCode), true);
+    }
+
+    @Override
+    public OrcidTokenResponseDTO getReadPublicAccessToken() {
+        return getClientCredentialsAccessToken("/read-public");
+    }
+
+    private OrcidTokenResponseDTO getClientCredentialsAccessToken(String scope) {
+        List<NameValuePair> params = new ArrayList<NameValuePair>();
+        params.add(new BasicNameValuePair("scope", scope));
+        params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+        params.add(new BasicNameValuePair("client_id", orcidConfiguration.getClientId()));
+        params.add(new BasicNameValuePair("client_secret", orcidConfiguration.getClientSecret()));
+
+        HttpUriRequest httpUriRequest = RequestBuilder.post(orcidConfiguration.getTokenEndpointUrl())
+            .addHeader("Content-Type", "application/x-www-form-urlencoded")
+            .addHeader("Accept", "application/json")
+            .setEntity(new UrlEncodedFormEntity(params, Charset.defaultCharset()))
+            .build();
+
+        return executeAndParseJson(httpUriRequest, OrcidTokenResponseDTO.class);
+    }
+
+    private HttpUriRequest buildGetUriRequest(String accessToken, String relativePath) {
+        return get(orcidConfiguration.getApiUrl() + relativePath.trim())
+            .addHeader("Content-Type", "application/x-www-form-urlencoded")
+            .addHeader("Authorization", "Bearer " + accessToken)
+            .build();
+    }
+
+    private HttpUriRequest buildGetUriRequestToPublicEndpoint(String relativePath) {
+        return get(orcidConfiguration.getPublicUrl() + relativePath.trim())
+            .addHeader("Content-Type", "application/x-www-form-urlencoded")
+            .build();
+    }
+
+    private HttpUriRequest buildPostUriRequest(String accessToken, String relativePath, Object object) {
+        return post(orcidConfiguration.getApiUrl() + relativePath.trim())
+            .addHeader("Content-Type", "application/vnd.orcid+xml")
+            .addHeader("Authorization", "Bearer " + accessToken)
+            .setEntity(convertToEntity(object))
+            .build();
+    }
+
+    private HttpUriRequest buildPutUriRequest(String accessToken, String relativePath, Object object) {
+        return put(orcidConfiguration.getApiUrl() + relativePath.trim())
+            .addHeader("Content-Type", "application/vnd.orcid+xml")
+            .addHeader("Authorization", "Bearer " + accessToken)
+            .setEntity(convertToEntity(object))
+            .build();
+    }
+
+    private HttpUriRequest buildDeleteUriRequest(String accessToken, String relativePath) {
+        return delete(orcidConfiguration.getApiUrl() + relativePath.trim())
+            .addHeader("Authorization", "Bearer " + accessToken)
+            .build();
+    }
+
+    private <T> T executeAndParseJson(HttpUriRequest httpUriRequest, Class<T> clazz) {
+
+        HttpClient client = HttpClientBuilder.create().build();
+
+        return executeAndReturns(() -> {
+
+            HttpResponse response = client.execute(httpUriRequest);
+
+            if (isNotSuccessfull(response)) {
+                throw new OrcidClientException(getStatusCode(response), formatErrorMessage(response));
+            }
+
+            return objectMapper.readValue(response.getEntity().getContent(), clazz);
+
+        });
+
+    }
+
+    /**
+     * Execute the given httpUriRequest, unmarshalling the content with the given
+     * class.
+     * @param  httpUriRequest       the http request to be executed
+     * @param  handleNotFoundAsNull if true this method returns null if the response
+     *                              status is 404, if false throws an
+     *                              OrcidClientException
+     * @param  clazz                the class to be used for the content unmarshall
+     * @return                      the response body
+     * @throws OrcidClientException if the incoming response is not successfull
+     */
+    private <T> T executeAndUnmarshall(HttpUriRequest httpUriRequest, boolean handleNotFoundAsNull, Class<T> clazz) {
+
+        HttpClient client = HttpClientBuilder.create().build();
+
+        return executeAndReturns(() -> {
+
+            HttpResponse response = client.execute(httpUriRequest);
+
+            if (handleNotFoundAsNull && isNotFound(response)) {
+                return null;
+            }
+
+            if (isNotSuccessfull(response)) {
+                throw new OrcidClientException(getStatusCode(response), formatErrorMessage(response));
+            }
+
+            return unmarshall(response.getEntity(), clazz);
+
+        });
+    }
+
+    private OrcidResponse execute(HttpUriRequest httpUriRequest, boolean handleNotFoundAsNull) {
+        HttpClient client = HttpClientBuilder.create().build();
+
+        return executeAndReturns(() -> {
+
+            HttpResponse response = client.execute(httpUriRequest);
+
+            if (handleNotFoundAsNull && isNotFound(response)) {
+                return new OrcidResponse(getStatusCode(response), null, getContent(response));
+            }
+
+            if (isNotSuccessfull(response)) {
+                throw new OrcidClientException(getStatusCode(response), formatErrorMessage(response));
+            }
+
+            return new OrcidResponse(getStatusCode(response), getPutCode(response), getContent(response));
+
+        });
+    }
+
+    private <T> T executeAndReturns(ThrowingSupplier<T, Exception> supplier) {
+        try {
+            return supplier.get();
+        } catch (OrcidClientException ex) {
+            throw ex;
+        } catch (Exception ex) {
+            throw new OrcidClientException(ex);
+        }
+    }
+
+    private String marshall(Object object) throws JAXBException {
+        JAXBContext jaxbContext = JAXBContext.newInstance(object.getClass());
+        Marshaller marshaller = jaxbContext.createMarshaller();
+        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+        StringWriter stringWriter = new StringWriter();
+        marshaller.marshal(object, stringWriter);
+        return stringWriter.toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T unmarshall(HttpEntity entity, Class<T> clazz) throws Exception {
+        JAXBContext jaxbContext = JAXBContext.newInstance(clazz);
+        XMLInputFactory xmlInputFactory = XMLInputFactory.newFactory();
+        xmlInputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+        XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(entity.getContent());
+        Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+        return (T) unmarshaller.unmarshal(xmlStreamReader);
+    }
+
+    private HttpEntity convertToEntity(Object object) {
+        try {
+            return new StringEntity(marshall(object), StandardCharsets.UTF_8);
+        } catch (JAXBException ex) {
+            throw new IllegalArgumentException("The given object cannot be sent to ORCID", ex);
+        }
+    }
+
+    private String formatErrorMessage(HttpResponse response) {
+        try {
+            return IOUtils.toString(response.getEntity().getContent(), Charset.defaultCharset());
+        } catch (UnsupportedOperationException | IOException e) {
+            return "Generic error";
+        }
+    }
+
+    private boolean isNotSuccessfull(HttpResponse response) {
+        int statusCode = getStatusCode(response);
+        return statusCode < 200 || statusCode > 299;
+    }
+
+    private boolean isNotFound(HttpResponse response) {
+        return getStatusCode(response) == HttpStatus.SC_NOT_FOUND;
+    }
+
+    private int getStatusCode(HttpResponse response) {
+        return response.getStatusLine().getStatusCode();
+    }
+
+    private String getOrcidPathFromOrcidObjectType(Class<?> clazz) {
+        String path = PATHS_MAP.get(clazz);
+        if (path == null) {
+            throw new IllegalArgumentException("The given class is not an ORCID object's class: " + clazz);
+        }
+        return path;
+    }
+
+    private String getContent(HttpResponse response) throws UnsupportedOperationException, IOException {
+        HttpEntity entity = response.getEntity();
+        return entity != null ? IOUtils.toString(entity.getContent(), StandardCharsets.UTF_8.name()) : null;
+    }
+
+    /**
+     * Returns the put code present in the given http response, if any. For more
+     * details about the put code see For more details see
+     * https://info.orcid.org/faq/what-is-a-put-code/
+     * @param  response the http response coming from ORCID
+     * @return          the put code, if any
+     */
+    private String getPutCode(HttpResponse response) {
+        Header[] headers = response.getHeaders("Location");
+        if (headers.length == 0) {
+            return null;
+        }
+        String value = headers[0].getValue();
+        return value.substring(value.lastIndexOf("/") + 1);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/client/OrcidConfiguration.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidConfiguration.java
new file mode 100644
index 0000000000..550b0215c4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidConfiguration.java
@@ -0,0 +1,114 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.client;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * A class that contains all the configurations related to ORCID.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public final class OrcidConfiguration {
+
+    private String apiUrl;
+
+    private String publicUrl;
+
+    private String domainUrl;
+
+    private String redirectUrl;
+
+    private String clientId;
+
+    private String clientSecret;
+
+    private String tokenEndpointUrl;
+
+    private String authorizeEndpointUrl;
+
+    private String scopes;
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public String getDomainUrl() {
+        return domainUrl;
+    }
+
+    public void setDomainUrl(String domainUrl) {
+        this.domainUrl = domainUrl;
+    }
+
+    public String getRedirectUrl() {
+        return redirectUrl;
+    }
+
+    public void setRedirectUrl(String redirectUrl) {
+        this.redirectUrl = redirectUrl;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+
+    public String getTokenEndpointUrl() {
+        return tokenEndpointUrl;
+    }
+
+    public void setTokenEndpointUrl(String tokenEndpointUrl) {
+        this.tokenEndpointUrl = tokenEndpointUrl;
+    }
+
+    public String getAuthorizeEndpointUrl() {
+        return authorizeEndpointUrl;
+    }
+
+    public void setAuthorizeEndpointUrl(String authorizeEndpointUrl) {
+        this.authorizeEndpointUrl = authorizeEndpointUrl;
+    }
+
+    public void setScopes(String scopes) {
+        this.scopes = scopes;
+    }
+
+    public String[] getScopes() {
+        return StringUtils.isNotBlank(scopes) ? StringUtils.split(scopes, ",") : new String[] {};
+    }
+
+    public String getPublicUrl() {
+        return publicUrl;
+    }
+
+    public void setPublicUrl(String publicUrl) {
+        this.publicUrl = publicUrl;
+    }
+
+    public boolean isApiConfigured() {
+        return !StringUtils.isAnyBlank(clientId, clientSecret);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/client/OrcidResponse.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidResponse.java
new file mode 100644
index 0000000000..ef0050cf20
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidResponse.java
@@ -0,0 +1,56 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.client;
+
+import org.apache.http.HttpStatus;
+
+/**
+ * Model a successfully response incoming from ORCID using {@link OrcidClient}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public final class OrcidResponse {
+
+    private final int status;
+
+    private final String putCode;
+
+    private final String content;
+
+    /**
+     * Create an ORCID response instance with the specified HTTP status, putCode and
+     * content.
+     *
+     * @param status  the HTTP status incoming from ORCID
+     * @param putCode the identifier of the resource ORCID side
+     * @param content the response body content
+     */
+    public OrcidResponse(int status, String putCode, String content) {
+        this.status = status;
+        this.putCode = putCode;
+        this.content = content;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public String getPutCode() {
+        return putCode;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public boolean isNotFoundStatus() {
+        return status == HttpStatus.SC_NOT_FOUND;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java b/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
new file mode 100644
index 0000000000..d177e61607
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
@@ -0,0 +1,358 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.consumer;
+
+import static java.util.Arrays.asList;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataFieldName;
+import org.dspace.content.Relationship;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.core.Context;
+import org.dspace.event.Consumer;
+import org.dspace.event.Event;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The consumer to fill the ORCID queue. The addition to the queue is made for
+ * all archived items that meet one of these conditions:
+ * <ul>
+ * <li>are profiles already linked to orcid that have some modified sections to
+ * be synchronized (based on the preferences set by the user)</li>
+ * <li>are publications/fundings related to profile items linked to orcid (based
+ * on the preferences set by the user)</li>
+ * 
+ * </ul>
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidQueueConsumer implements Consumer {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidQueueConsumer.class);
+
+    private OrcidQueueService orcidQueueService;
+
+    private OrcidHistoryService orcidHistoryService;
+
+    private OrcidTokenService orcidTokenService;
+
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    private ItemService itemService;
+
+    private OrcidProfileSectionFactoryService profileSectionFactoryService;
+
+    private ConfigurationService configurationService;
+
+    private RelationshipService relationshipService;
+
+    private List<UUID> alreadyConsumedItems = new ArrayList<>();
+
+    @Override
+    public void initialize() throws Exception {
+
+        OrcidServiceFactory orcidServiceFactory = OrcidServiceFactory.getInstance();
+
+        this.orcidQueueService = orcidServiceFactory.getOrcidQueueService();
+        this.orcidHistoryService = orcidServiceFactory.getOrcidHistoryService();
+        this.orcidSynchronizationService = orcidServiceFactory.getOrcidSynchronizationService();
+        this.orcidTokenService = orcidServiceFactory.getOrcidTokenService();
+        this.profileSectionFactoryService = orcidServiceFactory.getOrcidProfileSectionFactoryService();
+        this.configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        this.relationshipService = ContentServiceFactory.getInstance().getRelationshipService();
+
+        this.itemService = ContentServiceFactory.getInstance().getItemService();
+    }
+
+    @Override
+    public void consume(Context context, Event event) throws Exception {
+
+        if (isOrcidSynchronizationDisabled()) {
+            return;
+        }
+
+        DSpaceObject dso = event.getSubject(context);
+        if (!(dso instanceof Item)) {
+            return;
+        }
+
+        Item item = (Item) dso;
+        if (!item.isArchived()) {
+            return;
+        }
+
+        if (alreadyConsumedItems.contains(item.getID())) {
+            return;
+        }
+
+        context.turnOffAuthorisationSystem();
+        try {
+            consumeItem(context, item);
+        } finally {
+            context.restoreAuthSystemState();
+        }
+
+    }
+
+    /**
+     * Consume the item if it is a profile or an ORCID entity.
+     */
+    private void consumeItem(Context context, Item item) throws SQLException {
+
+        String entityType = itemService.getEntityTypeLabel(item);
+        if (entityType == null) {
+            return;
+        }
+
+        if (OrcidEntityType.isValidEntityType(entityType)) {
+            consumeEntity(context, item);
+        } else if (entityType.equals(getProfileType())) {
+            consumeProfile(context, item);
+        }
+
+        alreadyConsumedItems.add(item.getID());
+
+    }
+
+    /**
+     * Search for all related items to the given entity and create a new ORCID queue
+     * record if one of this is a profile linked with ORCID and the entity item must
+     * be synchronized with ORCID.
+     */
+    private void consumeEntity(Context context, Item entity) throws SQLException {
+
+        List<Item> relatedItems = findAllRelatedItems(context, entity);
+
+        for (Item relatedItem : relatedItems) {
+
+            if (isNotProfileItem(relatedItem) || isNotLinkedToOrcid(context, relatedItem)) {
+                continue;
+            }
+
+            if (shouldNotBeSynchronized(relatedItem, entity) || isAlreadyQueued(context, relatedItem, entity)) {
+                continue;
+            }
+
+            orcidQueueService.create(context, relatedItem, entity);
+
+        }
+
+    }
+
+    private List<Item> findAllRelatedItems(Context context, Item entity) throws SQLException {
+        return relationshipService.findByItem(context, entity).stream()
+            .map(relationship -> getRelatedItem(entity, relationship))
+            .collect(Collectors.toList());
+    }
+
+    private Item getRelatedItem(Item item, Relationship relationship) {
+        return item.equals(relationship.getLeftItem()) ? relationship.getRightItem() : relationship.getLeftItem();
+    }
+
+    /**
+     * If the given profile item is linked with ORCID recalculate all the ORCID
+     * queue records of the configured profile sections that can be synchronized.
+     */
+    private void consumeProfile(Context context, Item item) throws SQLException {
+
+        if (isNotLinkedToOrcid(context, item)) {
+            return;
+        }
+
+        for (OrcidProfileSectionFactory factory : getAllProfileSectionFactories(item)) {
+
+            String sectionType = factory.getProfileSectionType().name();
+
+            orcidQueueService.deleteByEntityAndRecordType(context, item, sectionType);
+
+            if (isProfileSectionSynchronizationDisabled(context, item, factory)) {
+                continue;
+            }
+
+            List<String> signatures = factory.getMetadataSignatures(context, item);
+            List<OrcidHistory> historyRecords = findSuccessfullyOrcidHistoryRecords(context, item, sectionType);
+
+            createInsertionRecordForNewSignatures(context, item, historyRecords, factory, signatures);
+            createDeletionRecordForNoMorePresentSignatures(context, item, historyRecords, factory, signatures);
+
+        }
+
+    }
+
+    private boolean isProfileSectionSynchronizationDisabled(Context context,
+        Item item, OrcidProfileSectionFactory factory) {
+        List<OrcidProfileSyncPreference> preferences = this.orcidSynchronizationService.getProfilePreferences(item);
+        return !preferences.contains(factory.getSynchronizationPreference());
+    }
+
+    /**
+     * Add new INSERTION record in the ORCID queue based on the metadata signatures
+     * calculated from the current item state.
+     */
+    private void createInsertionRecordForNewSignatures(Context context, Item item, List<OrcidHistory> historyRecords,
+        OrcidProfileSectionFactory factory, List<String> signatures) throws SQLException {
+
+        String sectionType = factory.getProfileSectionType().name();
+
+        for (String signature : signatures) {
+
+            if (isNotAlreadySynchronized(historyRecords, signature)) {
+                String description = factory.getDescription(context, item, signature);
+                orcidQueueService.createProfileInsertionRecord(context, item, description, sectionType, signature);
+            }
+
+        }
+
+    }
+
+    /**
+     * Add new DELETION records in the ORCID queue for metadata signature presents
+     * in the ORCID history no more present in the metadata signatures calculated
+     * from the current item state.
+     */
+    private void createDeletionRecordForNoMorePresentSignatures(Context context, Item profile,
+        List<OrcidHistory> historyRecords, OrcidProfileSectionFactory factory, List<String> signatures)
+        throws SQLException {
+
+        String sectionType = factory.getProfileSectionType().name();
+
+        for (OrcidHistory historyRecord : historyRecords) {
+            String storedSignature = historyRecord.getMetadata();
+            String putCode = historyRecord.getPutCode();
+            String description = historyRecord.getDescription();
+
+            if (signatures.contains(storedSignature) || isAlreadyDeleted(historyRecords, historyRecord)) {
+                continue;
+            }
+
+            if (StringUtils.isBlank(putCode)) {
+                LOGGER.warn("The orcid history record with id {} should have a not blank put code",
+                    historyRecord.getID());
+                continue;
+            }
+
+            orcidQueueService.createProfileDeletionRecord(context, profile, description,
+                sectionType, storedSignature, putCode);
+        }
+
+    }
+
+    private List<OrcidHistory> findSuccessfullyOrcidHistoryRecords(Context context, Item item,
+        String sectionType) throws SQLException {
+        return orcidHistoryService.findSuccessfullyRecordsByEntityAndType(context, item, sectionType);
+    }
+
+    private boolean isNotAlreadySynchronized(List<OrcidHistory> records, String signature) {
+        return getLastOperation(records, signature)
+            .map(operation -> operation == OrcidOperation.DELETE)
+            .orElse(Boolean.TRUE);
+    }
+
+    private boolean isAlreadyDeleted(List<OrcidHistory> records, OrcidHistory historyRecord) {
+
+        if (historyRecord.getOperation() == OrcidOperation.DELETE) {
+            return true;
+        }
+
+        return findDeletedHistoryRecordsBySignature(records, historyRecord.getMetadata())
+            .anyMatch(record -> record.getTimestamp().after(historyRecord.getTimestamp()));
+    }
+
+    private Stream<OrcidHistory> findDeletedHistoryRecordsBySignature(List<OrcidHistory> records, String signature) {
+        return records.stream()
+            .filter(record -> signature.equals(record.getMetadata()))
+            .filter(record -> record.getOperation() == OrcidOperation.DELETE);
+    }
+
+    private Optional<OrcidOperation> getLastOperation(List<OrcidHistory> records, String signature) {
+        return records.stream()
+            .filter(record -> signature.equals(record.getMetadata()))
+            .sorted(comparing(OrcidHistory::getTimestamp, nullsFirst(naturalOrder())).reversed())
+            .map(OrcidHistory::getOperation)
+            .findFirst();
+    }
+
+    private boolean isAlreadyQueued(Context context, Item profileItem, Item entity) throws SQLException {
+        return isNotEmpty(orcidQueueService.findByProfileItemAndEntity(context, profileItem, entity));
+    }
+
+    private boolean isNotLinkedToOrcid(Context context, Item profileItemItem) {
+        return hasNotOrcidAccessToken(context, profileItemItem)
+            || getMetadataValue(profileItemItem, "person.identifier.orcid") == null;
+    }
+
+    private boolean hasNotOrcidAccessToken(Context context, Item profileItemItem) {
+        return orcidTokenService.findByProfileItem(context, profileItemItem) == null;
+    }
+
+    private boolean shouldNotBeSynchronized(Item profileItem, Item entity) {
+        return !orcidSynchronizationService.isSynchronizationAllowed(profileItem, entity);
+    }
+
+    private boolean isNotProfileItem(Item profileItemItem) {
+        return !getProfileType().equals(itemService.getEntityTypeLabel(profileItemItem));
+    }
+
+    private String getMetadataValue(Item item, String metadataField) {
+        return itemService.getMetadataFirstValue(item, new MetadataFieldName(metadataField), Item.ANY);
+    }
+
+    private List<OrcidProfileSectionFactory> getAllProfileSectionFactories(Item item) {
+        return this.profileSectionFactoryService.findByPreferences(asList(OrcidProfileSyncPreference.values()));
+    }
+
+    private String getProfileType() {
+        return configurationService.getProperty("researcher-profile.entity-type", "Person");
+    }
+
+    private boolean isOrcidSynchronizationDisabled() {
+        return !configurationService.getBooleanProperty("orcid.synchronization-enabled", true);
+    }
+
+    @Override
+    public void end(Context context) throws Exception {
+        alreadyConsumedItems.clear();
+    }
+
+    @Override
+    public void finish(Context context) throws Exception {
+        // nothing to do
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidHistoryDAO.java b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidHistoryDAO.java
new file mode 100644
index 0000000000..9e82f3c51d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidHistoryDAO.java
@@ -0,0 +1,76 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+import org.dspace.orcid.OrcidHistory;
+
+/**
+ * Database Access Object interface class for the OrcidHistory object. The
+ * implementation of this class is responsible for all database calls for the
+ * OrcidHistory object and is autowired by spring. This class should only be
+ * accessed from a single service and should never be exposed outside of the API
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidHistoryDAO extends GenericDAO<OrcidHistory> {
+
+    /**
+     * Find all the ORCID history records by the given profileItem and entity uuids.
+     *
+     * @param  context       the DSpace context
+     * @param  profileItemId the profileItem item uuid
+     * @param  entityId      the entity item uuid
+     * @return               the records list
+     * @throws SQLException  if an SQL error occurs
+     */
+    List<OrcidHistory> findByProfileItemAndEntity(Context context, UUID profileItemId, UUID entityId)
+        throws SQLException;
+
+    /**
+     * Get the OrcidHistory records where the given item is the profileItem or the
+     * entity
+     *
+     * @param  context      DSpace context object
+     * @param  item         the item to search for
+     * @return              the found OrcidHistory entities
+     * @throws SQLException if database error
+     */
+    public List<OrcidHistory> findByProfileItemOrEntity(Context context, Item item) throws SQLException;
+
+    /**
+     * Find the OrcidHistory records related to the given entity item.
+     *
+     * @param  context      DSpace context object
+     * @param  entity       the entity item
+     * @return              the found put codes
+     * @throws SQLException if database error
+     */
+    List<OrcidHistory> findByEntity(Context context, Item entity) throws SQLException;
+
+    /**
+     * Find all the successfully Orcid history records with the given record type
+     * related to the given entity. An history record is considered successful if
+     * the status is between 200 and 300.
+     *
+     * @param  context      DSpace context object
+     * @param  entity       the entity item
+     * @param  recordType   the record type
+     * @return              the found orcid history records
+     * @throws SQLException if database error
+     */
+    List<OrcidHistory> findSuccessfullyRecordsByEntityAndType(Context context, Item entity,
+        String recordType) throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidQueueDAO.java b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidQueueDAO.java
new file mode 100644
index 0000000000..235443b150
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidQueueDAO.java
@@ -0,0 +1,107 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+import org.dspace.orcid.OrcidQueue;
+
+/**
+ * Database Access Object interface class for the OrcidQueue object. The
+ * implementation of this class is responsible for all database calls for the
+ * OrcidQueue object and is autowired by spring. This class should only be
+ * accessed from a single service and should never be exposed outside of the API
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidQueueDAO extends GenericDAO<OrcidQueue> {
+
+    /**
+     * Get the orcid queue records by the profileItem id.
+     *
+     * @param  context       DSpace context object
+     * @param  profileItemId the profileItem item id
+     * @param  limit         limit
+     * @param  offset        offset
+     * @return               the orcid queue records
+     * @throws SQLException  if an SQL error occurs
+     */
+    public List<OrcidQueue> findByProfileItemId(Context context, UUID profileItemId, Integer limit, Integer offset)
+        throws SQLException;
+
+    /**
+     * Count the orcid queue records with the same profileItemId.
+     *
+     * @param  context       DSpace context object
+     * @param  profileItemId the profileItem item id
+     * @return               the count result
+     * @throws SQLException  if an SQL error occurs
+     */
+    long countByProfileItemId(Context context, UUID profileItemId) throws SQLException;
+
+    /**
+     * Returns all the orcid queue records with the given profileItem and entity
+     * items.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  entity       the entity item
+     * @return              the found orcid queue records
+     * @throws SQLException
+     */
+    public List<OrcidQueue> findByProfileItemAndEntity(Context context, Item profileItem, Item entity)
+        throws SQLException;
+
+    /**
+     * Get the OrcidQueue records where the given item is the profileItem OR the
+     * entity
+     *
+     * @param  context      DSpace context object
+     * @param  item         the item to search for
+     * @return              the found OrcidHistory entities
+     * @throws SQLException if database error
+     */
+    public List<OrcidQueue> findByProfileItemOrEntity(Context context, Item item) throws SQLException;
+
+    /**
+     * Find all the OrcidQueue records with the given entity and record type.
+     *
+     * @param  context      DSpace context object
+     * @param  entity       the entity item
+     * @param  type         the record type
+     * @throws SQLException if database error occurs
+     */
+    public List<OrcidQueue> findByEntityAndRecordType(Context context, Item entity, String type) throws SQLException;
+
+    /**
+     * Find all the OrcidQueue records with the given profileItem and record type.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  type         the record type
+     * @throws SQLException if database error occurs
+     */
+    public List<OrcidQueue> findByProfileItemAndRecordType(Context context, Item profileItem, String type)
+        throws SQLException;
+
+    /**
+     * Get all the OrcidQueue records with attempts less than the given attempts.
+     *
+     * @param  context      DSpace context object
+     * @param  attempts     the maximum value of attempts
+     * @return              the found OrcidQueue records
+     * @throws SQLException if database error
+     */
+    public List<OrcidQueue> findByAttemptsLessThan(Context context, int attempts) throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidTokenDAO.java b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidTokenDAO.java
new file mode 100644
index 0000000000..00ec3dd274
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/OrcidTokenDAO.java
@@ -0,0 +1,45 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.dao;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
+
+/**
+ * Database Access Object interface class for the OrcidToken object. The
+ * implementation of this class is responsible for all database calls for the
+ * OrcidToken object and is autowired by spring. This class should only be
+ * accessed from a single service and should never be exposed outside of the API
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidTokenDAO extends GenericDAO<OrcidToken> {
+
+    /**
+     * Find an OrcidToken by ePerson.
+     *
+     * @param  context the DSpace context
+     * @param  ePerson the ePerson to search for
+     * @return         the Orcid token, if any
+     */
+    public OrcidToken findByEPerson(Context context, EPerson ePerson);
+
+    /**
+     * Find an OrcidToken by profileItem.
+     *
+     * @param  context     the DSpace context
+     * @param  profileItem the profile item to search for
+     * @return             the Orcid token, if any
+     */
+    public OrcidToken findByProfileItem(Context context, Item profileItem);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
new file mode 100644
index 0000000000..0b2c7099ff
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
@@ -0,0 +1,64 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.dao.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+import javax.persistence.Query;
+
+import org.dspace.content.Item;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.dao.OrcidHistoryDAO;
+
+/**
+ * Implementation of {@link OrcidHistoryDAO}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@SuppressWarnings("unchecked")
+public class OrcidHistoryDAOImpl extends AbstractHibernateDAO<OrcidHistory> implements OrcidHistoryDAO {
+
+    @Override
+    public List<OrcidHistory> findByProfileItemAndEntity(Context context, UUID profileItemId, UUID entityId)
+        throws SQLException {
+        Query query = createQuery(context,
+            "FROM OrcidHistory WHERE profileItem.id = :profileItemId AND entity.id = :entityId ");
+        query.setParameter("profileItemId", profileItemId);
+        query.setParameter("entityId", entityId);
+        return query.getResultList();
+    }
+
+    @Override
+    public List<OrcidHistory> findByProfileItemOrEntity(Context context, Item item) throws SQLException {
+        Query query = createQuery(context, "FROM OrcidHistory WHERE profileItem.id = :itemId OR entity.id = :itemId");
+        query.setParameter("itemId", item.getID());
+        return query.getResultList();
+    }
+
+    @Override
+    public List<OrcidHistory> findByEntity(Context context, Item entity) throws SQLException {
+        Query query = createQuery(context, "FROM OrcidHistory WHERE entity.id = :entityId ");
+        query.setParameter("entityId", entity.getID());
+        return query.getResultList();
+    }
+
+    @Override
+    public List<OrcidHistory> findSuccessfullyRecordsByEntityAndType(Context context, Item entity,
+        String recordType) throws SQLException {
+        Query query = createQuery(context, "FROM OrcidHistory WHERE entity = :entity AND recordType = :type "
+            + "AND status BETWEEN 200 AND 300");
+        query.setParameter("entity", entity);
+        query.setParameter("type", recordType);
+        return query.getResultList();
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
new file mode 100644
index 0000000000..2114b25357
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
@@ -0,0 +1,90 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.dao.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+import javax.persistence.Query;
+
+import org.dspace.content.Item;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.dao.OrcidQueueDAO;
+
+/**
+ * Implementation of {@link OrcidQueueDAO}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@SuppressWarnings("unchecked")
+public class OrcidQueueDAOImpl extends AbstractHibernateDAO<OrcidQueue> implements OrcidQueueDAO {
+
+    @Override
+    public List<OrcidQueue> findByProfileItemId(Context context, UUID profileItemId, Integer limit, Integer offset)
+        throws SQLException {
+        Query query = createQuery(context, "FROM OrcidQueue WHERE profileItem.id= :profileItemId");
+        query.setParameter("profileItemId", profileItemId);
+        if (limit != null && limit.intValue() > 0) {
+            query.setMaxResults(limit);
+        }
+        query.setFirstResult(offset);
+        return query.getResultList();
+    }
+
+    @Override
+    public List<OrcidQueue> findByProfileItemAndEntity(Context context, Item profileItem, Item entity)
+        throws SQLException {
+        Query query = createQuery(context, "FROM OrcidQueue WHERE profileItem = :profileItem AND entity = :entity");
+        query.setParameter("profileItem", profileItem);
+        query.setParameter("entity", entity);
+        return query.getResultList();
+    }
+
+    @Override
+    public long countByProfileItemId(Context context, UUID profileItemId) throws SQLException {
+        Query query = createQuery(context,
+            "SELECT COUNT(queue) FROM OrcidQueue queue WHERE profileItem.id= :profileItemId");
+        query.setParameter("profileItemId", profileItemId);
+        return (long) query.getSingleResult();
+    }
+
+    @Override
+    public List<OrcidQueue> findByProfileItemOrEntity(Context context, Item item) throws SQLException {
+        Query query = createQuery(context, "FROM OrcidQueue WHERE profileItem.id= :itemId OR entity.id = :itemId");
+        query.setParameter("itemId", item.getID());
+        return query.getResultList();
+    }
+
+    @Override
+    public List<OrcidQueue> findByEntityAndRecordType(Context context, Item entity, String type) throws SQLException {
+        Query query = createQuery(context, "FROM OrcidQueue WHERE entity = :entity AND recordType = :type");
+        query.setParameter("entity", entity);
+        query.setParameter("type", type);
+        return query.getResultList();
+    }
+
+    @Override
+    public List<OrcidQueue> findByProfileItemAndRecordType(Context context, Item profileItem, String type)
+        throws SQLException {
+        Query query = createQuery(context, "FROM OrcidQueue WHERE profileItem = :profileItem AND recordType = :type");
+        query.setParameter("profileItem", profileItem);
+        query.setParameter("type", type);
+        return query.getResultList();
+    }
+
+    @Override
+    public List<OrcidQueue> findByAttemptsLessThan(Context context, int attempts) throws SQLException {
+        Query query = createQuery(context, "FROM OrcidQueue WHERE attempts IS NULL OR attempts < :attempts");
+        query.setParameter("attempts", attempts);
+        return query.getResultList();
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
new file mode 100644
index 0000000000..01b03fc354
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
@@ -0,0 +1,50 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.dao.impl;
+
+import java.sql.SQLException;
+import javax.persistence.Query;
+
+import org.dspace.content.Item;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.dao.OrcidTokenDAO;
+
+/**
+ * Implementation of {@link OrcidTokenDAO}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidTokenDAOImpl extends AbstractHibernateDAO<OrcidToken> implements OrcidTokenDAO {
+
+    @Override
+    public OrcidToken findByEPerson(Context context, EPerson ePerson) {
+        try {
+            Query query = createQuery(context, "FROM OrcidToken WHERE ePerson = :ePerson");
+            query.setParameter("ePerson", ePerson);
+            return singleResult(query);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public OrcidToken findByProfileItem(Context context, Item profileItem) {
+        try {
+            Query query = createQuery(context, "FROM OrcidToken WHERE profileItem = :profileItem");
+            query.setParameter("profileItem", profileItem);
+            return singleResult(query);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidClientException.java b/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidClientException.java
new file mode 100644
index 0000000000..9e78ef07b0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidClientException.java
@@ -0,0 +1,48 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.exception;
+
+/**
+ * Exception throwable from class that implements {@link OrcidClient} in case of
+ * error response from the ORCID registry.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidClientException extends RuntimeException {
+
+    public static final String INVALID_GRANT_MESSAGE = "invalid_grant";
+
+    private static final long serialVersionUID = -7618061110212398216L;
+
+    private int status = 0;
+
+    public OrcidClientException(int status, String content) {
+        super(content);
+        this.status = status;
+    }
+
+    public OrcidClientException(Throwable cause) {
+        super(cause);
+    }
+
+    public int getStatus() {
+        return this.status;
+    }
+
+    /**
+     * Returns true if the exception is related to an invalid grant error
+     * (authentication code non valid), false otherwise
+     *
+     * @return the check result
+     */
+    public boolean isInvalidGrantException() {
+        return getMessage() != null && getMessage().contains(INVALID_GRANT_MESSAGE);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidValidationException.java b/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidValidationException.java
new file mode 100644
index 0000000000..bb35789ab9
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/exception/OrcidValidationException.java
@@ -0,0 +1,52 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.exception;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.dspace.orcid.model.validator.OrcidValidationError;
+
+/**
+ * A Runtime exception that occurs when an ORCID object that must be send to
+ * ORCID is not valid.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidValidationException extends RuntimeException {
+
+    private static final long serialVersionUID = 3377335341871311369L;
+
+    private final List<OrcidValidationError> errors;
+
+    public OrcidValidationException(OrcidValidationError error) {
+        this(List.of(error));
+    }
+
+    public OrcidValidationException(List<OrcidValidationError> errors) {
+        super("Errors occurs during ORCID object validation");
+        this.errors = errors;
+    }
+
+    public List<OrcidValidationError> getErrors() {
+        return errors;
+    }
+
+    @Override
+    public String getMessage() {
+        return super.getMessage() + ". Error codes: " + formatErrors();
+    }
+
+    private String formatErrors() {
+        return errors.stream()
+            .map(error -> error.getCode())
+            .collect(Collectors.joining(","));
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactory.java b/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactory.java
new file mode 100644
index 0000000000..09f43229d6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactory.java
@@ -0,0 +1,54 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.factory;
+
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the orcid package, use
+ * OrcidHistoryServiceFactory.getInstance() to retrieve an implementation.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4Science.it)
+ *
+ */
+public abstract class OrcidServiceFactory {
+
+    public abstract OrcidHistoryService getOrcidHistoryService();
+
+    public abstract OrcidQueueService getOrcidQueueService();
+
+    public abstract OrcidSynchronizationService getOrcidSynchronizationService();
+
+    public abstract OrcidTokenService getOrcidTokenService();
+
+    public abstract OrcidProfileSectionFactoryService getOrcidProfileSectionFactoryService();
+
+    public abstract MetadataSignatureGenerator getMetadataSignatureGenerator();
+
+    public abstract OrcidEntityFactoryService getOrcidEntityFactoryService();
+
+    public abstract OrcidClient getOrcidClient();
+
+    public abstract OrcidConfiguration getOrcidConfiguration();
+
+    public static OrcidServiceFactory getInstance() {
+        return DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(
+            "orcidServiceFactory", OrcidServiceFactory.class);
+    }
+
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactoryImpl.java
new file mode 100644
index 0000000000..78972eba85
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactoryImpl.java
@@ -0,0 +1,105 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.factory;
+
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OrcidServiceFactory}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4Science.it)
+ *
+ */
+public class OrcidServiceFactoryImpl extends OrcidServiceFactory {
+
+    @Autowired
+    private OrcidHistoryService orcidHistoryService;
+
+    @Autowired
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    @Autowired
+    private OrcidQueueService orcidQueueService;
+
+    @Autowired
+    private OrcidProfileSectionFactoryService orcidProfileSectionFactoryService;
+
+    @Autowired
+    private OrcidEntityFactoryService orcidEntityFactoryService;
+
+    @Autowired
+    private MetadataSignatureGenerator metadataSignatureGenerator;
+
+    @Autowired
+    private OrcidClient orcidClient;
+
+    @Autowired
+    private OrcidConfiguration orcidConfiguration;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    @Override
+    public OrcidHistoryService getOrcidHistoryService() {
+        return orcidHistoryService;
+    }
+
+    @Override
+    public OrcidQueueService getOrcidQueueService() {
+        return orcidQueueService;
+    }
+
+    @Override
+    public OrcidSynchronizationService getOrcidSynchronizationService() {
+        return orcidSynchronizationService;
+    }
+
+    @Override
+    public OrcidProfileSectionFactoryService getOrcidProfileSectionFactoryService() {
+        return orcidProfileSectionFactoryService;
+    }
+
+    @Override
+    public MetadataSignatureGenerator getMetadataSignatureGenerator() {
+        return metadataSignatureGenerator;
+    }
+
+    @Override
+    public OrcidEntityFactoryService getOrcidEntityFactoryService() {
+        return orcidEntityFactoryService;
+    }
+
+    @Override
+    public OrcidTokenService getOrcidTokenService() {
+        return orcidTokenService;
+    }
+
+    @Override
+    public OrcidClient getOrcidClient() {
+        return orcidClient;
+    }
+
+    @Override
+    public OrcidConfiguration getOrcidConfiguration() {
+        return orcidConfiguration;
+    }
+
+    public void setOrcidClient(OrcidClient orcidClient) {
+        this.orcidClient = orcidClient;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/OrcidEntityType.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidEntityType.java
new file mode 100644
index 0000000000..6b32818f76
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidEntityType.java
@@ -0,0 +1,75 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model;
+
+import java.util.Arrays;
+
+/**
+ * The types of activities defined on ORCID that can be synchronized.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public enum OrcidEntityType {
+
+    /**
+     * The ORCID publication/work activity.
+     */
+    PUBLICATION("Publication", "/work"),
+
+    /**
+     * The ORCID funding activity.
+     */
+    FUNDING("Project", "/funding");
+
+    /**
+     * The DSpace entity type.
+     */
+    private final String entityType;
+
+    /**
+     * The subpath of the activity on ORCID API.
+     */
+    private final String path;
+
+    private OrcidEntityType(String entityType, String path) {
+        this.entityType = entityType;
+        this.path = path;
+    }
+
+    public String getEntityType() {
+        return entityType;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Check if the given DSpace entity type is valid.
+     * @param  entityType the entity type to check
+     * @return            true if valid, false otherwise
+     */
+    public static boolean isValidEntityType(String entityType) {
+        return Arrays.stream(OrcidEntityType.values())
+            .anyMatch(orcidEntityType -> orcidEntityType.getEntityType().equalsIgnoreCase(entityType));
+    }
+
+    /**
+     * Returns an ORCID entity type from a DSpace entity type.
+     *
+     * @param  entityType the DSpace entity type to search for
+     * @return            the ORCID entity type, if any
+     */
+    public static OrcidEntityType fromEntityType(String entityType) {
+        return Arrays.stream(OrcidEntityType.values())
+            .filter(orcidEntityType -> orcidEntityType.getEntityType().equalsIgnoreCase(entityType))
+            .findFirst()
+            .orElse(null);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/OrcidFundingFieldMapping.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidFundingFieldMapping.java
new file mode 100644
index 0000000000..1a8333058a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidFundingFieldMapping.java
@@ -0,0 +1,209 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model;
+
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
+import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.dspace.orcid.model.factory.OrcidFactoryUtils;
+import org.dspace.util.SimpleMapConverter;
+import org.orcid.jaxb.model.common.FundingContributorRole;
+
+/**
+ * Class that contains all the mapping between {@link Funding} and DSpace
+ * metadata fields.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidFundingFieldMapping {
+
+    /**
+     * The metadata fields related to the funding contributors.
+     */
+    private Map<String, FundingContributorRole> contributorFields;
+
+    /**
+     * The metadata fields related to the funding external identifiers.
+     */
+    private Map<String, String> externalIdentifierFields;
+
+    /**
+     * The metadata field related to the funding title.
+     */
+    private String titleField;
+
+    /**
+     * The metadata field related to the funding type.
+     */
+    private String typeField;
+
+    /**
+     * The funding type converter.
+     */
+    private SimpleMapConverter typeConverter;
+
+    /**
+     * The metadata field related to the funding amount.
+     */
+    private String amountField;
+
+    /**
+     * The metadata field related to the funding amount's currency.
+     */
+    private String amountCurrencyField;
+
+    /**
+     * The funding amount's currency converter.
+     */
+    private SimpleMapConverter amountCurrencyConverter;
+
+    /**
+     * The metadata field related to the funding start date.
+     */
+    private String startDateField;
+
+    /**
+     * The metadata field related to the funding end date.
+     */
+    private String endDateField;
+
+    /**
+     * The metadata field related to the funding description.
+     */
+    private String descriptionField;
+
+    /**
+     * The type of the relationship between the funding and the organization.
+     */
+    private String organizationRelationshipType;
+
+    private Map<String, FundingContributorRole> parseContributors(String contributors) {
+        Map<String, String> contributorsMap = parseConfigurations(contributors);
+        return contributorsMap.keySet().stream()
+            .collect(toMap(identity(), field -> parseContributorRole(contributorsMap.get(field))));
+    }
+
+    private FundingContributorRole parseContributorRole(String contributorRole) {
+        try {
+            return FundingContributorRole.fromValue(contributorRole);
+        } catch (IllegalArgumentException ex) {
+            throw new IllegalArgumentException("The funding contributor role " + contributorRole +
+                " is invalid, allowed values are " + getAllowedContributorRoles(), ex);
+        }
+    }
+
+    private List<String> getAllowedContributorRoles() {
+        return Arrays.asList(FundingContributorRole.values()).stream()
+            .map(FundingContributorRole::value)
+            .collect(Collectors.toList());
+    }
+
+    public Map<String, String> getExternalIdentifierFields() {
+        return externalIdentifierFields;
+    }
+
+    public void setExternalIdentifierFields(String externalIdentifierFields) {
+        this.externalIdentifierFields = OrcidFactoryUtils.parseConfigurations(externalIdentifierFields);
+    }
+
+    public Map<String, FundingContributorRole> getContributorFields() {
+        return contributorFields;
+    }
+
+    public void setContributorFields(String contributorFields) {
+        this.contributorFields = parseContributors(contributorFields);
+    }
+
+    public String getTitleField() {
+        return titleField;
+    }
+
+    public void setTitleField(String titleField) {
+        this.titleField = titleField;
+    }
+
+    public String getStartDateField() {
+        return startDateField;
+    }
+
+    public void setStartDateField(String startDateField) {
+        this.startDateField = startDateField;
+    }
+
+    public String getEndDateField() {
+        return endDateField;
+    }
+
+    public void setEndDateField(String endDateField) {
+        this.endDateField = endDateField;
+    }
+
+    public String getDescriptionField() {
+        return descriptionField;
+    }
+
+    public void setDescriptionField(String descriptionField) {
+        this.descriptionField = descriptionField;
+    }
+
+    public String getOrganizationRelationshipType() {
+        return organizationRelationshipType;
+    }
+
+    public void setOrganizationRelationshipType(String organizationRelationshipType) {
+        this.organizationRelationshipType = organizationRelationshipType;
+    }
+
+    public String getTypeField() {
+        return typeField;
+    }
+
+    public void setTypeField(String typeField) {
+        this.typeField = typeField;
+    }
+
+    public String getAmountField() {
+        return amountField;
+    }
+
+    public void setAmountField(String amountField) {
+        this.amountField = amountField;
+    }
+
+    public String getAmountCurrencyField() {
+        return amountCurrencyField;
+    }
+
+    public void setAmountCurrencyField(String amountCurrencyField) {
+        this.amountCurrencyField = amountCurrencyField;
+    }
+
+    public String convertAmountCurrency(String currency) {
+        return amountCurrencyConverter != null ? amountCurrencyConverter.getValue(currency) : currency;
+    }
+
+    public void setAmountCurrencyConverter(SimpleMapConverter amountCurrencyConverter) {
+        this.amountCurrencyConverter = amountCurrencyConverter;
+    }
+
+    public String convertType(String type) {
+        return typeConverter != null ? typeConverter.getValue(type) : type;
+    }
+
+    public void setTypeConverter(SimpleMapConverter typeConverter) {
+        this.typeConverter = typeConverter;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/OrcidProfileSectionType.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidProfileSectionType.java
new file mode 100644
index 0000000000..7521844d2d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidProfileSectionType.java
@@ -0,0 +1,46 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model;
+
+import org.apache.commons.lang3.EnumUtils;
+
+/**
+ * Enum that model all the ORCID profile sections that could be synchronized.
+ * These fields come from the ORCID PERSON schema, see
+ * https://info.orcid.org/documentation/integration-guide/orcid-record/#PERSON
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public enum OrcidProfileSectionType {
+
+    OTHER_NAMES("/other-names"),
+    COUNTRY("/address"),
+    KEYWORDS("/keywords"),
+    EXTERNAL_IDS("/external-identifiers"),
+    RESEARCHER_URLS("/researcher-urls");
+
+    private final String path;
+
+    private OrcidProfileSectionType(String path) {
+        this.path = path;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public static boolean isValid(String type) {
+        return type != null ? EnumUtils.isValidEnum(OrcidProfileSectionType.class, type.toUpperCase()) : false;
+    }
+
+    public static OrcidProfileSectionType fromString(String type) {
+        return isValid(type) ? OrcidProfileSectionType.valueOf(type.toUpperCase()) : null;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/OrcidTokenResponseDTO.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidTokenResponseDTO.java
new file mode 100644
index 0000000000..6b3594f9b8
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidTokenResponseDTO.java
@@ -0,0 +1,135 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * This class map the response from and ORCID token endpoint.
+ *
+ * Response example:
+ *
+ * {
+ *  "access_token":"f5af9f51-07e6-4332-8f1a-c0c11c1e3728",
+ *  "token_type":"bearer",
+ *  "refresh_token":"f725f747-3a65-49f6-a231-3e8944ce464d",
+ *  "expires_in":631138518,
+ *  "scope":"/read-limited",
+ *  "name":"Sofia Garcia",
+ *  "orcid":"0000-0001-2345-6789"
+ * }
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4Science.it)
+ *
+ */
+public class OrcidTokenResponseDTO {
+
+    /**
+     * The access token release by the authorization server this is the most
+     * relevant item, because it allow the server to access to the user resources as
+     * defined in the scopes.
+     */
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    /**
+     * The refresh token as defined in the OAuth standard.
+     */
+    @JsonProperty("refresh_token")
+    private String refreshToken;
+
+    /**
+     * It will be "bearer".
+     */
+    @JsonProperty("token_type")
+    private String tokenType;
+
+    /**
+     * The expiration timestamp in millis.
+     */
+    @JsonProperty("expires_in")
+    private int expiresIn;
+
+    /**
+     * List of scopes.
+     */
+    private String scope;
+
+    /**
+     * The ORCID user name.
+     */
+    private String name;
+
+    /**
+     * The ORCID user id.
+     */
+    private String orcid;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOrcid() {
+        return orcid;
+    }
+
+    public void setOrcid(String orcid) {
+        this.orcid = orcid;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
+    public String getTokenType() {
+        return tokenType;
+    }
+
+    public void setTokenType(String tokenType) {
+        this.tokenType = tokenType;
+    }
+
+    public int getExpiresIn() {
+        return expiresIn;
+    }
+
+    public void setExpiresIn(int expiresIn) {
+        this.expiresIn = expiresIn;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    @JsonIgnore
+    public String[] getScopeAsArray() {
+        return StringUtils.isEmpty(getScope()) ? new String[] {} : getScope().split(" ");
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/OrcidWorkFieldMapping.java b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidWorkFieldMapping.java
new file mode 100644
index 0000000000..781a9dcbd9
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/OrcidWorkFieldMapping.java
@@ -0,0 +1,197 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model;
+
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
+import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.dspace.util.SimpleMapConverter;
+import org.orcid.jaxb.model.common.ContributorRole;
+import org.orcid.jaxb.model.v3.release.record.Work;
+
+/**
+ * Class that contains all the mapping between {@link Work} and DSpace metadata
+ * fields.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidWorkFieldMapping {
+
+    /**
+     * The metadata fields related to the work contributors.
+     */
+    private Map<String, ContributorRole> contributorFields = new HashMap<>();
+
+    /**
+     * The metadata fields related to the work external identifiers.
+     */
+    private Map<String, String> externalIdentifierFields = new HashMap<>();
+
+    /**
+     * The metadata field related to the work publication date.
+     */
+    private String publicationDateField;
+
+    /**
+     * The metadata field related to the work title.
+     */
+    private String titleField;
+
+    /**
+     * The metadata field related to the work type.
+     */
+    private String typeField;
+
+    /**
+     * The metadata field related to the work journal title.
+     */
+    private String journalTitleField;
+
+    /**
+     * The metadata field related to the work description.
+     */
+    private String shortDescriptionField;
+
+    /**
+     * The metadata field related to the work language.
+     */
+    private String languageField;
+
+    /**
+     * The metadata field related to the work sub title.
+     */
+    private String subTitleField;
+
+    /**
+     * The work type converter.
+     */
+    private SimpleMapConverter typeConverter;
+
+    /**
+     * The work language converter.
+     */
+    private SimpleMapConverter languageConverter;
+
+    public String convertType(String type) {
+        return typeConverter != null ? typeConverter.getValue(type) : type;
+    }
+
+    public String convertLanguage(String language) {
+        return languageConverter != null ? languageConverter.getValue(language) : language;
+    }
+
+    public String getTitleField() {
+        return titleField;
+    }
+
+    public void setTitleField(String titleField) {
+        this.titleField = titleField;
+    }
+
+    public String getTypeField() {
+        return typeField;
+    }
+
+    public void setTypeField(String typeField) {
+        this.typeField = typeField;
+    }
+
+    public void setTypeConverter(SimpleMapConverter typeConverter) {
+        this.typeConverter = typeConverter;
+    }
+
+    public Map<String, ContributorRole> getContributorFields() {
+        return contributorFields;
+    }
+
+    public void setContributorFields(String contributorFields) {
+        this.contributorFields = parseContributors(contributorFields);
+    }
+
+    public Map<String, String> getExternalIdentifierFields() {
+        return externalIdentifierFields;
+    }
+
+    public void setExternalIdentifierFields(String externalIdentifierFields) {
+        this.externalIdentifierFields = parseConfigurations(externalIdentifierFields);
+    }
+
+    public String getPublicationDateField() {
+        return publicationDateField;
+    }
+
+    public void setPublicationDateField(String publicationDateField) {
+        this.publicationDateField = publicationDateField;
+    }
+
+    public String getJournalTitleField() {
+        return journalTitleField;
+    }
+
+    public void setJournalTitleField(String journalTitleField) {
+        this.journalTitleField = journalTitleField;
+    }
+
+    public String getShortDescriptionField() {
+        return shortDescriptionField;
+    }
+
+    public void setShortDescriptionField(String shortDescriptionField) {
+        this.shortDescriptionField = shortDescriptionField;
+    }
+
+    public String getLanguageField() {
+        return languageField;
+    }
+
+    public void setLanguageField(String languageField) {
+        this.languageField = languageField;
+    }
+
+    public void setLanguageConverter(SimpleMapConverter languageConverter) {
+        this.languageConverter = languageConverter;
+    }
+
+    public String getSubTitleField() {
+        return subTitleField;
+    }
+
+    public void setSubTitleField(String subTitleField) {
+        this.subTitleField = subTitleField;
+    }
+
+    private Map<String, ContributorRole> parseContributors(String contributors) {
+        Map<String, String> contributorsMap = parseConfigurations(contributors);
+        return contributorsMap.keySet().stream()
+            .collect(toMap(identity(), field -> parseContributorRole(contributorsMap.get(field))));
+    }
+
+    private ContributorRole parseContributorRole(String contributorRole) {
+        try {
+            return ContributorRole.fromValue(contributorRole);
+        } catch (IllegalArgumentException ex) {
+            throw new IllegalArgumentException("The contributor role " + contributorRole +
+                " is invalid, allowed values are " + getAllowedContributorRoles(), ex);
+        }
+    }
+
+    private List<String> getAllowedContributorRoles() {
+        return Arrays.asList(ContributorRole.values()).stream()
+            .map(ContributorRole::value)
+            .collect(Collectors.toList());
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
new file mode 100644
index 0000000000..4ca36c2169
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
@@ -0,0 +1,93 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory;
+
+import java.util.Optional;
+
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.core.Context;
+import org.dspace.orcid.exception.OrcidValidationException;
+import org.orcid.jaxb.model.common.ContributorRole;
+import org.orcid.jaxb.model.common.FundingContributorRole;
+import org.orcid.jaxb.model.v3.release.common.Contributor;
+import org.orcid.jaxb.model.v3.release.common.Country;
+import org.orcid.jaxb.model.v3.release.common.FuzzyDate;
+import org.orcid.jaxb.model.v3.release.common.Organization;
+import org.orcid.jaxb.model.v3.release.common.Url;
+import org.orcid.jaxb.model.v3.release.record.FundingContributor;
+
+/**
+ * Interface for factory classes that creates common ORCID objects.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidCommonObjectFactory {
+
+    /**
+     * Creates an instance of {@link FuzzyDate} if the given metadata value
+     * represent a date with a supported format.
+     *
+     * @param  metadataValue the metadata value
+     * @return               the FuzzyDate istance, if any
+     */
+    public Optional<FuzzyDate> createFuzzyDate(MetadataValue metadataValue);
+
+    /**
+     * Creates an instance of {@link Organization} from the given orgUnit item.
+     *
+     * @param  context the DSpace context
+     * @param  orgUnit the orgUnit item
+     * @return         the created Organization's instance, if any
+     */
+    public Optional<Organization> createOrganization(Context context, Item orgUnit);
+
+    /**
+     * Creates an instance of {@link Contributor} from the given metadata value.
+     *
+     * @param  context       the DSpace context
+     * @param  metadataValue the metadata value
+     * @param  role          the contributor role
+     * @return               the created Contributor instance, if any
+     */
+    public Optional<Contributor> createContributor(Context context, MetadataValue metadataValue, ContributorRole role);
+
+    /**
+     * Creates an instance of {@link FundingContributor} from the given metadata
+     * value.
+     *
+     * @param  context       the DSpace context
+     * @param  metadataValue the metadata value
+     * @param  role          the contributor role
+     * @return               the created FundingContributor instance, if any
+     */
+    public Optional<FundingContributor> createFundingContributor(Context context, MetadataValue metadataValue,
+        FundingContributorRole role);
+
+    /**
+     * Creates an instance of {@link Url} from the given item.
+     * @param  context the DSpace context
+     * @param  item    the item
+     * @return         the created Url instance, if any
+     */
+    public Optional<Url> createUrl(Context context, Item item);
+
+    /**
+     * Creates an instance of {@link Country} from the given metadata value.
+     *
+     * @param  context                  the DSpace context
+     * @param  metadataValue            the metadata value
+     * @return                          the created Country instance, if any
+     * @throws OrcidValidationException if the given metadata value is not a valid
+     *                                  ISO 3611 country
+     */
+    public Optional<Country> createCountry(Context context, MetadataValue metadataValue)
+        throws OrcidValidationException;
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidEntityFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidEntityFactory.java
new file mode 100644
index 0000000000..3fbad15911
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidEntityFactory.java
@@ -0,0 +1,43 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.orcid.jaxb.model.v3.release.record.Activity;
+
+/**
+ * Interface to mark factories of Orcid entities.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidEntityFactory {
+
+    /**
+     * Placeholder used to refer the item handle on fields mapping.
+     */
+    String SIMPLE_HANDLE_PLACEHOLDER = "$simple-handle";
+
+    /**
+     * Returns the entity type created from this factory.
+     *
+     * @return the entity type
+     */
+    public OrcidEntityType getEntityType();
+
+    /**
+     * Creates an ORCID activity from the given object.
+     *
+     * @param  context the DSpace context
+     * @param  item    the item
+     * @return         the created activity instance
+     */
+    public Activity createOrcidObject(Context context, Item item);
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidFactoryUtils.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidFactoryUtils.java
new file mode 100644
index 0000000000..4b8c1178ef
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidFactoryUtils.java
@@ -0,0 +1,68 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Utility class for Orcid factory classes. This is used to parse the
+ * configuration of ORCID entities defined in orcid.cfg (for example see
+ * contributors and external ids configuration).
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public final class OrcidFactoryUtils {
+
+    private OrcidFactoryUtils() {
+
+    }
+
+    /**
+     * Parse the given configurations value and returns a map with metadata fields
+     * as keys and types/sources as values. The expected configuration syntax is a
+     * list of values field::type separated by commas.
+     *
+     * @param  configurations the configurations to parse
+     * @return                the configurations parsing result as map
+     */
+    public static Map<String, String> parseConfigurations(String configurations) {
+        Map<String, String> configurationMap = new HashMap<String, String>();
+        if (StringUtils.isBlank(configurations)) {
+            return configurationMap;
+        }
+
+        for (String configuration : configurations.split(",")) {
+            String[] configurationSections = parseConfiguration(configuration);
+            configurationMap.put(configurationSections[0], configurationSections[1]);
+        }
+
+        return configurationMap;
+    }
+
+    /**
+     * Parse the given configuration value and returns it's section. The expected
+     * configuration syntax is field::type.
+     *
+     * @param  configuration         the configuration to parse
+     * @return                       the configuration sections
+     * @throws IllegalStateException if the given configuration is not valid
+     */
+    private static String[] parseConfiguration(String configuration) {
+        String[] configurations = configuration.split("::");
+        if (configurations.length != 2) {
+            throw new IllegalStateException(
+                "The configuration '" + configuration + "' is not valid. Expected field::type");
+        }
+        return configurations;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidProfileSectionFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidProfileSectionFactory.java
new file mode 100644
index 0000000000..731b6f84a3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidProfileSectionFactory.java
@@ -0,0 +1,78 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory;
+
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.profile.OrcidProfileSyncPreference;
+
+/**
+ * Interface for classes that creates ORCID profile section object.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidProfileSectionFactory {
+
+    /**
+     * Creates an instance of an ORCID object starting from the metadata values
+     *
+     * @param  context        the DSpace Context
+     * @param  metadataValues the metadata values
+     * @return                the ORCID object
+     */
+    public Object create(Context context, List<MetadataValue> metadataValues);
+
+    /**
+     * Returns the profile section type related to this factory.
+     *
+     * @return the profile section type
+     */
+    public OrcidProfileSectionType getProfileSectionType();
+
+    /**
+     * Returns the profile synchronization preference related to this factory.
+     *
+     * @return the synchronization preference
+     */
+    public OrcidProfileSyncPreference getSynchronizationPreference();
+
+    /**
+     * Returns all the metadata fields involved in the profile section
+     * configuration.
+     *
+     * @return the metadataFields
+     */
+    public List<String> getMetadataFields();
+
+    /**
+     * Given the input item's metadata values generate a metadata signature for each
+     * metadata field groups handled by this factory or for each metadata fields if
+     * the factory is configured with single metadata fields.
+     *
+     * @param  context the DSpace context
+     * @param  item    the item
+     * @return         the metadata signatures
+     */
+    public List<String> getMetadataSignatures(Context context, Item item);
+
+    /**
+     * Returns a description of the item's metadata values related to the given
+     * signature.
+     *
+     * @param  context   the DSpace context
+     * @param  item      the item
+     * @param  signature the metadata signature
+     * @return           the metadata values description
+     */
+    public String getDescription(Context context, Item item, String signature);
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java
new file mode 100644
index 0000000000..2c272e620c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java
@@ -0,0 +1,73 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory.impl;
+
+import static java.lang.String.format;
+
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Abstract class for that handle commons behaviors of all the available orcid
+ * profile section factories.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public abstract class AbstractOrcidProfileSectionFactory implements OrcidProfileSectionFactory {
+
+    protected final OrcidProfileSectionType sectionType;
+
+    protected final OrcidProfileSyncPreference preference;
+
+    @Autowired
+    protected ItemService itemService;
+
+    @Autowired
+    protected OrcidCommonObjectFactory orcidCommonObjectFactory;
+
+    @Autowired
+    protected MetadataSignatureGenerator metadataSignatureGenerator;
+
+    public AbstractOrcidProfileSectionFactory(OrcidProfileSectionType sectionType,
+        OrcidProfileSyncPreference preference) {
+        this.sectionType = sectionType;
+        this.preference = preference;
+
+        if (!getSupportedTypes().contains(sectionType)) {
+            throw new IllegalArgumentException(format("The ORCID configuration does not support "
+                + "the section type %s. Supported types are %s", sectionType, getSupportedTypes()));
+        }
+    }
+
+    protected abstract List<OrcidProfileSectionType> getSupportedTypes();
+
+    @Override
+    public OrcidProfileSectionType getProfileSectionType() {
+        return sectionType;
+    }
+
+    @Override
+    public OrcidProfileSyncPreference getSynchronizationPreference() {
+        return preference;
+    }
+
+    protected List<MetadataValue> getMetadataValues(Item item, String metadataField) {
+        return itemService.getMetadataByMetadataString(item, metadataField);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
new file mode 100644
index 0000000000..2f47aa53d6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
@@ -0,0 +1,308 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory.impl;
+
+import static java.util.Optional.empty;
+import static java.util.Optional.of;
+import static java.util.Optional.ofNullable;
+import static org.apache.commons.lang3.EnumUtils.isValidEnum;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+import static org.orcid.jaxb.model.common.SequenceType.ADDITIONAL;
+import static org.orcid.jaxb.model.common.SequenceType.FIRST;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataFieldName;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.exception.OrcidValidationException;
+import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
+import org.dspace.orcid.model.validator.OrcidValidationError;
+import org.dspace.util.MultiFormatDateParser;
+import org.dspace.util.SimpleMapConverter;
+import org.orcid.jaxb.model.common.ContributorRole;
+import org.orcid.jaxb.model.common.FundingContributorRole;
+import org.orcid.jaxb.model.common.Iso3166Country;
+import org.orcid.jaxb.model.v3.release.common.Contributor;
+import org.orcid.jaxb.model.v3.release.common.ContributorAttributes;
+import org.orcid.jaxb.model.v3.release.common.Country;
+import org.orcid.jaxb.model.v3.release.common.CreditName;
+import org.orcid.jaxb.model.v3.release.common.DisambiguatedOrganization;
+import org.orcid.jaxb.model.v3.release.common.FuzzyDate;
+import org.orcid.jaxb.model.v3.release.common.Organization;
+import org.orcid.jaxb.model.v3.release.common.OrganizationAddress;
+import org.orcid.jaxb.model.v3.release.common.Url;
+import org.orcid.jaxb.model.v3.release.record.FundingContributor;
+import org.orcid.jaxb.model.v3.release.record.FundingContributorAttributes;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OrcidCommonObjectFactory}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidCommonObjectFactoryImpl implements OrcidCommonObjectFactory {
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private OrcidConfiguration orcidConfiguration;
+
+    @Autowired
+    private HandleService handleService;
+
+    private SimpleMapConverter countryConverter;
+
+    private String organizationTitleField;
+
+    private String organizationCityField;
+
+    private String organizationCountryField;
+
+    private String contributorEmailField;
+
+    private String contributorOrcidField;
+
+    private Map<String, String> disambiguatedOrganizationIdentifierFields = new HashMap<>();
+
+    @Override
+    public Optional<FuzzyDate> createFuzzyDate(MetadataValue metadataValue) {
+
+        if (isUnprocessableValue(metadataValue)) {
+            return empty();
+        }
+
+        Date date = MultiFormatDateParser.parse(metadataValue.getValue());
+        if (date == null) {
+            return empty();
+        }
+
+        LocalDate localDate = convertToLocalDate(date);
+        return of(FuzzyDate.valueOf(localDate.getYear(), localDate.getMonthValue(), localDate.getDayOfMonth()));
+    }
+
+    @Override
+    public Optional<Organization> createOrganization(Context context, Item orgUnit) {
+
+        if (orgUnit == null) {
+            return Optional.empty();
+        }
+
+        Organization organization = new Organization();
+
+        organization.setName(getMetadataValue(orgUnit, organizationTitleField));
+        organization.setAddress(createOrganizationAddress(orgUnit));
+        organization.setDisambiguatedOrganization(createDisambiguatedOrganization(orgUnit));
+
+        return of(organization);
+    }
+
+    @Override
+    public Optional<Contributor> createContributor(Context context, MetadataValue metadataValue, ContributorRole role) {
+        if (isUnprocessableValue(metadataValue)) {
+            return empty();
+        }
+
+        Contributor contributor = new Contributor();
+        contributor.setCreditName(new CreditName(metadataValue.getValue()));
+        contributor.setContributorAttributes(getContributorAttributes(metadataValue, role));
+
+        return of(contributor);
+    }
+
+    @Override
+    public Optional<FundingContributor> createFundingContributor(Context context, MetadataValue metadataValue,
+        FundingContributorRole role) {
+
+        if (isUnprocessableValue(metadataValue)) {
+            return empty();
+        }
+
+        FundingContributor contributor = new FundingContributor();
+        contributor.setCreditName(new CreditName(metadataValue.getValue()));
+        contributor.setContributorAttributes(getFundingContributorAttributes(metadataValue, role));
+
+        return of(contributor);
+    }
+
+    @Override
+    public Optional<Url> createUrl(Context context, Item item) {
+        String handle = item.getHandle();
+        if (StringUtils.isBlank(handle)) {
+            return empty();
+        }
+
+        return of(new Url(handleService.getCanonicalForm(handle)));
+    }
+
+    @Override
+    public Optional<Country> createCountry(Context context, MetadataValue metadataValue) {
+
+        if (isUnprocessableValue(metadataValue)) {
+            return empty();
+        }
+
+        Optional<Iso3166Country> country = convertToIso3166Country(metadataValue.getValue());
+
+        if (country.isEmpty()) {
+            throw new OrcidValidationException(OrcidValidationError.INVALID_COUNTRY);
+        }
+
+        return country.map(isoCountry -> new Country(isoCountry));
+    }
+
+    private ContributorAttributes getContributorAttributes(MetadataValue metadataValue, ContributorRole role) {
+        ContributorAttributes attributes = new ContributorAttributes();
+        attributes.setContributorRole(role != null ? role : null);
+        attributes.setContributorSequence(metadataValue.getPlace() == 0 ? FIRST : ADDITIONAL);
+        return attributes;
+    }
+
+    private OrganizationAddress createOrganizationAddress(Item organizationItem) {
+        OrganizationAddress address = new OrganizationAddress();
+
+        address.setCity(getMetadataValue(organizationItem, organizationCityField));
+
+        convertToIso3166Country(getMetadataValue(organizationItem, organizationCountryField))
+            .ifPresent(address::setCountry);
+
+        return address;
+    }
+
+    private FundingContributorAttributes getFundingContributorAttributes(MetadataValue metadataValue,
+        FundingContributorRole role) {
+        FundingContributorAttributes attributes = new FundingContributorAttributes();
+        attributes.setContributorRole(role != null ? role : null);
+        return attributes;
+    }
+
+    private DisambiguatedOrganization createDisambiguatedOrganization(Item organizationItem) {
+
+        for (String identifierField : disambiguatedOrganizationIdentifierFields.keySet()) {
+
+            String source = disambiguatedOrganizationIdentifierFields.get(identifierField);
+            String identifier = getMetadataValue(organizationItem, identifierField);
+
+            if (isNotBlank(identifier)) {
+                DisambiguatedOrganization disambiguatedOrganization = new DisambiguatedOrganization();
+                disambiguatedOrganization.setDisambiguatedOrganizationIdentifier(identifier);
+                disambiguatedOrganization.setDisambiguationSource(source);
+                return disambiguatedOrganization;
+            }
+
+        }
+
+        return null;
+    }
+
+    private Optional<Iso3166Country> convertToIso3166Country(String countryValue) {
+        return ofNullable(countryValue)
+            .map(value -> countryConverter != null ? countryConverter.getValue(value) : value)
+            .filter(value -> isValidEnum(Iso3166Country.class, value))
+            .map(value -> Iso3166Country.fromValue(value));
+    }
+
+    private boolean isUnprocessableValue(MetadataValue value) {
+        return value == null || isBlank(value.getValue());
+    }
+
+    private String getMetadataValue(Item item, String metadataField) {
+        if (StringUtils.isNotBlank(metadataField)) {
+            return itemService.getMetadataFirstValue(item, new MetadataFieldName(metadataField), Item.ANY);
+        } else {
+            return null;
+        }
+    }
+
+    private LocalDate convertToLocalDate(Date date) {
+        return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+    }
+
+    public String getOrganizationCityField() {
+        return organizationCityField;
+    }
+
+    public String getOrganizationCountryField() {
+        return organizationCountryField;
+    }
+
+    public Map<String, String> getDisambiguatedOrganizationIdentifierFields() {
+        return disambiguatedOrganizationIdentifierFields;
+    }
+
+    public String getContributorEmailField() {
+        return contributorEmailField;
+    }
+
+    public String getContributorOrcidField() {
+        return contributorOrcidField;
+    }
+
+    public void setItemService(ItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    public OrcidConfiguration getOrcidConfiguration() {
+        return orcidConfiguration;
+    }
+
+    public void setOrcidConfiguration(OrcidConfiguration orcidConfiguration) {
+        this.orcidConfiguration = orcidConfiguration;
+    }
+
+    public void setOrganizationCityField(String organizationCityField) {
+        this.organizationCityField = organizationCityField;
+    }
+
+    public void setOrganizationCountryField(String organizationCountryField) {
+        this.organizationCountryField = organizationCountryField;
+    }
+
+    public void setContributorEmailField(String contributorEmailField) {
+        this.contributorEmailField = contributorEmailField;
+    }
+
+    public void setContributorOrcidField(String contributorOrcidField) {
+        this.contributorOrcidField = contributorOrcidField;
+    }
+
+    public void setDisambiguatedOrganizationIdentifierFields(String disambiguatedOrganizationIds) {
+        this.disambiguatedOrganizationIdentifierFields = parseConfigurations(disambiguatedOrganizationIds);
+    }
+
+    public SimpleMapConverter getCountryConverter() {
+        return countryConverter;
+    }
+
+    public void setCountryConverter(SimpleMapConverter countryConverter) {
+        this.countryConverter = countryConverter;
+    }
+
+    public String getOrganizationTitleField() {
+        return organizationTitleField;
+    }
+
+    public void setOrganizationTitleField(String organizationTitleField) {
+        this.organizationTitleField = organizationTitleField;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
new file mode 100644
index 0000000000..890b54f12b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
@@ -0,0 +1,301 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory.impl;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Currency;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.Relationship;
+import org.dspace.content.RelationshipType;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.content.service.RelationshipTypeService;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidFundingFieldMapping;
+import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
+import org.dspace.orcid.model.factory.OrcidEntityFactory;
+import org.orcid.jaxb.model.common.FundingContributorRole;
+import org.orcid.jaxb.model.common.FundingType;
+import org.orcid.jaxb.model.v3.release.common.Amount;
+import org.orcid.jaxb.model.v3.release.common.FuzzyDate;
+import org.orcid.jaxb.model.v3.release.common.Organization;
+import org.orcid.jaxb.model.v3.release.common.Title;
+import org.orcid.jaxb.model.v3.release.common.Url;
+import org.orcid.jaxb.model.v3.release.record.Activity;
+import org.orcid.jaxb.model.v3.release.record.ExternalID;
+import org.orcid.jaxb.model.v3.release.record.ExternalIDs;
+import org.orcid.jaxb.model.v3.release.record.Funding;
+import org.orcid.jaxb.model.v3.release.record.FundingContributor;
+import org.orcid.jaxb.model.v3.release.record.FundingContributors;
+import org.orcid.jaxb.model.v3.release.record.FundingTitle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OrcidEntityFactory} that creates instances of
+ * {@link Funding}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidFundingFactory implements OrcidEntityFactory {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidFundingFactory.class);
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private OrcidCommonObjectFactory orcidCommonObjectFactory;
+
+    @Autowired
+    private RelationshipTypeService relationshipTypeService;
+
+    @Autowired
+    private RelationshipService relationshipService;
+
+    private OrcidFundingFieldMapping fieldMapping;
+
+    @Override
+    public OrcidEntityType getEntityType() {
+        return OrcidEntityType.FUNDING;
+    }
+
+    @Override
+    public Activity createOrcidObject(Context context, Item item) {
+        Funding funding = new Funding();
+        funding.setContributors(getContributors(context, item));
+        funding.setDescription(getDescription(context, item));
+        funding.setEndDate(getEndDate(context, item));
+        funding.setExternalIdentifiers(getExternalIds(context, item));
+        funding.setOrganization(getOrganization(context, item));
+        funding.setStartDate(getStartDate(context, item));
+        funding.setTitle(getTitle(context, item));
+        funding.setType(getType(context, item));
+        funding.setUrl(getUrl(context, item));
+        funding.setAmount(getAmount(context, item));
+        return funding;
+    }
+
+    private FundingContributors getContributors(Context context, Item item) {
+        FundingContributors fundingContributors = new FundingContributors();
+        getMetadataValues(context, item, fieldMapping.getContributorFields().keySet()).stream()
+            .map(metadataValue -> getFundingContributor(context, metadataValue))
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .forEach(fundingContributors.getContributor()::add);
+        return fundingContributors;
+    }
+
+    private Optional<FundingContributor> getFundingContributor(Context context, MetadataValue metadataValue) {
+        String metadataField = metadataValue.getMetadataField().toString('.');
+        FundingContributorRole role = fieldMapping.getContributorFields().get(metadataField);
+        return orcidCommonObjectFactory.createFundingContributor(context, metadataValue, role);
+    }
+
+
+    private String getDescription(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getDescriptionField())
+            .map(MetadataValue::getValue)
+            .orElse(null);
+    }
+
+    private FuzzyDate getEndDate(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getEndDateField())
+            .flatMap(metadataValue -> orcidCommonObjectFactory.createFuzzyDate(metadataValue))
+            .orElse(null);
+    }
+
+    private ExternalIDs getExternalIds(Context context, Item item) {
+        ExternalIDs externalIdentifiers = new ExternalIDs();
+
+        getMetadataValues(context, item, fieldMapping.getExternalIdentifierFields().keySet()).stream()
+            .map(this::getExternalId)
+            .forEach(externalIdentifiers.getExternalIdentifier()::add);
+
+        return externalIdentifiers;
+    }
+
+    private ExternalID getExternalId(MetadataValue metadataValue) {
+        String metadataField = metadataValue.getMetadataField().toString('.');
+        return getExternalId(fieldMapping.getExternalIdentifierFields().get(metadataField), metadataValue.getValue());
+    }
+
+    private ExternalID getExternalId(String type, String value) {
+        ExternalID externalID = new ExternalID();
+        externalID.setType(type);
+        externalID.setValue(value);
+        externalID.setRelationship(org.orcid.jaxb.model.common.Relationship.SELF);
+        return externalID;
+    }
+
+    /**
+     * Returns an Organization ORCID entity related to the given item. The
+     * relationship type configured with
+     * orcid.mapping.funding.organization-relationship-type is the relationship used
+     * to search the Organization of the given project item.
+     */
+    private Organization getOrganization(Context context, Item item) {
+
+        try {
+
+            return relationshipTypeService.findByLeftwardOrRightwardTypeName(context,
+                fieldMapping.getOrganizationRelationshipType()).stream()
+                .flatMap(relationshipType -> getRelationships(context, item, relationshipType))
+                .map(relationship -> getRelatedItem(item, relationship))
+                .flatMap(orgUnit -> orcidCommonObjectFactory.createOrganization(context, orgUnit).stream())
+                .findFirst()
+                .orElse(null);
+
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    private Stream<Relationship> getRelationships(Context context, Item item, RelationshipType relationshipType) {
+        try {
+            return relationshipService.findByItemAndRelationshipType(context, item, relationshipType).stream();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Item getRelatedItem(Item item, Relationship relationship) {
+        return item.equals(relationship.getLeftItem()) ? relationship.getRightItem() : relationship.getLeftItem();
+    }
+
+    private FuzzyDate getStartDate(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getStartDateField())
+            .flatMap(metadataValue -> orcidCommonObjectFactory.createFuzzyDate(metadataValue))
+            .orElse(null);
+    }
+
+    private FundingTitle getTitle(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getTitleField())
+            .map(metadataValue -> getFundingTitle(context, metadataValue))
+            .orElse(null);
+    }
+
+    private FundingTitle getFundingTitle(Context context, MetadataValue metadataValue) {
+        FundingTitle fundingTitle = new FundingTitle();
+        fundingTitle.setTitle(new Title(metadataValue.getValue()));
+        return fundingTitle;
+    }
+
+    /**
+     * Returns an instance of FundingType taking the type from the given item. The
+     * metadata field to be used to retrieve the item's type is related to the
+     * configured typeField (orcid.mapping.funding.type).
+     */
+    private FundingType getType(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getTypeField())
+            .map(type -> fieldMapping.convertType(type.getValue()))
+            .flatMap(this::getFundingType)
+            .orElse(FundingType.CONTRACT);
+    }
+
+    private Optional<FundingType> getFundingType(String type) {
+        try {
+            return Optional.ofNullable(FundingType.fromValue(type));
+        } catch (IllegalArgumentException ex) {
+            LOGGER.warn("The type {} is not valid for ORCID fundings", type);
+            return Optional.empty();
+        }
+    }
+
+    private Url getUrl(Context context, Item item) {
+        return orcidCommonObjectFactory.createUrl(context, item).orElse(null);
+    }
+
+    /**
+     * Returns an Amount instance taking the amount and currency value from the
+     * configured metadata values of the given item, if any.
+     */
+    private Amount getAmount(Context context, Item item) {
+
+        Optional<String> amount = getAmountValue(context, item);
+        Optional<String> currency = getCurrencyValue(context, item);
+
+        if (amount.isEmpty() || currency.isEmpty()) {
+            return null;
+        }
+
+        return getAmount(amount.get(), currency.get());
+    }
+
+    /**
+     * Returns the amount value of the configured metadata field
+     * orcid.mapping.funding.amount
+     */
+    private Optional<String> getAmountValue(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getAmountField())
+            .map(MetadataValue::getValue);
+    }
+
+    /**
+     * Returns the amount value of the configured metadata field
+     * orcid.mapping.funding.amount.currency (if configured using the converter
+     * orcid.mapping.funding.amount.currency.converter).
+     */
+    private Optional<String> getCurrencyValue(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getAmountCurrencyField())
+            .map(currency -> fieldMapping.convertAmountCurrency(currency.getValue()))
+            .filter(currency -> isValidCurrency(currency));
+    }
+
+    private boolean isValidCurrency(String currency) {
+        try {
+            return currency != null && Currency.getInstance(currency) != null;
+        } catch (IllegalArgumentException ex) {
+            return false;
+        }
+    }
+
+    private Amount getAmount(String amount, String currency) {
+        Amount amountObj = new Amount();
+        amountObj.setContent(amount);
+        amountObj.setCurrencyCode(currency);
+        return amountObj;
+    }
+
+    private List<MetadataValue> getMetadataValues(Context context, Item item, Collection<String> metadataFields) {
+        return metadataFields.stream()
+            .flatMap(metadataField -> itemService.getMetadataByMetadataString(item, metadataField).stream())
+            .collect(Collectors.toList());
+    }
+
+    private Optional<MetadataValue> getMetadataValue(Context context, Item item, String metadataField) {
+        if (isBlank(metadataField)) {
+            return Optional.empty();
+        }
+        return itemService.getMetadataByMetadataString(item, metadataField).stream().findFirst()
+            .filter(metadataValue -> isNotBlank(metadataValue.getValue()));
+    }
+
+    public OrcidFundingFieldMapping getFieldMapping() {
+        return fieldMapping;
+    }
+
+    public void setFieldMapping(OrcidFundingFieldMapping fieldMapping) {
+        this.fieldMapping = fieldMapping;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java
new file mode 100644
index 0000000000..077bb195a6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java
@@ -0,0 +1,75 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory.impl;
+
+import static org.dspace.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
+import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.dspace.content.MetadataValue;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.orcid.jaxb.model.common.Relationship;
+import org.orcid.jaxb.model.v3.release.common.Url;
+import org.orcid.jaxb.model.v3.release.record.PersonExternalIdentifier;
+
+/**
+ * Implementation of {@link OrcidProfileSectionFactory} that model an personal
+ * external id.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidPersonExternalIdentifierFactory extends OrcidSimpleValueObjectFactory {
+
+    private Map<String, String> externalIds = new HashMap<>();
+
+    public OrcidPersonExternalIdentifierFactory(OrcidProfileSectionType sectionType,
+        OrcidProfileSyncPreference preference) {
+        super(sectionType, preference);
+    }
+
+    @Override
+    public List<OrcidProfileSectionType> getSupportedTypes() {
+        return List.of(EXTERNAL_IDS);
+    }
+
+    @Override
+    protected Object create(Context context, MetadataValue metadataValue) {
+
+        String currentMetadataField = metadataValue.getMetadataField().toString('.');
+        String externalIdType = externalIds.get(currentMetadataField);
+
+        if (externalIdType == null) {
+            throw new IllegalArgumentException("Metadata field not supported: " + currentMetadataField);
+        }
+
+        PersonExternalIdentifier externalId = new PersonExternalIdentifier();
+        externalId.setValue(metadataValue.getValue());
+        externalId.setType(externalIdType);
+        externalId.setRelationship(Relationship.SELF);
+        externalId.setUrl(new Url(metadataValue.getValue()));
+
+        return externalId;
+    }
+
+    public Map<String, String> getExternalIds() {
+        return externalIds;
+    }
+
+    public void setExternalIds(String externalIds) {
+        this.externalIds = parseConfigurations(externalIds);
+        setMetadataFields(this.externalIds.keySet().stream().collect(Collectors.joining(",")));
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java
new file mode 100644
index 0000000000..4ddfbe47a3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java
@@ -0,0 +1,149 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory.impl;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static org.dspace.orcid.model.OrcidProfileSectionType.COUNTRY;
+import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
+import static org.dspace.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.orcid.jaxb.model.v3.release.common.Country;
+import org.orcid.jaxb.model.v3.release.common.Url;
+import org.orcid.jaxb.model.v3.release.record.Address;
+import org.orcid.jaxb.model.v3.release.record.Keyword;
+import org.orcid.jaxb.model.v3.release.record.OtherName;
+import org.orcid.jaxb.model.v3.release.record.ResearcherUrl;
+
+/**
+ * Implementation of {@link OrcidProfileSectionFactory} that creates ORCID
+ * objects with a single value.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidSimpleValueObjectFactory extends AbstractOrcidProfileSectionFactory {
+
+    private List<String> metadataFields = new ArrayList<String>();
+
+    public OrcidSimpleValueObjectFactory(OrcidProfileSectionType sectionType, OrcidProfileSyncPreference preference) {
+        super(sectionType, preference);
+    }
+
+    @Override
+    public List<OrcidProfileSectionType> getSupportedTypes() {
+        return List.of(COUNTRY, KEYWORDS, OTHER_NAMES, RESEARCHER_URLS);
+    }
+
+    @Override
+    public Object create(Context context, List<MetadataValue> metadataValues) {
+
+        if (CollectionUtils.isEmpty(metadataValues)) {
+            throw new IllegalArgumentException("No metadata values provided to create ORCID object with simple value");
+        }
+
+        if (metadataValues.size() > 1) {
+            throw new IllegalArgumentException("Multiple metadata values not supported: " + metadataValues);
+        }
+
+        MetadataValue metadataValue = metadataValues.get(0);
+        String currentMetadataField = metadataValue.getMetadataField().toString('.');
+
+        if (!metadataFields.contains(currentMetadataField)) {
+            throw new IllegalArgumentException("Metadata field not supported: " + currentMetadataField);
+        }
+
+        return create(context, metadataValue);
+    }
+
+    @Override
+    public List<String> getMetadataSignatures(Context context, Item item) {
+        return metadataFields.stream()
+            .flatMap(metadataField -> getMetadataValues(item, metadataField).stream())
+            .map(metadataValue -> metadataSignatureGenerator.generate(context, List.of(metadataValue)))
+            .collect(Collectors.toList());
+    }
+
+    @Override
+    public String getDescription(Context context, Item item, String signature) {
+        List<MetadataValue> metadataValues = metadataSignatureGenerator.findBySignature(context, item, signature);
+        return CollectionUtils.isNotEmpty(metadataValues) ? metadataValues.get(0).getValue() : null;
+    }
+
+    /**
+     * Create an instance of ORCID profile section based on the configured profile
+     * section type, taking the value from the given metadataValue.
+     */
+    protected Object create(Context context, MetadataValue metadataValue) {
+        switch (getProfileSectionType()) {
+            case COUNTRY:
+                return createAddress(context, metadataValue);
+            case KEYWORDS:
+                return createKeyword(metadataValue);
+            case OTHER_NAMES:
+                return createOtherName(metadataValue);
+            case RESEARCHER_URLS:
+                return createResearcherUrl(metadataValue);
+            default:
+                throw new IllegalStateException("OrcidSimpleValueObjectFactory does not support type "
+                    + getProfileSectionType());
+        }
+    }
+
+    private ResearcherUrl createResearcherUrl(MetadataValue metadataValue) {
+        ResearcherUrl researcherUrl = new ResearcherUrl();
+        researcherUrl.setUrl(new Url(metadataValue.getValue()));
+        return researcherUrl;
+    }
+
+    private OtherName createOtherName(MetadataValue metadataValue) {
+        OtherName otherName = new OtherName();
+        otherName.setContent(metadataValue.getValue());
+        return otherName;
+    }
+
+    private Keyword createKeyword(MetadataValue metadataValue) {
+        Keyword keyword = new Keyword();
+        keyword.setContent(metadataValue.getValue());
+        return keyword;
+    }
+
+    private Address createAddress(Context context, MetadataValue metadataValue) {
+        return orcidCommonObjectFactory.createCountry(context, metadataValue)
+            .map(this::createAddress)
+            .orElseThrow(() -> new IllegalArgumentException("No address creatable "
+                + "from value " + metadataValue.getValue()));
+    }
+
+    private Address createAddress(Country country) {
+        Address address = new Address();
+        address.setCountry(country);
+        return address;
+    }
+
+    public void setMetadataFields(String metadataFields) {
+        this.metadataFields = metadataFields != null ? asList(metadataFields.split(",")) : emptyList();
+    }
+
+    @Override
+    public List<String> getMetadataFields() {
+        return metadataFields;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
new file mode 100644
index 0000000000..53b46d8256
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
@@ -0,0 +1,283 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.factory.impl;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.orcid.jaxb.model.common.Relationship.SELF;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidWorkFieldMapping;
+import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
+import org.dspace.orcid.model.factory.OrcidEntityFactory;
+import org.orcid.jaxb.model.common.ContributorRole;
+import org.orcid.jaxb.model.common.LanguageCode;
+import org.orcid.jaxb.model.common.Relationship;
+import org.orcid.jaxb.model.common.WorkType;
+import org.orcid.jaxb.model.v3.release.common.Contributor;
+import org.orcid.jaxb.model.v3.release.common.PublicationDate;
+import org.orcid.jaxb.model.v3.release.common.Subtitle;
+import org.orcid.jaxb.model.v3.release.common.Title;
+import org.orcid.jaxb.model.v3.release.common.Url;
+import org.orcid.jaxb.model.v3.release.record.Activity;
+import org.orcid.jaxb.model.v3.release.record.ExternalID;
+import org.orcid.jaxb.model.v3.release.record.ExternalIDs;
+import org.orcid.jaxb.model.v3.release.record.Work;
+import org.orcid.jaxb.model.v3.release.record.WorkContributors;
+import org.orcid.jaxb.model.v3.release.record.WorkTitle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OrcidEntityFactory} that creates instances of
+ * {@link Work}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidWorkFactory implements OrcidEntityFactory {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidWorkFactory.class);
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private OrcidCommonObjectFactory orcidCommonObjectFactory;
+
+    private OrcidWorkFieldMapping fieldMapping;
+
+    @Override
+    public OrcidEntityType getEntityType() {
+        return OrcidEntityType.PUBLICATION;
+    }
+
+    @Override
+    public Activity createOrcidObject(Context context, Item item) {
+        Work work = new Work();
+        work.setJournalTitle(getJournalTitle(context, item));
+        work.setWorkContributors(getWorkContributors(context, item));
+        work.setWorkTitle(getWorkTitle(context, item));
+        work.setPublicationDate(getPublicationDate(context, item));
+        work.setWorkExternalIdentifiers(getWorkExternalIds(context, item));
+        work.setWorkType(getWorkType(context, item));
+        work.setShortDescription(getShortDescription(context, item));
+        work.setLanguageCode(getLanguageCode(context, item));
+        work.setUrl(getUrl(context, item));
+        return work;
+    }
+
+    private Title getJournalTitle(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getJournalTitleField())
+            .map(metadataValue -> new Title(metadataValue.getValue()))
+            .orElse(null);
+    }
+
+    private WorkContributors getWorkContributors(Context context, Item item) {
+        Map<String, ContributorRole> contributorFields = fieldMapping.getContributorFields();
+        List<Contributor> contributors = getMetadataValues(context, item, contributorFields.keySet()).stream()
+            .map(metadataValue -> getContributor(context, metadataValue))
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .collect(Collectors.toList());
+        return new WorkContributors(contributors);
+    }
+
+    private Optional<Contributor> getContributor(Context context, MetadataValue metadataValue) {
+        Map<String, ContributorRole> contributorFields = fieldMapping.getContributorFields();
+        ContributorRole role = contributorFields.get(metadataValue.getMetadataField().toString('.'));
+        return orcidCommonObjectFactory.createContributor(context, metadataValue, role);
+    }
+
+    /**
+     * Create an instance of WorkTitle from the given item.
+     */
+    private WorkTitle getWorkTitle(Context context, Item item) {
+        Optional<String> workTitleValue = getWorkTitleValue(context, item);
+        if (workTitleValue.isEmpty()) {
+            return null;
+        }
+
+        WorkTitle workTitle = new WorkTitle();
+        workTitle.setTitle(new Title(workTitleValue.get()));
+        getSubTitle(context, item).ifPresent(workTitle::setSubtitle);
+        return workTitle;
+    }
+
+    /**
+     * Take the work title from the configured metadata field of the given item
+     * (orcid.mapping.work.title), if any.
+     */
+    private Optional<String> getWorkTitleValue(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getTitleField())
+            .map(MetadataValue::getValue);
+    }
+
+    /**
+     * Take the work title from the configured metadata field of the given item
+     * (orcid.mapping.work.sub-title), if any.
+     */
+    private Optional<Subtitle> getSubTitle(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getSubTitleField())
+            .map(MetadataValue::getValue)
+            .map(Subtitle::new);
+    }
+
+    private PublicationDate getPublicationDate(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getPublicationDateField())
+            .flatMap(orcidCommonObjectFactory::createFuzzyDate)
+            .map(PublicationDate::new)
+            .orElse(null);
+    }
+
+    /**
+     * Creates an instance of ExternalIDs from the metadata values of the given
+     * item, using the orcid.mapping.funding.external-ids configuration.
+     */
+    private ExternalIDs getWorkExternalIds(Context context, Item item) {
+        ExternalIDs externalIdentifiers = new ExternalIDs();
+        externalIdentifiers.getExternalIdentifier().addAll(getWorkSelfExternalIds(context, item));
+        return externalIdentifiers;
+    }
+
+    /**
+     * Creates a list of ExternalID, one for orcid.mapping.funding.external-ids
+     * value, taking the values from the given item.
+     */
+    private List<ExternalID> getWorkSelfExternalIds(Context context, Item item) {
+
+        List<ExternalID> selfExternalIds = new ArrayList<ExternalID>();
+
+        Map<String, String> externalIdentifierFields = fieldMapping.getExternalIdentifierFields();
+
+        if (externalIdentifierFields.containsKey(SIMPLE_HANDLE_PLACEHOLDER)) {
+            String handleType = externalIdentifierFields.get(SIMPLE_HANDLE_PLACEHOLDER);
+            selfExternalIds.add(getExternalId(handleType, item.getHandle(), SELF));
+        }
+
+        getMetadataValues(context, item, externalIdentifierFields.keySet()).stream()
+            .map(this::getSelfExternalId)
+            .forEach(selfExternalIds::add);
+
+        return selfExternalIds;
+    }
+
+    /**
+     * Creates an instance of ExternalID taking the value from the given
+     * metadataValue. The type of the ExternalID is calculated using the
+     * orcid.mapping.funding.external-ids configuration. The relationship of the
+     * ExternalID is SELF.
+     */
+    private ExternalID getSelfExternalId(MetadataValue metadataValue) {
+        Map<String, String> externalIdentifierFields = fieldMapping.getExternalIdentifierFields();
+        String metadataField = metadataValue.getMetadataField().toString('.');
+        return getExternalId(externalIdentifierFields.get(metadataField), metadataValue.getValue(), SELF);
+    }
+
+    /**
+     * Creates an instance of ExternalID with the given type, value and
+     * relationship.
+     */
+    private ExternalID getExternalId(String type, String value, Relationship relationship) {
+        ExternalID externalID = new ExternalID();
+        externalID.setType(type);
+        externalID.setValue(value);
+        externalID.setRelationship(relationship);
+        return externalID;
+    }
+
+    /**
+     * Creates an instance of WorkType from the given item, taking the value fom the
+     * configured metadata field (orcid.mapping.work.type).
+     */
+    private WorkType getWorkType(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getTypeField())
+            .map(MetadataValue::getValue)
+            .map(type -> fieldMapping.convertType(type))
+            .flatMap(this::getWorkType)
+            .orElse(WorkType.UNDEFINED);
+    }
+
+    /**
+     * Creates an instance of WorkType from the given workType value, if valid.
+     */
+    private Optional<WorkType> getWorkType(String workType) {
+        try {
+            return Optional.ofNullable(WorkType.fromValue(workType));
+        } catch (IllegalArgumentException ex) {
+            LOGGER.warn("The type {} is not valid for ORCID works", workType);
+            return Optional.empty();
+        }
+    }
+
+    private String getShortDescription(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getShortDescriptionField())
+            .map(MetadataValue::getValue)
+            .orElse(null);
+    }
+
+    private String getLanguageCode(Context context, Item item) {
+        return getMetadataValue(context, item, fieldMapping.getLanguageField())
+            .map(MetadataValue::getValue)
+            .map(language -> fieldMapping.convertLanguage(language))
+            .filter(language -> isValidLanguage(language))
+            .orElse(null);
+    }
+
+    private boolean isValidLanguage(String language) {
+
+        if (isBlank(language)) {
+            return false;
+        }
+
+        boolean isValid = EnumUtils.isValidEnum(LanguageCode.class, language);
+        if (!isValid) {
+            LOGGER.warn("The language {} is not a valid language code for ORCID works", language);
+        }
+        return isValid;
+    }
+
+    private Url getUrl(Context context, Item item) {
+        return orcidCommonObjectFactory.createUrl(context, item).orElse(null);
+    }
+
+    private List<MetadataValue> getMetadataValues(Context context, Item item, Collection<String> metadataFields) {
+        return metadataFields.stream()
+            .flatMap(metadataField -> itemService.getMetadataByMetadataString(item, metadataField).stream())
+            .collect(Collectors.toList());
+    }
+
+    private Optional<MetadataValue> getMetadataValue(Context context, Item item, String metadataField) {
+
+        if (isBlank(metadataField)) {
+            return Optional.empty();
+        }
+
+        return itemService.getMetadataByMetadataString(item, metadataField).stream()
+            .filter(metadataValue -> isNotBlank(metadataValue.getValue()))
+            .findFirst();
+    }
+
+    public void setFieldMapping(OrcidWorkFieldMapping fieldMapping) {
+        this.fieldMapping = fieldMapping;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidationError.java b/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidationError.java
new file mode 100644
index 0000000000..36f92cf1c5
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidationError.java
@@ -0,0 +1,49 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.validator;
+
+/**
+ * Enum that model all the errors that could occurs during an ORCID object
+ * validation. These codes are used by the {@link OrcidValidator} to returns the
+ * validation error related to a specific ORCID entity. The values of this enum
+ * are returned from the OrcidHistoryRestRepository and can be used to show an
+ * error message to the users when they tries to synchronize some data with
+ * ORCID.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public enum OrcidValidationError {
+
+    AMOUNT_CURRENCY_REQUIRED("amount-currency.required"),
+    EXTERNAL_ID_REQUIRED("external-id.required"),
+    TITLE_REQUIRED("title.required"),
+    TYPE_REQUIRED("type.required"),
+    FUNDER_REQUIRED("funder.required"),
+    INVALID_COUNTRY("country.invalid"),
+    ORGANIZATION_NAME_REQUIRED("organization.name-required"),
+    PUBLICATION_DATE_INVALID("publication.date-invalid"),
+    ORGANIZATION_ADDRESS_REQUIRED("organization.address-required"),
+    ORGANIZATION_CITY_REQUIRED("organization.city-required"),
+    ORGANIZATION_COUNTRY_REQUIRED("organization.country-required"),
+    DISAMBIGUATED_ORGANIZATION_REQUIRED("disambiguated-organization.required"),
+    DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED("disambiguated-organization.value-required"),
+    DISAMBIGUATION_SOURCE_REQUIRED("disambiguation-source.required"),
+    DISAMBIGUATION_SOURCE_INVALID("disambiguation-source.invalid");
+
+    private final String code;
+
+    private OrcidValidationError(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidator.java b/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidator.java
new file mode 100644
index 0000000000..7b30717e2d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidator.java
@@ -0,0 +1,46 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.validator;
+
+import java.util.List;
+
+import org.orcid.jaxb.model.v3.release.record.Funding;
+import org.orcid.jaxb.model.v3.release.record.Work;
+
+/**
+ * Interface for classes that validate the ORCID entity objects.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidValidator {
+
+    /**
+     * Validate the given orcid object and returns the validation errors, if any.
+     *
+     * @param  object the ORCID object to validate
+     * @return        the validation errors, if any
+     */
+    List<OrcidValidationError> validate(Object object);
+
+    /**
+     * Validate the given work and returns the validation errors, if any.
+     *
+     * @param  work the work to validate
+     * @return      the validation errors, if any
+     */
+    List<OrcidValidationError> validateWork(Work work);
+
+    /**
+     * Validate the given funding and returns the validation errors, if any.
+     *
+     * @param  funding the funding to validate
+     * @return         the validation errors, if any
+     */
+    List<OrcidValidationError> validateFunding(Funding funding);
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/validator/impl/OrcidValidatorImpl.java b/dspace-api/src/main/java/org/dspace/orcid/model/validator/impl/OrcidValidatorImpl.java
new file mode 100644
index 0000000000..a599695c07
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/validator/impl/OrcidValidatorImpl.java
@@ -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/
+ */
+package org.dspace.orcid.model.validator.impl;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.lang3.ArrayUtils.contains;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.dspace.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.dspace.orcid.model.validator.OrcidValidationError;
+import org.dspace.orcid.model.validator.OrcidValidator;
+import org.dspace.services.ConfigurationService;
+import org.orcid.jaxb.model.v3.release.common.DisambiguatedOrganization;
+import org.orcid.jaxb.model.v3.release.common.Organization;
+import org.orcid.jaxb.model.v3.release.common.OrganizationAddress;
+import org.orcid.jaxb.model.v3.release.common.PublicationDate;
+import org.orcid.jaxb.model.v3.release.common.Year;
+import org.orcid.jaxb.model.v3.release.record.ExternalIDs;
+import org.orcid.jaxb.model.v3.release.record.Funding;
+import org.orcid.jaxb.model.v3.release.record.FundingTitle;
+import org.orcid.jaxb.model.v3.release.record.Work;
+import org.orcid.jaxb.model.v3.release.record.WorkTitle;
+
+/**
+ * Implementation of {@link OrcidValidator}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidValidatorImpl implements OrcidValidator {
+
+    private final ConfigurationService configurationService;
+
+    public OrcidValidatorImpl(ConfigurationService configurationService) {
+        this.configurationService = configurationService;
+    }
+
+    @Override
+    public List<OrcidValidationError> validate(Object object) {
+
+        if (object instanceof Work && isWorkValidationEnabled()) {
+            return validateWork((Work) object);
+        }
+
+        if (object instanceof Funding && isFundingValidationEnabled()) {
+            return validateFunding((Funding) object);
+        }
+
+        return Collections.emptyList();
+    }
+
+    /**
+     * A work is valid if has title, type, a valid publication date and at least one
+     * external id.
+     */
+    @Override
+    public List<OrcidValidationError> validateWork(Work work) {
+        List<OrcidValidationError> errors = new ArrayList<OrcidValidationError>();
+
+        WorkTitle title = work.getWorkTitle();
+        if (title == null || title.getTitle() == null || isBlank(title.getTitle().getContent())) {
+            errors.add(TITLE_REQUIRED);
+        }
+
+        if (work.getWorkType() == null) {
+            errors.add(TYPE_REQUIRED);
+        }
+
+        ExternalIDs externalIdentifiers = work.getExternalIdentifiers();
+
+        if (externalIdentifiers == null || isEmpty(externalIdentifiers.getExternalIdentifier())) {
+            errors.add(EXTERNAL_ID_REQUIRED);
+        }
+
+        PublicationDate publicationDate = work.getPublicationDate();
+        if (publicationDate != null && isYearNotValid(publicationDate)) {
+            errors.add(PUBLICATION_DATE_INVALID);
+        }
+
+        return errors;
+    }
+
+    /**
+     * A funding is valid if has title, a valid funder organization and at least one
+     * external id. If it has an amount, the amount currency is required.
+     */
+    @Override
+    public List<OrcidValidationError> validateFunding(Funding funding) {
+
+        List<OrcidValidationError> errors = new ArrayList<OrcidValidationError>();
+
+        FundingTitle title = funding.getTitle();
+        if (title == null || title.getTitle() == null || isBlank(title.getTitle().getContent())) {
+            errors.add(TITLE_REQUIRED);
+        }
+
+        ExternalIDs externalIdentifiers = funding.getExternalIdentifiers();
+
+        if (externalIdentifiers == null || isEmpty(externalIdentifiers.getExternalIdentifier())) {
+            errors.add(EXTERNAL_ID_REQUIRED);
+        }
+
+        if (funding.getOrganization() == null) {
+            errors.add(FUNDER_REQUIRED);
+        } else {
+            errors.addAll(validate(funding.getOrganization()));
+        }
+
+        if (funding.getAmount() != null && isBlank(funding.getAmount().getCurrencyCode())) {
+            errors.add(AMOUNT_CURRENCY_REQUIRED);
+        }
+
+        return errors;
+    }
+
+    /**
+     * The organization is valid if it has a name, a valid address and a valid
+     * disambiguated-organization complex type.
+     */
+    private List<OrcidValidationError> validate(Organization organization) {
+        List<OrcidValidationError> errors = new ArrayList<OrcidValidationError>();
+        if (isBlank(organization.getName())) {
+            errors.add(ORGANIZATION_NAME_REQUIRED);
+        }
+
+        errors.addAll(validate(organization.getAddress()));
+        errors.addAll(validate(organization.getDisambiguatedOrganization()));
+
+        return errors;
+    }
+
+    /**
+     * A disambiguated-organization type is valid if it has an identifier and a
+     * valid source (the valid values for sources are configured with
+     * orcid.validation.organization.identifier-sources)
+     */
+    private List<OrcidValidationError> validate(DisambiguatedOrganization disambiguatedOrganization) {
+
+        List<OrcidValidationError> errors = new ArrayList<OrcidValidationError>();
+
+
+        if (disambiguatedOrganization == null) {
+            errors.add(DISAMBIGUATED_ORGANIZATION_REQUIRED);
+            return errors;
+        }
+
+        if (isBlank(disambiguatedOrganization.getDisambiguatedOrganizationIdentifier())) {
+            errors.add(DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED);
+        }
+
+        String disambiguationSource = disambiguatedOrganization.getDisambiguationSource();
+
+        if (isBlank(disambiguationSource)) {
+            errors.add(DISAMBIGUATION_SOURCE_REQUIRED);
+        } else if (isInvalidDisambiguationSource(disambiguationSource)) {
+            errors.add(DISAMBIGUATION_SOURCE_INVALID);
+        }
+
+        return errors;
+    }
+
+    /**
+     * An organization address is valid if it has a city and a country.
+     */
+    private List<OrcidValidationError> validate(OrganizationAddress address) {
+        List<OrcidValidationError> errors = new ArrayList<OrcidValidationError>();
+
+        if (address == null) {
+            errors.add(ORGANIZATION_ADDRESS_REQUIRED);
+            return errors;
+        }
+
+        if (isBlank(address.getCity())) {
+            errors.add(ORGANIZATION_CITY_REQUIRED);
+        }
+
+        if (address.getCountry() == null) {
+            errors.add(ORGANIZATION_COUNTRY_REQUIRED);
+        }
+
+        return errors;
+    }
+
+    private boolean isYearNotValid(PublicationDate publicationDate) {
+        Year year = publicationDate.getYear();
+        if (year == null) {
+            return true;
+        }
+
+        try {
+            return Integer.valueOf(year.getValue()) < 1900;
+        } catch (NumberFormatException ex) {
+            return true;
+        }
+    }
+
+    private boolean isInvalidDisambiguationSource(String disambiguationSource) {
+        return !contains(getDisambiguedOrganizationSources(), disambiguationSource);
+    }
+
+    private String[] getDisambiguedOrganizationSources() {
+        return configurationService.getArrayProperty("orcid.validation.organization.identifier-sources");
+    }
+
+    private boolean isWorkValidationEnabled() {
+        return configurationService.getBooleanProperty("orcid.validation.work.enabled", true);
+    }
+
+    private boolean isFundingValidationEnabled() {
+        return configurationService.getBooleanProperty("orcid.validation.funding.enabled", true);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
new file mode 100644
index 0000000000..0e6f856bfc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
@@ -0,0 +1,331 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.script;
+
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+import static org.dspace.profile.OrcidSynchronizationMode.BATCH;
+import static org.dspace.profile.OrcidSynchronizationMode.MANUAL;
+
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.exception.OrcidValidationException;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.OrcidSynchronizationMode;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Script that perform the bulk synchronization with ORCID registry of all the
+ * ORCID queue records that has an profileItem that configure the
+ * synchronization mode equals to BATCH.
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidBulkPush extends DSpaceRunnable<OrcidBulkPushScriptConfiguration<OrcidBulkPush>> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidBulkPush.class);
+
+    private OrcidQueueService orcidQueueService;
+
+    private OrcidHistoryService orcidHistoryService;
+
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    private ConfigurationService configurationService;
+
+    private Context context;
+
+    /**
+     * Cache that stores the synchronization mode set for a specific profile item.
+     */
+    private Map<Item, OrcidSynchronizationMode> synchronizationModeByProfileItem = new HashMap<>();
+
+    private boolean ignoreMaxAttempts = false;
+
+    @Override
+    public void setup() throws ParseException {
+        OrcidServiceFactory orcidServiceFactory = OrcidServiceFactory.getInstance();
+        this.orcidQueueService = orcidServiceFactory.getOrcidQueueService();
+        this.orcidHistoryService = orcidServiceFactory.getOrcidHistoryService();
+        this.orcidSynchronizationService = orcidServiceFactory.getOrcidSynchronizationService();
+        this.configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+        if (commandLine.hasOption('f')) {
+            ignoreMaxAttempts = true;
+        }
+
+    }
+
+    @Override
+    public void internalRun() throws Exception {
+
+        if (isOrcidSynchronizationDisabled()) {
+            handler.logWarning("The ORCID synchronization is disabled. The script cannot proceed");
+            return;
+        }
+
+        context = new Context();
+        assignCurrentUserInContext();
+
+        try {
+            context.turnOffAuthorisationSystem();
+            performBulkSynchronization();
+            context.complete();
+        } catch (Exception e) {
+            handler.handleException(e);
+            context.abort();
+        } finally {
+            context.restoreAuthSystemState();
+        }
+    }
+
+    /**
+     * Find all the Orcid Queue records that need to be synchronized and perfom the
+     * synchronization.
+     */
+    private void performBulkSynchronization() throws SQLException {
+
+        List<OrcidQueue> queueRecords = findQueueRecordsToSynchronize();
+        handler.logInfo("Found " + queueRecords.size() + " queue records to synchronize with ORCID");
+
+        for (OrcidQueue queueRecord : queueRecords) {
+            performSynchronization(queueRecord);
+        }
+
+    }
+
+    /**
+     * Returns all the stored Orcid Queue records (ignoring or not the max attempts)
+     * related to a profile that has the synchronization mode set to BATCH.
+     */
+    private List<OrcidQueue> findQueueRecordsToSynchronize() throws SQLException {
+        return findQueueRecords().stream()
+            .filter(record -> getProfileItemSynchronizationMode(record.getProfileItem()) == BATCH)
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * If the current script execution is configued to ignore the max attemps,
+     * returns all the ORCID Queue records, otherwise returns the ORCID Queue
+     * records that has an attempts value less than the configured max attempts
+     * value.
+     */
+    private List<OrcidQueue> findQueueRecords() throws SQLException {
+        if (ignoreMaxAttempts) {
+            return orcidQueueService.findAll(context);
+        } else {
+            int attempts = configurationService.getIntProperty("orcid.bulk-synchronization.max-attempts");
+            return orcidQueueService.findByAttemptsLessThan(context, attempts);
+        }
+    }
+
+    /**
+     * Try to synchronize the given queue record with ORCID, handling any errors.
+     */
+    private void performSynchronization(OrcidQueue queueRecord) {
+
+        try {
+
+            queueRecord = reload(queueRecord);
+
+            handler.logInfo(getOperationInfoMessage(queueRecord));
+
+            OrcidHistory orcidHistory = orcidHistoryService.synchronizeWithOrcid(context, queueRecord, false);
+
+            handler.logInfo(getSynchronizationResultMessage(orcidHistory));
+
+            commitTransaction();
+
+        } catch (OrcidValidationException ex) {
+            rollbackTransaction();
+            handler.logError(getValidationErrorMessage(ex));
+        } catch (Exception ex) {
+            rollbackTransaction();
+            String errorMessage = getUnexpectedErrorMessage(ex);
+            LOGGER.error(errorMessage, ex);
+            handler.logError(errorMessage);
+        } finally {
+            incrementAttempts(queueRecord);
+        }
+
+    }
+
+    /**
+     * Returns the Synchronization mode related to the given profile item.
+     */
+    private OrcidSynchronizationMode getProfileItemSynchronizationMode(Item profileItem) {
+        OrcidSynchronizationMode synchronizationMode = synchronizationModeByProfileItem.get(profileItem);
+        if (synchronizationMode == null) {
+            synchronizationMode = orcidSynchronizationService.getSynchronizationMode(profileItem).orElse(MANUAL);
+            synchronizationModeByProfileItem.put(profileItem, synchronizationMode);
+        }
+        return synchronizationMode;
+    }
+
+    /**
+     * Returns an info log message with the details of the given record's operation.
+     * This message is logged before ORCID synchronization.
+     */
+    private String getOperationInfoMessage(OrcidQueue record) {
+
+        UUID profileItemId = record.getProfileItem().getID();
+        String putCode = record.getPutCode();
+        String type = record.getRecordType();
+
+        if (record.getOperation() == null) {
+            return "Synchronization of " + type + " data for profile with ID: " + profileItemId;
+        }
+
+        switch (record.getOperation()) {
+            case INSERT:
+                return "Addition of " + type + " for profile with ID: " + profileItemId;
+            case UPDATE:
+                return "Update of " + type + " for profile with ID: " + profileItemId + " by put code " + putCode;
+            case DELETE:
+                return "Deletion of " + type + " for profile with ID: " + profileItemId + " by put code " + putCode;
+            default:
+                return "Synchronization of " + type + " data for profile with ID: " + profileItemId;
+        }
+
+    }
+
+    /**
+     * Returns an info log message with the details of the synchronization result.
+     * This message is logged after ORCID synchronization.
+     */
+    private String getSynchronizationResultMessage(OrcidHistory orcidHistory) {
+
+        String message = "History record created with status " + orcidHistory.getStatus();
+
+        switch (orcidHistory.getStatus()) {
+            case 201:
+            case 200:
+            case 204:
+                message += ". The operation was completed successfully";
+                break;
+            case 400:
+                message += ". The resource sent to ORCID registry is not valid";
+                break;
+            case 404:
+                message += ". The resource does not exists anymore on the ORCID registry";
+                break;
+            case 409:
+                message += ". The resource is already present on the ORCID registry";
+                break;
+            case 500:
+                message += ". An internal server error on ORCID registry side occurs";
+                break;
+            default:
+                message += ". Details: " + orcidHistory.getResponseMessage();
+                break;
+        }
+
+        return message;
+
+    }
+
+    private String getValidationErrorMessage(OrcidValidationException ex) {
+        return ex.getMessage();
+    }
+
+    private String getUnexpectedErrorMessage(Exception ex) {
+        return "An unexpected error occurs during the synchronization: " + getRootMessage(ex);
+    }
+
+    private void incrementAttempts(OrcidQueue queueRecord) {
+        queueRecord = reload(queueRecord);
+        if (queueRecord == null) {
+            return;
+        }
+
+        try {
+            queueRecord.setAttempts(queueRecord.getAttempts() != null ? queueRecord.getAttempts() + 1 : 1);
+            orcidQueueService.update(context, queueRecord);
+            commitTransaction();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * This method will assign the currentUser to the {@link Context}. The instance
+     * of the method in this class will fetch the EPersonIdentifier from this class,
+     * this identifier was given to this class upon instantiation, it'll then be
+     * used to find the {@link EPerson} associated with it and this {@link EPerson}
+     * will be set as the currentUser of the created {@link Context}
+     */
+    private void assignCurrentUserInContext() throws SQLException {
+        UUID uuid = getEpersonIdentifier();
+        if (uuid != null) {
+            EPerson ePerson = EPersonServiceFactory.getInstance().getEPersonService().find(context, uuid);
+            context.setCurrentUser(ePerson);
+        }
+    }
+
+    private OrcidQueue reload(OrcidQueue queueRecord) {
+        try {
+            return context.reloadEntity(queueRecord);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void commitTransaction() {
+        try {
+            context.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void rollbackTransaction() {
+        try {
+            context.rollback();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private String getRootMessage(Exception ex) {
+        String message = ExceptionUtils.getRootCauseMessage(ex);
+        return isNotEmpty(message) ? message.substring(message.indexOf(":") + 1).trim() : "Generic error";
+    }
+
+    private boolean isOrcidSynchronizationDisabled() {
+        return !configurationService.getBooleanProperty("orcid.synchronization-enabled", true);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public OrcidBulkPushScriptConfiguration<OrcidBulkPush> getScriptConfiguration() {
+        return new DSpace().getServiceManager().getServiceByName("orcid-bulk-push",
+            OrcidBulkPushScriptConfiguration.class);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPushScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPushScriptConfiguration.java
new file mode 100644
index 0000000000..1a657343c0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPushScriptConfiguration.java
@@ -0,0 +1,65 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.script;
+
+import java.sql.SQLException;
+
+import org.apache.commons.cli.Options;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.core.Context;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Script configuration for {@link OrcidBulkPush}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ * @param  <T> the OrcidBulkPush type
+ */
+public class OrcidBulkPushScriptConfiguration<T extends OrcidBulkPush> extends ScriptConfiguration<T> {
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    private Class<T> dspaceRunnableClass;
+
+    @Override
+    public boolean isAllowedToExecute(Context context) {
+        try {
+            return authorizeService.isAdmin(context);
+        } catch (SQLException e) {
+            throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
+        }
+    }
+
+    @Override
+    public Class<T> getDspaceRunnableClass() {
+        return dspaceRunnableClass;
+    }
+
+    @Override
+    public void setDspaceRunnableClass(Class<T> dspaceRunnableClass) {
+        this.dspaceRunnableClass = dspaceRunnableClass;
+    }
+
+    @Override
+    public Options getOptions() {
+        if (options == null) {
+            Options options = new Options();
+
+            options.addOption("f", "force", false, "force the synchronization ignoring maximum attempts");
+            options.getOption("f").setType(boolean.class);
+            options.getOption("f").setRequired(false);
+
+            super.options = options;
+        }
+        return options;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/MetadataSignatureGenerator.java b/dspace-api/src/main/java/org/dspace/orcid/service/MetadataSignatureGenerator.java
new file mode 100644
index 0000000000..28a270faa7
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/MetadataSignatureGenerator.java
@@ -0,0 +1,48 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.core.Context;
+
+/**
+ * Interface that mark classes that can be used to generate a signature for
+ * metadata values. The signature must be a unique identification of a metadata,
+ * based on the attributes that compose it (such as field, value and authority).
+ * It is possible to generate a signature for a single metadata value and also
+ * for a list of values. Given an item, a signature can for example be used to
+ * check if the associated metadata is present in the item.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface MetadataSignatureGenerator {
+
+    /**
+     * Generate a signature related to the given metadata values.
+     *
+     * @param  context        the DSpace context
+     * @param  metadataValues the metadata values to sign
+     * @return                the generated signature
+     */
+    public String generate(Context context, List<MetadataValue> metadataValues);
+
+    /**
+     * Returns the metadata values traceable by the given item related with the
+     * given signature.
+     *
+     * @param  context   the DSpace context
+     * @param  item      the item
+     * @param  signature the metadata signature
+     * @return           the founded metadata
+     */
+    public List<MetadataValue> findBySignature(Context context, Item item, String signature);
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/OrcidEntityFactoryService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidEntityFactoryService.java
new file mode 100644
index 0000000000..78f2c1331d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidEntityFactoryService.java
@@ -0,0 +1,32 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.orcid.jaxb.model.v3.release.record.Activity;
+
+/**
+ * Interface that mark classes that handle the configured instance of
+ * {@link OrcidEntityFactory}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidEntityFactoryService {
+
+    /**
+     * Builds an ORCID Activity object starting from the given item. The actual type
+     * of Activity constructed depends on the entity type of the input item.
+     *
+     * @param  context the DSpace context
+     * @param  item    the item
+     * @return         the created object
+     */
+    Activity createOrcidObject(Context context, Item item);
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/OrcidHistoryService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidHistoryService.java
new file mode 100644
index 0000000000..13e1a52b6f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidHistoryService.java
@@ -0,0 +1,152 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.exception.OrcidValidationException;
+
+/**
+ * Interface of service to manage OrcidHistory.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+public interface OrcidHistoryService {
+
+    /**
+     * Get an OrcidHistory from the database.
+     *
+     * @param context  DSpace context object
+     * @param id       ID of the OrcidHistory
+     * @return         the OrcidHistory format, or null if the ID is invalid.
+     * @throws         SQLException if database error
+     */
+    public OrcidHistory find(Context context, int id) throws SQLException;
+
+    /**
+     * Find all the ORCID history records.
+     *
+     * @param  context      DSpace context object
+     * @return              the ORCID history records
+     * @throws SQLException if an SQL error occurs
+     */
+    public List<OrcidHistory> findAll(Context context) throws SQLException;
+
+    /**
+     * Get the OrcidHistory records where the given item is the profile item OR the
+     * entity
+     *
+     * @param  context      DSpace context object
+     * @param  item         the item to search for
+     * @return              the found OrcidHistory entities
+     * @throws SQLException if database error
+     */
+    public List<OrcidHistory> findByProfileItemOrEntity(Context context, Item item) throws SQLException;
+
+    /**
+     * Find the OrcidHistory records related to the given entity item.
+     *
+     * @param  context      DSpace context object
+     * @param  entity       the entity item
+     * @return              the found put codes
+     * @throws SQLException if database error
+     */
+    public List<OrcidHistory> findByEntity(Context context, Item entity) throws SQLException;
+
+    /**
+     * Create a new OrcidHistory records related to the given profileItem and entity
+     * items.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  entity       the entity item
+     * @return              the created orcid history record
+     * @throws SQLException if database error
+     */
+    public OrcidHistory create(Context context, Item profileItem, Item entity) throws SQLException;
+
+    /**
+     * Delete an OrcidHistory
+     *
+     * @param  context      context
+     * @param  orcidHistory the OrcidHistory entity to delete
+     * @throws SQLException if database error
+     */
+    public void delete(Context context, OrcidHistory orcidHistory) throws SQLException;
+
+    /**
+     * Update the OrcidHistory
+     *
+     * @param  context      context
+     * @param  orcidHistory the OrcidHistory entity to update
+     * @throws SQLException if database error
+     */
+    public void update(Context context, OrcidHistory orcidHistory) throws SQLException;
+
+    /**
+     * Find the last put code related to the given profileItem and entity item.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  entity       the entity item
+     * @return              the found put code, if any
+     * @throws SQLException if database error
+     */
+    public Optional<String> findLastPutCode(Context context, Item profileItem, Item entity) throws SQLException;
+
+    /**
+     * Find all the last put code related to the entity item each associated with
+     * the profileItem to which it refers.
+     *
+     * @param  context      DSpace context object
+     * @param  entity       the entity item
+     * @return              a map that relates the profileItems with the identified
+     *                      putCode
+     * @throws SQLException if database error
+     */
+    public Map<Item, String> findLastPutCodes(Context context, Item entity) throws SQLException;
+
+    /**
+     * Find all the successfully Orcid history records with the given record type
+     * related to the given entity. An history record is considered successful if
+     * the status is between 200 and 300.
+     *
+     * @param  context      DSpace context object
+     * @param  entity       the entity item
+     * @param  recordType   the record type
+     * @return              the found orcid history records
+     * @throws SQLException if database error
+     */
+    List<OrcidHistory> findSuccessfullyRecordsByEntityAndType(Context context, Item entity, String recordType)
+        throws SQLException;
+
+    /**
+     * Synchronize the entity related to the given orcidQueue record with ORCID.
+     *
+     * @param  context                  DSpace context object
+     * @param  orcidQueue               the orcid queue record that has the
+     *                                  references of the data to be synchronized
+     * @param  forceAddition            to force the insert on the ORCID registry
+     * @return                          the created orcid history record with the
+     *                                  synchronization result
+     * @throws SQLException             if database error
+     * @throws OrcidValidationException if the data to synchronize with ORCID is not
+     *                                  valid
+     */
+    public OrcidHistory synchronizeWithOrcid(Context context, OrcidQueue orcidQueue, boolean forceAddition)
+        throws SQLException, OrcidValidationException;
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/OrcidProfileSectionFactoryService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidProfileSectionFactoryService.java
new file mode 100644
index 0000000000..603d33ddf5
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidProfileSectionFactoryService.java
@@ -0,0 +1,55 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.dspace.content.MetadataValue;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.dspace.profile.OrcidProfileSyncPreference;
+
+/**
+ * Interface that mark classes that handle the configured instance of
+ * {@link OrcidProfileSectionFactory}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidProfileSectionFactoryService {
+
+    /**
+     * Returns the profile section factory of the given type.
+     *
+     * @param  type the type of the section configurations to retrieve
+     * @return      the section configurations of the given type
+     */
+    Optional<OrcidProfileSectionFactory> findBySectionType(OrcidProfileSectionType type);
+
+    /**
+     * Returns all the profile section configurations relative to the given
+     * preferences.
+     *
+     * @param  preferences the preferences to search for
+     * @return             the section configurations
+     */
+    List<OrcidProfileSectionFactory> findByPreferences(List<OrcidProfileSyncPreference> preferences);
+
+    /**
+     * Builds an ORCID object starting from the given metadata values compliance to
+     * the given profile section type.
+     *
+     * @param  context        the DSpace context
+     * @param  metadataValues the metadata values
+     * @param  type           the profile section type
+     * @return                the created object
+     */
+    Object createOrcidObject(Context context, List<MetadataValue> metadataValues, OrcidProfileSectionType type);
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/OrcidQueueService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidQueueService.java
new file mode 100644
index 0000000000..8de25e9caf
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidQueueService.java
@@ -0,0 +1,260 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.profile.OrcidEntitySyncPreference;
+
+/**
+ * Service that handles ORCID queue records.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidQueueService {
+
+    /**
+     * Create an OrcidQueue record with the given profileItem and entity. The type
+     * of operation is calculated based on whether or not the given entity was
+     * already pushed to the ORCID registry.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  entity       the entity item
+     * @return              the stored record
+     * @throws SQLException if an SQL error occurs
+     */
+    public OrcidQueue create(Context context, Item profileItem, Item entity) throws SQLException;
+
+    /**
+     * Create an OrcidQueue record with the given profileItem and entity to push new
+     * data to ORCID.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  entity       the entity item
+     * @return              the stored record
+     * @throws SQLException if an SQL error occurs
+     */
+    public OrcidQueue createEntityInsertionRecord(Context context, Item profileItem, Item entity) throws SQLException;
+
+    /**
+     * Create an OrcidQueue record with the given profileItem to update a record on
+     * ORCID with the given putCode.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  entity       the entity item
+     * @param  putCode      the putCode related to the given entity item
+     * @return              the stored record
+     * @throws SQLException if an SQL error occurs
+     */
+    public OrcidQueue createEntityUpdateRecord(Context context, Item profileItem, Item entity, String putCode)
+        throws SQLException;
+
+    /**
+     * Create an OrcidQueue record with the given profileItem to delete a record on
+     * ORCID related to the given entity type with the given putCode.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  description  the orcid queue record description
+     * @param  type         the type of the entity item
+     * @param  putCode      the putCode related to the given entity item
+     * @return              the stored record
+     * @throws SQLException if an SQL error occurs
+     */
+    OrcidQueue createEntityDeletionRecord(Context context, Item profileItem, String description, String type,
+        String putCode)
+        throws SQLException;
+
+    /**
+     * Create an OrcidQueue record with the profile to add data to ORCID.
+     *
+     * @param  context      DSpace context object
+     * @param  profile      the profile item
+     * @param  description  the record description
+     * @param  recordType   the record type
+     * @param  metadata     the metadata signature
+     * @return              the stored record
+     * @throws SQLException if an SQL error occurs
+     */
+    OrcidQueue createProfileInsertionRecord(Context context, Item profile, String description, String recordType,
+        String metadata) throws SQLException;
+
+    /**
+     * Create an OrcidQueue record with the profile to remove data from ORCID.
+     *
+     * @param  context      DSpace context object
+     * @param  profile      the profile item
+     * @param  description  the record description
+     * @param  recordType   the record type
+     * @param  putCode      the putCode
+     * @return              the stored record
+     * @throws SQLException if an SQL error occurs
+     */
+    OrcidQueue createProfileDeletionRecord(Context context, Item profile, String description, String recordType,
+        String metadata, String putCode) throws SQLException;
+
+    /**
+     * Find all the ORCID queue records.
+     *
+     * @param  context      DSpace context object
+     * @return              the ORCID queue records
+     * @throws SQLException if an SQL error occurs
+     */
+    public List<OrcidQueue> findAll(Context context) throws SQLException;
+
+    /**
+     * Get the orcid queue records by the profileItem id.
+     *
+     * @param  context       DSpace context object
+     * @param  profileItemId the profileItem item id
+     * @return               the orcid queue records
+     * @throws SQLException  if an SQL error occurs
+     */
+    public List<OrcidQueue> findByProfileItemId(Context context, UUID profileItemId) throws SQLException;
+
+    /**
+     * Get the orcid queue records by the profileItem id.
+     *
+     * @param  context       DSpace context object
+     * @param  profileItemId the profileItem item id
+     * @param  limit         limit
+     * @param  offset        offset
+     * @return               the orcid queue records
+     * @throws SQLException  if an SQL error occurs
+     */
+    public List<OrcidQueue> findByProfileItemId(Context context, UUID profileItemId, Integer limit, Integer offset)
+        throws SQLException;
+
+    /**
+     * Get the orcid queue records by the profileItem and entity.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  entity       the entity item
+     * @return              the found OrcidQueue records
+     * @throws SQLException if an SQL error occurs
+     */
+    public List<OrcidQueue> findByProfileItemAndEntity(Context context, Item profileItem, Item entity)
+        throws SQLException;
+
+    /**
+     * Get the OrcidQueue records where the given item is the profileItem OR the
+     * entity
+     *
+     * @param  context      DSpace context object
+     * @param  item         the item to search for
+     * @return              the found OrcidQueue records
+     * @throws SQLException if database error
+     */
+    public List<OrcidQueue> findByProfileItemOrEntity(Context context, Item item) throws SQLException;
+
+    /**
+     * Get all the OrcidQueue records with attempts less than the given attempts.
+     *
+     * @param  context      DSpace context object
+     * @param  attempts     the maximum value of attempts
+     * @return              the found OrcidQueue records
+     * @throws SQLException if database error
+     */
+    public List<OrcidQueue> findByAttemptsLessThan(Context context, int attempts) throws SQLException;
+
+    /**
+     * Returns the number of records on the OrcidQueue associated with the given
+     * profileItemId.
+     *
+     * @param  context       DSpace context object
+     * @param  profileItemId the profileItem item id
+     * @return               the record's count
+     * @throws SQLException  if an SQL error occurs
+     */
+    long countByProfileItemId(Context context, UUID profileItemId) throws SQLException;
+
+    /**
+     * Delete the OrcidQueue record with the given id.
+     *
+     * @param context DSpace context object
+     * @param id      the id of the record to be deleted
+     * @throws SQLException if an SQL error occurs
+     */
+    public void deleteById(Context context, Integer id) throws SQLException;
+
+    /**
+     * Delete an OrcidQueue
+     *
+     * @param  context            DSpace context object
+     * @param  orcidQueue         the orcidQueue record to delete
+     * @throws SQLException       if database error
+     * @throws AuthorizeException if authorization error
+     */
+    public void delete(Context context, OrcidQueue orcidQueue) throws SQLException;
+
+    /**
+     * Delete all the OrcidQueue records with the given entity and record type.
+     *
+     * @param  context      DSpace context object
+     * @param  entity       the entity item
+     * @param  recordType   the record type
+     * @throws SQLException if database error occurs
+     */
+    public void deleteByEntityAndRecordType(Context context, Item entity, String recordType) throws SQLException;
+
+    /**
+     * Delete all the OrcidQueue records with the given profileItem and record type.
+     *
+     * @param  context      DSpace context object
+     * @param  profileItem  the profileItem item
+     * @param  recordType   the record type
+     * @throws SQLException if database error occurs
+     */
+    public void deleteByProfileItemAndRecordType(Context context, Item profileItem, String recordType)
+        throws SQLException;
+
+    /**
+     * Get an OrcidQueue from the database.
+     *
+     * @param  context      DSpace context object
+     * @param  id           ID of the OrcidQueue
+     * @return              the OrcidQueue format, or null if the ID is invalid.
+     * @throws SQLException if database error
+     */
+    public OrcidQueue find(Context context, int id) throws SQLException;
+
+    /**
+     * Update the OrcidQueue
+     *
+     * @param  context      context
+     * @param  orcidQueue   the OrcidQueue to update
+     * @throws SQLException if database error
+     */
+    public void update(Context context, OrcidQueue orcidQueue) throws SQLException;
+
+    /**
+     * Recalculates the ORCID queue records linked to the given profileItem as
+     * regards the entities of the given type. The recalculation is done based on
+     * the preference indicated.
+     *
+     * @param  context      context
+     * @param  profileItem  the profileItem
+     * @param  entityType   the entity type related to the records to recalculate
+     * @param  preference   the preference value on which to base the recalculation
+     * @throws SQLException if database error
+     */
+    public void recalculateOrcidQueue(Context context, Item profileItem, OrcidEntityType entityType,
+        OrcidEntitySyncPreference preference) throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
new file mode 100644
index 0000000000..575ce6811b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
@@ -0,0 +1,167 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Optional;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileDisconnectionMode;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
+
+/**
+ * Service that handle the the syncronization between a DSpace profile and the
+ * relative ORCID profile, if any.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+public interface OrcidSynchronizationService {
+
+    /**
+     * Check if the given item is linked to an ORCID profile.
+     *
+     * @param  context the relevant DSpace Context.
+     * @param  item    the item to check
+     * @return         true if the given item is linked to ORCID
+     */
+    boolean isLinkedToOrcid(Context context, Item item);
+
+    /**
+     * Configure the given profile with the data present in the given ORCID token.
+     * This action is required to synchronize profile and related entities with
+     * ORCID. No security check is done, it is therefore the caller's responsibility
+     * to verify for example that the current user has permission to connect the
+     * profile to ORCID (if necessary).
+     *
+     * @param  context      the relevant DSpace Context.
+     * @param  profile      the profile to configure
+     * @param  token        the ORCID token
+     * @throws SQLException if a SQL error occurs during the profile update
+     */
+    public void linkProfile(Context context, Item profile, OrcidTokenResponseDTO token) throws SQLException;
+
+    /**
+     * Disconnect the given profile from ORCID.
+     *
+     * @param  context      the relevant DSpace Context.
+     * @param  profile      the profile to disconnect
+     * @throws SQLException if a SQL error occurs during the profile update
+     */
+    public void unlinkProfile(Context context, Item profile) throws SQLException;
+
+    /**
+     * Set the synchronization preference for the given profile related to the given
+     * ORCID entity type.
+     *
+     * @param  context                  the relevant DSpace Context.
+     * @param  profile                  the researcher profile to update
+     * @param  entityType               the orcid entity type
+     * @param  value                    the new synchronization preference value
+     * @return                          true if the value has actually been updated,
+     *                                  false if the value to be set is the same as
+     *                                  the one already configured
+     * @throws SQLException             if a SQL error occurs during the profile
+     *                                  update
+     * @throws IllegalArgumentException if the given researcher profile is no linked
+     *                                  with an ORCID account
+     */
+    public boolean setEntityPreference(Context context, Item profile, OrcidEntityType entityType,
+                                       OrcidEntitySyncPreference value) throws SQLException;
+
+    /**
+     * Update the profile's synchronization preference for the given profile.
+     *
+     * @param  context                  the relevant DSpace Context.
+     * @param  profile                  the researcher profile to update
+     * @param  values                   the new synchronization preference values
+     * @return                          true if the value has actually been updated,
+     *                                  false if the value to be set is the same as
+     *                                  the one already configured
+     * @throws SQLException             if a SQL error occurs during the profile
+     *                                  update
+     * @throws IllegalArgumentException if the given researcher profile is no linked
+     *                                  with an ORCID account
+     */
+    public boolean setProfilePreference(Context context, Item profile,
+                                        List<OrcidProfileSyncPreference> values) throws SQLException;
+
+    /**
+     * Set the ORCID synchronization mode for the given profile.
+     *
+     * @param  context      the relevant DSpace Context.
+     * @param  profile      the researcher profile to update
+     * @param  value        the new synchronization mode value
+     * @return              true if the value has actually been updated, false if
+     *                      the value to be set is the same as the one already
+     *                      configured
+     * @throws SQLException if a SQL error occurs during the profile update
+     */
+    public boolean setSynchronizationMode(Context context, Item profile, OrcidSynchronizationMode value)
+        throws SQLException;
+
+    /**
+     * Check if the given researcher profile item is configured to synchronize the
+     * given item with ORCID.
+     *
+     * @param  profile the researcher profile item
+     * @param  item    the entity type to check
+     * @return         true if the given entity type can be synchronize with ORCID,
+     *                 false otherwise
+     */
+    public boolean isSynchronizationAllowed(Item profile, Item item);
+
+    /**
+     * Returns the ORCID synchronization mode configured for the given profile item.
+     *
+     * @param  profile the researcher profile item
+     * @return         the synchronization mode
+     */
+    Optional<OrcidSynchronizationMode> getSynchronizationMode(Item profile);
+
+    /**
+     * Returns the ORCID synchronization preference related to the given entity type
+     * configured for the given profile item.
+     *
+     * @param  profile    the researcher profile item
+     * @param  entityType the orcid entity type
+     * @return            the configured preference
+     */
+    Optional<OrcidEntitySyncPreference> getEntityPreference(Item profile, OrcidEntityType entityType);
+
+    /**
+     * Returns the ORCID synchronization preferences related to the profile itself
+     * configured for the given profile item.
+     *
+     * @param  profile the researcher profile item
+     * @return         the synchronization mode
+     */
+    List<OrcidProfileSyncPreference> getProfilePreferences(Item profile);
+
+    /**
+     * Returns the configuration ORCID profile's disconnection mode. If that mode is
+     * not configured or the configuration is wrong, the value DISABLED is returned.
+     *
+     * @return the disconnection mode
+     */
+    OrcidProfileDisconnectionMode getDisconnectionMode();
+
+    /**
+     * Returns all the profiles with the given orcid id.
+     *
+     * @param  context the relevant DSpace Context.
+     * @param  orcid   the orcid id to search for
+     * @return         the found profile items
+     */
+    List<Item> findProfilesByOrcid(Context context, String orcid);
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/OrcidTokenService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidTokenService.java
new file mode 100644
index 0000000000..ead9682971
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidTokenService.java
@@ -0,0 +1,92 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
+
+/**
+ * Service that handle {@link OrcidToken} entities.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OrcidTokenService {
+
+    /**
+     * Creates a new OrcidToken entity for the given ePerson and accessToken.
+     *
+     * @param  context     the DSpace context
+     * @param  ePerson     the EPerson
+     * @param  accessToken the access token
+     * @return             the created entity instance
+     */
+    public OrcidToken create(Context context, EPerson ePerson, String accessToken);
+
+    /**
+     * Creates a new OrcidToken entity for the given ePerson and accessToken.
+     *
+     * @param  context     the DSpace context
+     * @param  ePerson     the EPerson
+     * @param  profileItem the profile item
+     * @param  accessToken the access token
+     * @return             the created entity instance
+     */
+    public OrcidToken create(Context context, EPerson ePerson, Item profileItem, String accessToken);
+
+    /**
+     * Find an OrcidToken by ePerson.
+     *
+     * @param  context the DSpace context
+     * @param  ePerson the ePerson to search for
+     * @return         the Orcid token, if any
+     */
+    public OrcidToken findByEPerson(Context context, EPerson ePerson);
+
+    /**
+     * Find an OrcidToken by profileItem.
+     *
+     * @param  context     the DSpace context
+     * @param  profileItem the profile item to search for
+     * @return             the Orcid token, if any
+     */
+    public OrcidToken findByProfileItem(Context context, Item profileItem);
+
+    /**
+     * Delete the given ORCID token entity.
+     *
+     * @param context    the DSpace context
+     * @param orcidToken the ORCID token entity to delete
+     */
+    public void delete(Context context, OrcidToken orcidToken);
+
+    /**
+     * Delete all the ORCID token entities.
+     *
+     * @param context the DSpace context
+     */
+    public void deleteAll(Context context);
+
+    /**
+     * Deletes the ORCID token entity related to the given EPerson.
+     *
+     * @param context the DSpace context
+     * @param ePerson the ePerson for the deletion
+     */
+    public void deleteByEPerson(Context context, EPerson ePerson);
+
+    /**
+     * Deletes the ORCID token entity related to the given profile item.
+     *
+     * @param context     the DSpace context
+     * @param profileItem the item for the deletion
+     */
+    public void deleteByProfileItem(Context context, Item profileItem);
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidEntityFactoryServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
new file mode 100644
index 0000000000..c02185b430
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
@@ -0,0 +1,62 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service.impl;
+
+import static java.util.stream.Collectors.toMap;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.factory.OrcidEntityFactory;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
+import org.orcid.jaxb.model.v3.release.record.Activity;
+
+/**
+ * Implementation of {@link OrcidEntityFactoryService}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidEntityFactoryServiceImpl implements OrcidEntityFactoryService {
+
+    /**
+     * Message of the exception thrown if the given item is not a valid entity for
+     * ORCID (defined with the entityFactories map).
+     */
+    private final String INVALID_ENTITY_MSG = "The item with id %s is not a configured Orcid entity";
+
+    private final Map<OrcidEntityType, OrcidEntityFactory> entityFactories;
+
+    private final ItemService itemService;
+
+    private OrcidEntityFactoryServiceImpl(List<OrcidEntityFactory> entityFactories, ItemService itemService) {
+        this.itemService = itemService;
+        this.entityFactories = entityFactories.stream()
+            .collect(toMap(OrcidEntityFactory::getEntityType, Function.identity()));
+    }
+
+    @Override
+    public Activity createOrcidObject(Context context, Item item) {
+        OrcidEntityFactory factory = getOrcidEntityType(item)
+            .map(entityType -> entityFactories.get(entityType))
+            .orElseThrow(() -> new IllegalArgumentException(String.format(INVALID_ENTITY_MSG, item.getID())));
+
+        return factory.createOrcidObject(context, item);
+    }
+
+    private Optional<OrcidEntityType> getOrcidEntityType(Item item) {
+        return Optional.ofNullable(OrcidEntityType.fromEntityType(itemService.getEntityTypeLabel(item)));
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
new file mode 100644
index 0000000000..0bec9a12e0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
@@ -0,0 +1,360 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service.impl;
+
+import static java.lang.String.format;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+import static java.util.Optional.ofNullable;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.math.NumberUtils.isCreatable;
+
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpStatus;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataFieldName;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidResponse;
+import org.dspace.orcid.dao.OrcidHistoryDAO;
+import org.dspace.orcid.dao.OrcidQueueDAO;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.exception.OrcidValidationException;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.validator.OrcidValidationError;
+import org.dspace.orcid.model.validator.OrcidValidator;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+import org.dspace.orcid.service.OrcidEntityFactoryService;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.orcid.jaxb.model.v3.release.record.Activity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OrcidHistoryService}.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidHistoryServiceImpl implements OrcidHistoryService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidHistoryServiceImpl.class);
+
+    @Autowired
+    private OrcidHistoryDAO orcidHistoryDAO;
+
+    @Autowired
+    private OrcidQueueDAO orcidQueueDAO;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private OrcidProfileSectionFactoryService profileFactoryService;
+
+    @Autowired
+    private OrcidEntityFactoryService activityFactoryService;
+
+    @Autowired
+    private MetadataSignatureGenerator metadataSignatureGenerator;
+
+    @Autowired
+    private OrcidClient orcidClient;
+
+    @Autowired
+    private OrcidValidator orcidValidator;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    @Override
+    public OrcidHistory find(Context context, int id) throws SQLException {
+        return orcidHistoryDAO.findByID(context, OrcidHistory.class, id);
+    }
+
+    @Override
+    public List<OrcidHistory> findAll(Context context) throws SQLException {
+        return orcidHistoryDAO.findAll(context, OrcidHistory.class);
+    }
+
+    @Override
+    public List<OrcidHistory> findByProfileItemOrEntity(Context context, Item profileItem) throws SQLException {
+        return orcidHistoryDAO.findByProfileItemOrEntity(context, profileItem);
+    }
+
+    @Override
+    public OrcidHistory create(Context context, Item profileItem, Item entity) throws SQLException {
+        OrcidHistory orcidHistory = new OrcidHistory();
+        orcidHistory.setEntity(entity);
+        orcidHistory.setProfileItem(profileItem);
+        return orcidHistoryDAO.create(context, orcidHistory);
+    }
+
+    @Override
+    public void delete(Context context, OrcidHistory orcidHistory) throws SQLException {
+        orcidHistoryDAO.delete(context, orcidHistory);
+    }
+
+    @Override
+    public void update(Context context, OrcidHistory orcidHistory) throws SQLException {
+        if (orcidHistory != null) {
+            orcidHistoryDAO.save(context, orcidHistory);
+        }
+    }
+
+    @Override
+    public Optional<String> findLastPutCode(Context context, Item profileItem, Item entity) throws SQLException {
+        List<OrcidHistory> records = orcidHistoryDAO.findByProfileItemAndEntity(context, profileItem.getID(),
+            entity.getID());
+        return findLastPutCode(records, profileItem);
+    }
+
+    @Override
+    public Map<Item, String> findLastPutCodes(Context context, Item entity) throws SQLException {
+        Map<Item, String> profileItemAndPutCodeMap = new HashMap<Item, String>();
+
+        List<OrcidHistory> orcidHistoryRecords = findByEntity(context, entity);
+        for (OrcidHistory orcidHistoryRecord : orcidHistoryRecords) {
+            Item profileItem = orcidHistoryRecord.getProfileItem();
+            if (profileItemAndPutCodeMap.containsKey(profileItem)) {
+                continue;
+            }
+
+            findLastPutCode(orcidHistoryRecords, profileItem)
+                .ifPresent(putCode -> profileItemAndPutCodeMap.put(profileItem, putCode));
+        }
+
+        return profileItemAndPutCodeMap;
+    }
+
+    @Override
+    public List<OrcidHistory> findByEntity(Context context, Item entity) throws SQLException {
+        return orcidHistoryDAO.findByEntity(context, entity);
+    }
+
+    @Override
+    public List<OrcidHistory> findSuccessfullyRecordsByEntityAndType(Context context,
+        Item entity, String recordType) throws SQLException {
+        return orcidHistoryDAO.findSuccessfullyRecordsByEntityAndType(context, entity, recordType);
+    }
+
+    @Override
+    public OrcidHistory synchronizeWithOrcid(Context context, OrcidQueue orcidQueue, boolean forceAddition)
+        throws SQLException {
+
+        Item profileItem = orcidQueue.getProfileItem();
+
+        String orcid = getMetadataValue(profileItem, "person.identifier.orcid")
+            .orElseThrow(() -> new IllegalArgumentException(
+                format("The related profileItem item (id = %s) does not have an orcid", profileItem.getID())));
+
+        String token = getAccessToken(context, profileItem)
+            .orElseThrow(() -> new IllegalArgumentException(
+                format("The related profileItem item (id = %s) does not have an access token", profileItem.getID())));
+
+        OrcidOperation operation = calculateOperation(orcidQueue, forceAddition);
+
+        try {
+
+            OrcidResponse response = synchronizeWithOrcid(context, orcidQueue, orcid, token, operation);
+            OrcidHistory orcidHistory = createHistoryRecordFromOrcidResponse(context, orcidQueue, operation, response);
+            orcidQueueDAO.delete(context, orcidQueue);
+            return orcidHistory;
+
+        } catch (OrcidValidationException ex) {
+            throw ex;
+        } catch (OrcidClientException ex) {
+            LOGGER.error("An error occurs during the orcid synchronization of ORCID queue " + orcidQueue, ex);
+            return createHistoryRecordFromOrcidError(context, orcidQueue, operation, ex);
+        } catch (RuntimeException ex) {
+            LOGGER.warn("An unexpected error occurs during the orcid synchronization of ORCID queue " + orcidQueue, ex);
+            return createHistoryRecordFromGenericError(context, orcidQueue, operation, ex);
+        }
+
+    }
+
+    private OrcidResponse synchronizeWithOrcid(Context context, OrcidQueue orcidQueue, String orcid, String token,
+        OrcidOperation operation) throws SQLException {
+        if (isProfileSectionType(orcidQueue)) {
+            return synchronizeProfileDataWithOrcid(context, orcidQueue, orcid, token, operation);
+        } else if (isEntityType(orcidQueue)) {
+            return synchronizeEntityWithOrcid(context, orcidQueue, orcid, token, operation);
+        } else {
+            throw new IllegalArgumentException("The type of the given queue record could not be determined");
+        }
+    }
+
+    private OrcidOperation calculateOperation(OrcidQueue orcidQueue, boolean forceAddition) {
+        OrcidOperation operation = orcidQueue.getOperation();
+        if (operation == null) {
+            throw new IllegalArgumentException("The orcid queue record with id " + orcidQueue.getID()
+                + "  has no operation defined");
+        }
+        return operation != OrcidOperation.DELETE && forceAddition ? OrcidOperation.INSERT : operation;
+    }
+
+    private OrcidResponse synchronizeEntityWithOrcid(Context context, OrcidQueue orcidQueue,
+        String orcid, String token, OrcidOperation operation) throws SQLException {
+        if (operation == OrcidOperation.DELETE) {
+            return deleteEntityOnOrcid(context, orcid, token, orcidQueue);
+        } else {
+            return sendEntityToOrcid(context, orcid, token, orcidQueue, operation == OrcidOperation.UPDATE);
+        }
+    }
+
+    private OrcidResponse synchronizeProfileDataWithOrcid(Context context, OrcidQueue orcidQueue,
+        String orcid, String token, OrcidOperation operation) throws SQLException {
+
+        if (operation == OrcidOperation.INSERT) {
+            return sendProfileDataToOrcid(context, orcid, token, orcidQueue);
+        } else {
+            return deleteProfileDataOnOrcid(context, orcid, token, orcidQueue);
+        }
+
+    }
+
+    private OrcidResponse sendEntityToOrcid(Context context, String orcid, String token, OrcidQueue orcidQueue,
+        boolean toUpdate) {
+
+        Activity activity = activityFactoryService.createOrcidObject(context, orcidQueue.getEntity());
+
+        List<OrcidValidationError> validationErrors = orcidValidator.validate(activity);
+        if (CollectionUtils.isNotEmpty(validationErrors)) {
+            throw new OrcidValidationException(validationErrors);
+        }
+
+        if (toUpdate) {
+            activity.setPutCode(getPutCode(orcidQueue));
+            return orcidClient.update(token, orcid, activity, orcidQueue.getPutCode());
+        } else {
+            return orcidClient.push(token, orcid, activity);
+        }
+
+    }
+
+    private OrcidResponse sendProfileDataToOrcid(Context context, String orcid, String token, OrcidQueue orcidQueue) {
+
+        OrcidProfileSectionType recordType = OrcidProfileSectionType.fromString(orcidQueue.getRecordType());
+        String signature = orcidQueue.getMetadata();
+        Item person = orcidQueue.getEntity();
+
+        List<MetadataValue> metadataValues = metadataSignatureGenerator.findBySignature(context, person, signature);
+        Object orcidObject = profileFactoryService.createOrcidObject(context, metadataValues, recordType);
+
+        List<OrcidValidationError> validationErrors = orcidValidator.validate(orcidObject);
+        if (CollectionUtils.isNotEmpty(validationErrors)) {
+            throw new OrcidValidationException(validationErrors);
+        }
+
+        return orcidClient.push(token, orcid, orcidObject);
+    }
+
+    private OrcidResponse deleteProfileDataOnOrcid(Context context, String orcid, String token, OrcidQueue orcidQueue) {
+        OrcidProfileSectionType recordType = OrcidProfileSectionType.fromString(orcidQueue.getRecordType());
+        return orcidClient.deleteByPutCode(token, orcid, orcidQueue.getPutCode(), recordType.getPath());
+    }
+
+    private OrcidResponse deleteEntityOnOrcid(Context context, String orcid, String token, OrcidQueue orcidQueue) {
+        OrcidEntityType recordType = OrcidEntityType.fromEntityType(orcidQueue.getRecordType());
+        return orcidClient.deleteByPutCode(token, orcid, orcidQueue.getPutCode(), recordType.getPath());
+    }
+
+    private OrcidHistory createHistoryRecordFromGenericError(Context context, OrcidQueue orcidQueue,
+        OrcidOperation operation, RuntimeException ex) throws SQLException {
+        return create(context, orcidQueue, ex.getMessage(), operation, 500, null);
+    }
+
+    private OrcidHistory createHistoryRecordFromOrcidError(Context context, OrcidQueue orcidQueue,
+        OrcidOperation operation, OrcidClientException ex) throws SQLException {
+        return create(context, orcidQueue, ex.getMessage(), operation, ex.getStatus(), null);
+    }
+
+    private OrcidHistory createHistoryRecordFromOrcidResponse(Context context, OrcidQueue orcidQueue,
+        OrcidOperation operation, OrcidResponse orcidResponse) throws SQLException {
+
+        int status = orcidResponse.getStatus();
+        if (operation == OrcidOperation.DELETE && orcidResponse.isNotFoundStatus()) {
+            status = HttpStatus.SC_NO_CONTENT;
+        }
+
+        return create(context, orcidQueue, orcidResponse.getContent(), operation, status, orcidResponse.getPutCode());
+    }
+
+    private OrcidHistory create(Context context, OrcidQueue orcidQueue, String responseMessage,
+        OrcidOperation operation, int status, String putCode) throws SQLException {
+        OrcidHistory history = new OrcidHistory();
+        history.setEntity(orcidQueue.getEntity());
+        history.setProfileItem(orcidQueue.getProfileItem());
+        history.setResponseMessage(responseMessage);
+        history.setStatus(status);
+        history.setPutCode(putCode);
+        history.setRecordType(orcidQueue.getRecordType());
+        history.setMetadata(orcidQueue.getMetadata());
+        history.setOperation(operation);
+        history.setDescription(orcidQueue.getDescription());
+        return orcidHistoryDAO.create(context, history);
+    }
+
+    private Optional<String> getMetadataValue(Item item, String metadataField) {
+        return ofNullable(itemService.getMetadataFirstValue(item, new MetadataFieldName(metadataField), Item.ANY))
+            .filter(StringUtils::isNotBlank);
+    }
+
+    private Optional<String> getAccessToken(Context context, Item item) {
+        return ofNullable(orcidTokenService.findByProfileItem(context, item))
+            .map(orcidToken -> orcidToken.getAccessToken());
+    }
+
+    private boolean isProfileSectionType(OrcidQueue orcidQueue) {
+        return OrcidProfileSectionType.isValid(orcidQueue.getRecordType());
+    }
+
+    private boolean isEntityType(OrcidQueue orcidQueue) {
+        return OrcidEntityType.isValidEntityType(orcidQueue.getRecordType());
+    }
+
+    private Optional<String> findLastPutCode(List<OrcidHistory> orcidHistoryRecords, Item profileItem) {
+        return orcidHistoryRecords.stream()
+            .filter(orcidHistoryRecord -> profileItem.equals(orcidHistoryRecord.getProfileItem()))
+            .sorted(comparing(OrcidHistory::getTimestamp, nullsFirst(naturalOrder())).reversed())
+            .map(history -> history.getPutCode())
+            .filter(putCode -> isNotBlank(putCode))
+            .findFirst();
+    }
+
+    private Long getPutCode(OrcidQueue orcidQueue) {
+        return isCreatable(orcidQueue.getPutCode()) ? Long.valueOf(orcidQueue.getPutCode()) : null;
+    }
+
+    public OrcidClient getOrcidClient() {
+        return orcidClient;
+    }
+
+    public void setOrcidClient(OrcidClient orcidClient) {
+        this.orcidClient = orcidClient;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java
new file mode 100644
index 0000000000..fad5a6657d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java
@@ -0,0 +1,61 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service.impl;
+
+import static java.util.stream.Collectors.toMap;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.dspace.content.MetadataValue;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.profile.OrcidProfileSyncPreference;
+
+/**
+ * Implementation of {@link OrcidProfileSectionFactoryService}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidProfileSectionFactoryServiceImpl implements OrcidProfileSectionFactoryService {
+
+    private final Map<OrcidProfileSectionType, OrcidProfileSectionFactory> sectionFactories;
+
+    private OrcidProfileSectionFactoryServiceImpl(List<OrcidProfileSectionFactory> sectionFactories) {
+        this.sectionFactories = sectionFactories.stream()
+            .collect(toMap(OrcidProfileSectionFactory::getProfileSectionType, Function.identity()));
+    }
+
+    @Override
+    public Optional<OrcidProfileSectionFactory> findBySectionType(OrcidProfileSectionType type) {
+        return Optional.ofNullable(this.sectionFactories.get(type));
+    }
+
+    @Override
+    public List<OrcidProfileSectionFactory> findByPreferences(List<OrcidProfileSyncPreference> preferences) {
+        return filterBy(configuration -> preferences.contains(configuration.getSynchronizationPreference()));
+    }
+
+    @Override
+    public Object createOrcidObject(Context context, List<MetadataValue> metadataValues, OrcidProfileSectionType type) {
+        OrcidProfileSectionFactory profileSectionFactory = findBySectionType(type)
+            .orElseThrow(() -> new IllegalArgumentException("No ORCID profile section factory configured for " + type));
+        return profileSectionFactory.create(context, metadataValues);
+    }
+
+    private List<OrcidProfileSectionFactory> filterBy(Predicate<OrcidProfileSectionFactory> predicate) {
+        return sectionFactories.values().stream().filter(predicate).collect(Collectors.toList());
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidQueueServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidQueueServiceImpl.java
new file mode 100644
index 0000000000..d3300fea66
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidQueueServiceImpl.java
@@ -0,0 +1,242 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.dspace.content.Item;
+import org.dspace.content.MetadataFieldName;
+import org.dspace.content.Relationship;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.dao.OrcidQueueDAO;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OrcidQueueService}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidQueueServiceImpl implements OrcidQueueService {
+
+    @Autowired
+    private OrcidQueueDAO orcidQueueDAO;
+
+    @Autowired
+    private OrcidHistoryService orcidHistoryService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private RelationshipService relationshipService;
+
+    @Override
+    public List<OrcidQueue> findByProfileItemId(Context context, UUID profileItemId) throws SQLException {
+        return orcidQueueDAO.findByProfileItemId(context, profileItemId, -1, 0);
+    }
+
+    @Override
+    public List<OrcidQueue> findByProfileItemId(Context context, UUID profileItemId, Integer limit, Integer offset)
+        throws SQLException {
+        return orcidQueueDAO.findByProfileItemId(context, profileItemId, limit, offset);
+    }
+
+    @Override
+    public List<OrcidQueue> findByProfileItemAndEntity(Context context, Item profileItem, Item entity)
+        throws SQLException {
+        return orcidQueueDAO.findByProfileItemAndEntity(context, profileItem, entity);
+    }
+
+    @Override
+    public List<OrcidQueue> findByProfileItemOrEntity(Context context, Item item) throws SQLException {
+        return orcidQueueDAO.findByProfileItemOrEntity(context, item);
+    }
+
+    @Override
+    public long countByProfileItemId(Context context, UUID profileItemId) throws SQLException {
+        return orcidQueueDAO.countByProfileItemId(context, profileItemId);
+    }
+
+    @Override
+    public List<OrcidQueue> findAll(Context context) throws SQLException {
+        return orcidQueueDAO.findAll(context, OrcidQueue.class);
+    }
+
+    @Override
+    public OrcidQueue create(Context context, Item profileItem, Item entity) throws SQLException {
+        Optional<String> putCode = orcidHistoryService.findLastPutCode(context, profileItem, entity);
+        if (putCode.isPresent()) {
+            return createEntityUpdateRecord(context, profileItem, entity, putCode.get());
+        } else {
+            return createEntityInsertionRecord(context, profileItem, entity);
+        }
+    }
+
+    @Override
+    public OrcidQueue createEntityInsertionRecord(Context context, Item profileItem, Item entity) throws SQLException {
+        OrcidQueue orcidQueue = new OrcidQueue();
+        orcidQueue.setEntity(entity);
+        orcidQueue.setRecordType(itemService.getEntityTypeLabel(entity));
+        orcidQueue.setProfileItem(profileItem);
+        orcidQueue.setDescription(getMetadataValue(entity, "dc.title"));
+        orcidQueue.setOperation(OrcidOperation.INSERT);
+        return orcidQueueDAO.create(context, orcidQueue);
+    }
+
+    @Override
+    public OrcidQueue createEntityUpdateRecord(Context context, Item profileItem, Item entity, String putCode)
+        throws SQLException {
+        OrcidQueue orcidQueue = new OrcidQueue();
+        orcidQueue.setProfileItem(profileItem);
+        orcidQueue.setEntity(entity);
+        orcidQueue.setPutCode(putCode);
+        orcidQueue.setRecordType(itemService.getEntityTypeLabel(entity));
+        orcidQueue.setDescription(getMetadataValue(entity, "dc.title"));
+        orcidQueue.setOperation(OrcidOperation.UPDATE);
+        return orcidQueueDAO.create(context, orcidQueue);
+    }
+
+    @Override
+    public OrcidQueue createEntityDeletionRecord(Context context, Item profileItem, String description, String type,
+        String putCode)
+        throws SQLException {
+        OrcidQueue orcidQueue = new OrcidQueue();
+        orcidQueue.setRecordType(type);
+        orcidQueue.setProfileItem(profileItem);
+        orcidQueue.setPutCode(putCode);
+        orcidQueue.setDescription(description);
+        orcidQueue.setOperation(OrcidOperation.DELETE);
+        return orcidQueueDAO.create(context, orcidQueue);
+    }
+
+    @Override
+    public OrcidQueue createProfileInsertionRecord(Context context, Item profile, String description, String recordType,
+        String metadata) throws SQLException {
+        OrcidQueue orcidQueue = new OrcidQueue();
+        orcidQueue.setEntity(profile);
+        orcidQueue.setRecordType(recordType);
+        orcidQueue.setProfileItem(profile);
+        orcidQueue.setDescription(description);
+        orcidQueue.setMetadata(metadata);
+        orcidQueue.setOperation(OrcidOperation.INSERT);
+        return orcidQueueDAO.create(context, orcidQueue);
+    }
+
+    @Override
+    public OrcidQueue createProfileDeletionRecord(Context context, Item profile, String description, String recordType,
+        String metadata, String putCode) throws SQLException {
+        OrcidQueue orcidQueue = new OrcidQueue();
+        orcidQueue.setEntity(profile);
+        orcidQueue.setRecordType(recordType);
+        orcidQueue.setProfileItem(profile);
+        orcidQueue.setDescription(description);
+        orcidQueue.setPutCode(putCode);
+        orcidQueue.setMetadata(metadata);
+        orcidQueue.setOperation(OrcidOperation.DELETE);
+        return orcidQueueDAO.create(context, orcidQueue);
+    }
+
+    @Override
+    public void deleteById(Context context, Integer id) throws SQLException {
+        OrcidQueue orcidQueue = orcidQueueDAO.findByID(context, OrcidQueue.class, id);
+        if (orcidQueue != null) {
+            delete(context, orcidQueue);
+        }
+    }
+
+    @Override
+    public List<OrcidQueue> findByAttemptsLessThan(Context context, int attempts) throws SQLException {
+        return orcidQueueDAO.findByAttemptsLessThan(context, attempts);
+    }
+
+    @Override
+    public void delete(Context context, OrcidQueue orcidQueue) throws SQLException {
+        orcidQueueDAO.delete(context, orcidQueue);
+    }
+
+    @Override
+    public void deleteByEntityAndRecordType(Context context, Item entity, String recordType) throws SQLException {
+        List<OrcidQueue> records = orcidQueueDAO.findByEntityAndRecordType(context, entity, recordType);
+        for (OrcidQueue record : records) {
+            orcidQueueDAO.delete(context, record);
+        }
+    }
+
+    @Override
+    public void deleteByProfileItemAndRecordType(Context context, Item profileItem, String recordType)
+        throws SQLException {
+        List<OrcidQueue> records = orcidQueueDAO.findByProfileItemAndRecordType(context, profileItem, recordType);
+        for (OrcidQueue record : records) {
+            orcidQueueDAO.delete(context, record);
+        }
+    }
+
+    @Override
+    public OrcidQueue find(Context context, int id) throws SQLException {
+        return orcidQueueDAO.findByID(context, OrcidQueue.class, id);
+    }
+
+    @Override
+    public void update(Context context, OrcidQueue orcidQueue) throws SQLException {
+        orcidQueueDAO.save(context, orcidQueue);
+    }
+
+    @Override
+    public void recalculateOrcidQueue(Context context, Item profileItem, OrcidEntityType orcidEntityType,
+        OrcidEntitySyncPreference preference) throws SQLException {
+
+        String entityType = orcidEntityType.getEntityType();
+        if (preference == OrcidEntitySyncPreference.DISABLED) {
+            deleteByProfileItemAndRecordType(context, profileItem, entityType);
+        } else {
+            List<Item> entities = findAllEntitiesLinkableWith(context, profileItem, entityType);
+            for (Item entity : entities) {
+                create(context, profileItem, entity);
+            }
+        }
+
+    }
+
+    private List<Item> findAllEntitiesLinkableWith(Context context, Item profile, String entityType) {
+
+        return findRelationshipsByItem(context, profile).stream()
+            .map(relationship -> getRelatedItem(relationship, profile))
+            .filter(item -> entityType.equals(itemService.getEntityTypeLabel(item)))
+            .collect(Collectors.toList());
+
+    }
+
+    private List<Relationship> findRelationshipsByItem(Context context, Item item) {
+        try {
+            return relationshipService.findByItem(context, item);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Item getRelatedItem(Relationship relationship, Item item) {
+        return relationship.getLeftItem().equals(item) ? relationship.getRightItem() : relationship.getLeftItem();
+    }
+
+    private String getMetadataValue(Item item, String metadatafield) {
+        return itemService.getMetadataFirstValue(item, new MetadataFieldName(metadatafield), Item.ANY);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
new file mode 100644
index 0000000000..97d832d3de
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
@@ -0,0 +1,331 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service.impl;
+
+import static java.time.LocalDateTime.now;
+import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
+import static java.util.List.of;
+import static java.util.Optional.ofNullable;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.lang3.EnumUtils.isValidEnum;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.dspace.content.Item.ANY;
+import static org.dspace.profile.OrcidEntitySyncPreference.DISABLED;
+
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.codec.binary.StringUtils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.SearchService;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.discovery.indexobject.IndexableItem;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileDisconnectionMode;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OrcidSynchronizationService}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidSynchronizationServiceImpl implements OrcidSynchronizationService {
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private EPersonService ePersonService;
+
+    @Autowired
+    private SearchService searchService;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    @Autowired
+    private ResearcherProfileService researcherProfileService;
+
+    @Override
+    public void linkProfile(Context context, Item profile, OrcidTokenResponseDTO token) throws SQLException {
+
+        EPerson ePerson = ePersonService.findByProfileItem(context, profile);
+        if (ePerson == null) {
+            throw new IllegalArgumentException(
+                "The given profile item is not related to any eperson. Item id: " + profile.getID());
+        }
+
+        String orcid = token.getOrcid();
+        String accessToken = token.getAccessToken();
+        String[] scopes = token.getScopeAsArray();
+
+        itemService.setMetadataSingleValue(context, profile, "person", "identifier", "orcid", null, orcid);
+        itemService.clearMetadata(context, profile, "dspace", "orcid", "scope", Item.ANY);
+        for (String scope : scopes) {
+            itemService.addMetadata(context, profile, "dspace", "orcid", "scope", null, scope);
+        }
+
+        if (isBlank(itemService.getMetadataFirstValue(profile, "dspace", "orcid", "authenticated", Item.ANY))) {
+            String currentDate = ISO_DATE_TIME.format(now());
+            itemService.setMetadataSingleValue(context, profile, "dspace", "orcid", "authenticated", null, currentDate);
+        }
+
+        setAccessToken(context, profile, ePerson, accessToken);
+
+        EPerson ePersonByOrcid = ePersonService.findByNetid(context, orcid);
+        if (ePersonByOrcid == null && isBlank(ePerson.getNetid())) {
+            ePerson.setNetid(orcid);
+            updateEPerson(context, ePerson);
+        }
+
+        updateItem(context, profile);
+
+    }
+
+    @Override
+    public void unlinkProfile(Context context, Item profile) throws SQLException {
+
+        itemService.clearMetadata(context, profile, "person", "identifier", "orcid", Item.ANY);
+        itemService.clearMetadata(context, profile, "dspace", "orcid", "scope", Item.ANY);
+        itemService.clearMetadata(context, profile, "dspace", "orcid", "authenticated", Item.ANY);
+
+        orcidTokenService.deleteByProfileItem(context, profile);
+
+        updateItem(context, profile);
+
+    }
+
+    @Override
+    public boolean setEntityPreference(Context context, Item profile, OrcidEntityType type,
+                                       OrcidEntitySyncPreference value) throws SQLException {
+        String metadataQualifier = "sync-" + type.name().toLowerCase() + "s";
+        return updatePreferenceForSynchronizingWithOrcid(context, profile, metadataQualifier, of(value.name()));
+    }
+
+    @Override
+    public boolean setProfilePreference(Context context, Item profile, List<OrcidProfileSyncPreference> values)
+        throws SQLException {
+
+        List<String> valuesAsString = values.stream()
+                                            .map(OrcidProfileSyncPreference::name)
+                                            .collect(Collectors.toList());
+
+        return updatePreferenceForSynchronizingWithOrcid(context, profile, "sync-profile", valuesAsString);
+
+    }
+
+    @Override
+    public boolean setSynchronizationMode(Context context, Item profile, OrcidSynchronizationMode value)
+        throws SQLException {
+
+        if (!isLinkedToOrcid(context, profile)) {
+            throw new IllegalArgumentException("The given profile cannot be configured for the ORCID "
+                                                   + "synchronization because it is not linked to any ORCID account: "
+                                                   + profile.getID());
+        }
+
+        String newValue = value.name();
+        String oldValue = itemService.getMetadataFirstValue(profile, "dspace", "orcid", "sync-mode", Item.ANY);
+
+        if (StringUtils.equals(oldValue, newValue)) {
+            return false;
+        } else {
+            itemService.setMetadataSingleValue(context, profile, "dspace", "orcid", "sync-mode", null, value.name());
+            return true;
+        }
+
+    }
+
+    @Override
+    public boolean isSynchronizationAllowed(Item profile, Item item) {
+
+        if (isOrcidSynchronizationDisabled()) {
+            return false;
+        }
+
+        String entityType = itemService.getEntityTypeLabel(item);
+        if (entityType == null) {
+            return false;
+        }
+
+        if (OrcidEntityType.isValidEntityType(entityType)) {
+            return getEntityPreference(profile, OrcidEntityType.fromEntityType(entityType))
+                .filter(pref -> pref != DISABLED)
+                .isPresent();
+        }
+
+        if (entityType.equals(researcherProfileService.getProfileType())) {
+            return profile.equals(item) && !isEmpty(getProfilePreferences(profile));
+        }
+
+        return false;
+
+    }
+
+    @Override
+    public Optional<OrcidSynchronizationMode> getSynchronizationMode(Item item) {
+        return getMetadataValue(item, "dspace.orcid.sync-mode")
+            .map(metadataValue -> metadataValue.getValue())
+            .filter(value -> isValidEnum(OrcidSynchronizationMode.class, value))
+            .map(value -> OrcidSynchronizationMode.valueOf(value));
+    }
+
+    @Override
+    public Optional<OrcidEntitySyncPreference> getEntityPreference(Item item, OrcidEntityType entityType) {
+        return getMetadataValue(item, "dspace.orcid.sync-" + entityType.name().toLowerCase() + "s")
+            .map(metadataValue -> metadataValue.getValue())
+            .filter(value -> isValidEnum(OrcidEntitySyncPreference.class, value))
+            .map(value -> OrcidEntitySyncPreference.valueOf(value));
+    }
+
+    @Override
+    public List<OrcidProfileSyncPreference> getProfilePreferences(Item item) {
+        return getMetadataValues(item, "dspace.orcid.sync-profile")
+            .map(MetadataValue::getValue)
+            .filter(value -> isValidEnum(OrcidProfileSyncPreference.class, value))
+            .map(value -> OrcidProfileSyncPreference.valueOf(value))
+            .collect(Collectors.toList());
+    }
+
+    @Override
+    public boolean isLinkedToOrcid(Context context, Item item) {
+        return getOrcidAccessToken(context, item).isPresent() && getOrcid(item).isPresent();
+    }
+
+    @Override
+    public OrcidProfileDisconnectionMode getDisconnectionMode() {
+        String value = configurationService.getProperty("orcid.disconnection.allowed-users");
+        if (!OrcidProfileDisconnectionMode.isValid(value)) {
+            return OrcidProfileDisconnectionMode.DISABLED;
+        }
+        return OrcidProfileDisconnectionMode.fromString(value);
+    }
+
+    private void setAccessToken(Context context, Item profile, EPerson ePerson, String accessToken) {
+        OrcidToken orcidToken = orcidTokenService.findByEPerson(context, ePerson);
+        if (orcidToken == null) {
+            orcidTokenService.create(context, ePerson, profile, accessToken);
+        } else {
+            orcidToken.setProfileItem(profile);
+            orcidToken.setAccessToken(accessToken);
+        }
+    }
+
+    private boolean updatePreferenceForSynchronizingWithOrcid(Context context, Item profile,
+                                                              String metadataQualifier,
+                                                              List<String> values) throws SQLException {
+
+        if (!isLinkedToOrcid(context, profile)) {
+            throw new IllegalArgumentException("The given profile cannot be configured for the ORCID "
+                                                   + "synchronization because it is not linked to any ORCID account: "
+                                                   + profile.getID());
+        }
+
+        List<String> oldValues = itemService.getMetadata(profile, "dspace", "orcid", metadataQualifier, ANY).stream()
+                                            .map(metadataValue -> metadataValue.getValue())
+                                            .collect(Collectors.toList());
+
+        if (containsSameValues(oldValues, values)) {
+            return false;
+        }
+
+        itemService.clearMetadata(context, profile, "dspace", "orcid", metadataQualifier, ANY);
+        for (String value : values) {
+            itemService.addMetadata(context, profile, "dspace", "orcid", metadataQualifier, null, value);
+        }
+
+        return true;
+
+    }
+
+    private boolean containsSameValues(List<String> firstList, List<String> secondList) {
+        return new HashSet<>(firstList).equals(new HashSet<>(secondList));
+    }
+
+    private Optional<String> getOrcidAccessToken(Context context, Item item) {
+        return ofNullable(orcidTokenService.findByProfileItem(context, item))
+            .map(orcidToken -> orcidToken.getAccessToken());
+    }
+
+    public Optional<String> getOrcid(Item item) {
+        return getMetadataValue(item, "person.identifier.orcid")
+            .map(metadataValue -> metadataValue.getValue());
+    }
+
+    private Optional<MetadataValue> getMetadataValue(Item item, String metadataField) {
+        return getMetadataValues(item, metadataField).findFirst();
+    }
+
+    private Stream<MetadataValue> getMetadataValues(Item item, String metadataField) {
+        return item.getMetadata().stream()
+                   .filter(metadata -> metadataField.equals(metadata.getMetadataField().toString('.')));
+    }
+
+
+    private boolean isOrcidSynchronizationDisabled() {
+        return !configurationService.getBooleanProperty("orcid.synchronization-enabled", true);
+    }
+
+    private void updateItem(Context context, Item item) throws SQLException {
+        try {
+            context.turnOffAuthorisationSystem();
+            itemService.update(context, item);
+        } catch (AuthorizeException e) {
+            throw new RuntimeException(e);
+        } finally {
+            context.restoreAuthSystemState();
+        }
+    }
+
+    private void updateEPerson(Context context, EPerson ePerson) throws SQLException {
+        try {
+            ePersonService.update(context, ePerson);
+        } catch (AuthorizeException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public List<Item> findProfilesByOrcid(Context context, String orcid) {
+        DiscoverQuery discoverQuery = new DiscoverQuery();
+        discoverQuery.setDSpaceObjectFilter(IndexableItem.TYPE);
+        discoverQuery.addFilterQueries("search.entitytype:" + researcherProfileService.getProfileType());
+        discoverQuery.addFilterQueries("person.identifier.orcid:" + orcid);
+        try {
+            return searchService.search(context, discoverQuery).getIndexableObjects().stream()
+                .map(object -> ((IndexableItem) object).getIndexedObject())
+                .collect(Collectors.toList());
+        } catch (SearchServiceException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidTokenServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidTokenServiceImpl.java
new file mode 100644
index 0000000000..bf10ea981c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidTokenServiceImpl.java
@@ -0,0 +1,99 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.dao.OrcidTokenDAO;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OrcidTokenService}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidTokenServiceImpl implements OrcidTokenService {
+
+    @Autowired
+    private OrcidTokenDAO orcidTokenDAO;
+
+    @Override
+    public OrcidToken create(Context context, EPerson ePerson, String accessToken) {
+        return create(context, ePerson, null, accessToken);
+    }
+
+    @Override
+    public OrcidToken create(Context context, EPerson ePerson, Item profileItem, String accessToken) {
+        OrcidToken orcidToken = new OrcidToken();
+        orcidToken.setAccessToken(accessToken);
+        orcidToken.setEPerson(ePerson);
+        orcidToken.setProfileItem(profileItem);
+        try {
+            return orcidTokenDAO.create(context, orcidToken);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public OrcidToken findByEPerson(Context context, EPerson ePerson) {
+        return orcidTokenDAO.findByEPerson(context, ePerson);
+    }
+
+    @Override
+    public OrcidToken findByProfileItem(Context context, Item profileItem) {
+        return orcidTokenDAO.findByProfileItem(context, profileItem);
+    }
+
+    @Override
+    public void delete(Context context, OrcidToken orcidToken) {
+        try {
+            orcidTokenDAO.delete(context, orcidToken);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void deleteAll(Context context) {
+        try {
+
+            List<OrcidToken> tokens = orcidTokenDAO.findAll(context, OrcidToken.class);
+            for (OrcidToken token : tokens) {
+                delete(context, token);
+            }
+
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void deleteByEPerson(Context context, EPerson ePerson) {
+        OrcidToken orcidToken = findByEPerson(context, ePerson);
+        if (orcidToken != null) {
+            delete(context, orcidToken);
+        }
+    }
+
+    @Override
+    public void deleteByProfileItem(Context context, Item profileItem) {
+        OrcidToken orcidToken = findByProfileItem(context, profileItem);
+        if (orcidToken != null) {
+            delete(context, orcidToken);
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java
new file mode 100644
index 0000000000..4888462ce4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java
@@ -0,0 +1,94 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service.impl;
+
+import static java.util.Comparator.comparing;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.core.Context;
+import org.dspace.orcid.service.MetadataSignatureGenerator;
+
+/**
+ * Implementation of {@link MetadataSignatureGenerator} that composes a
+ * signature made up of a section for each metadata value, divided by the
+ * character SIGNATURE_SECTIONS_SEPARATOR. <br/>
+ * Each section is composed of the metadata field, the metadata value and, if
+ * present, the authority, divided by the character METADATA_SECTIONS_SEPARATOR.
+ * <br/>
+ * The presence of the metadata field allows to have different signatures for
+ * metadata with the same values but referring to different fields, while the
+ * authority allows to distinguish metadata that refer to different entities,
+ * even if they have the same value. Finally, the various sections of the
+ * signature are sorted by metadata field so that the order of the input
+ * metadata values does not affect the signature.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class PlainMetadataSignatureGeneratorImpl implements MetadataSignatureGenerator {
+
+    private static final String SIGNATURE_SECTIONS_SEPARATOR = "§§";
+    private static final String METADATA_SECTIONS_SEPARATOR = "::";
+
+    @Override
+    public String generate(Context context, List<MetadataValue> metadataValues) {
+        return metadataValues.stream()
+            .sorted(comparing(metadataValue -> metadataValue.getMetadataField().getID()))
+            .map(this::composeSignatureSection)
+            .collect(Collectors.joining(SIGNATURE_SECTIONS_SEPARATOR));
+    }
+
+    @Override
+    public List<MetadataValue> findBySignature(Context context, Item item, String signature) {
+        return getSignatureSections(signature)
+            .map(signatureSection -> findFirstBySignatureSection(context, item, signatureSection))
+            .flatMap(metadataValue -> metadataValue.stream())
+            .collect(Collectors.toList());
+    }
+
+    private String composeSignatureSection(MetadataValue metadataValue) {
+        String fieldId = getField(metadataValue);
+        String metadataValueSignature = fieldId + METADATA_SECTIONS_SEPARATOR + getValue(metadataValue);
+        if (StringUtils.isNotBlank(metadataValue.getAuthority())) {
+            return metadataValueSignature + METADATA_SECTIONS_SEPARATOR + metadataValue.getAuthority();
+        } else {
+            return metadataValueSignature;
+        }
+    }
+
+    private Optional<MetadataValue> findFirstBySignatureSection(Context context, Item item, String signatureSection) {
+        return item.getMetadata().stream()
+            .filter(metadataValue -> matchSignature(context, metadataValue, signatureSection))
+            .findFirst();
+    }
+
+    private boolean matchSignature(Context context, MetadataValue metadataValue, String signatureSection) {
+        return generate(context, List.of(metadataValue)).equals(signatureSection);
+    }
+
+    private Stream<String> getSignatureSections(String signature) {
+        return Arrays.stream(StringUtils.split(signature, SIGNATURE_SECTIONS_SEPARATOR));
+    }
+
+    private String getField(MetadataValue metadataValue) {
+        return metadataValue.getMetadataField().toString('.');
+    }
+
+    private String getValue(MetadataValue metadataValue) {
+        return metadataValue.getValue() != null ? metadataValue.getValue() : "";
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/passwordvalidation/factory/PasswordValidationFactory.java b/dspace-api/src/main/java/org/dspace/passwordvalidation/factory/PasswordValidationFactory.java
new file mode 100644
index 0000000000..81cebb84a1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/passwordvalidation/factory/PasswordValidationFactory.java
@@ -0,0 +1,29 @@
+/**
+ * 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/
+ */
+package org.dspace.passwordvalidation.factory;
+
+import org.dspace.authorize.service.PasswordValidatorService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the passwordvalidation package,
+ * use PasswordValidationFactory.getInstance() to retrieve an implementation.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public abstract class PasswordValidationFactory {
+
+    public abstract PasswordValidatorService getPasswordValidationService();
+
+    public static PasswordValidationFactory getInstance() {
+        return DSpaceServicesFactory.getInstance()
+                                    .getServiceManager()
+                                    .getServiceByName("validationPasswordFactory", PasswordValidationFactory.class);
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/passwordvalidation/factory/PasswordValidationFactoryImpl.java b/dspace-api/src/main/java/org/dspace/passwordvalidation/factory/PasswordValidationFactoryImpl.java
new file mode 100644
index 0000000000..a73c7f6868
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/passwordvalidation/factory/PasswordValidationFactoryImpl.java
@@ -0,0 +1,29 @@
+/**
+ * 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/
+ */
+package org.dspace.passwordvalidation.factory;
+
+import org.dspace.authorize.service.PasswordValidatorService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Factory implementation to get services for the PasswordValidation package,
+ * use PasswordValidationFactory.getInstance() to retrieve an implementation.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class PasswordValidationFactoryImpl extends PasswordValidationFactory {
+
+    @Autowired(required = true)
+    private PasswordValidatorService PasswordValidatorService;
+
+    @Override
+    public PasswordValidatorService getPasswordValidationService() {
+        return PasswordValidatorService;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/profile/OrcidEntitySyncPreference.java b/dspace-api/src/main/java/org/dspace/profile/OrcidEntitySyncPreference.java
new file mode 100644
index 0000000000..74efc57e38
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidEntitySyncPreference.java
@@ -0,0 +1,30 @@
+/**
+ * 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/
+ */
+package org.dspace.profile;
+
+/**
+ * Enum that model the allowed values to configure the ORCID synchronization
+ * preferences.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public enum OrcidEntitySyncPreference {
+
+    /**
+     * Preference to be set to disable the synchronization with ORCID of the
+     * specific entity.
+     */
+    DISABLED,
+
+    /**
+     * Preference to be set to enable the synchronization with ORCID of all items
+     * relating to the specific entity.
+     */
+    ALL
+}
diff --git a/dspace-api/src/main/java/org/dspace/profile/OrcidMetadataCopyingAction.java b/dspace-api/src/main/java/org/dspace/profile/OrcidMetadataCopyingAction.java
new file mode 100644
index 0000000000..36abea9ddb
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidMetadataCopyingAction.java
@@ -0,0 +1,97 @@
+/**
+ * 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/
+ */
+package org.dspace.profile;
+
+import static java.time.LocalDateTime.now;
+import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.dspace.content.Item.ANY;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataFieldName;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.profile.service.AfterResearcherProfileCreationAction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+
+/**
+ * Implementation of {@link AfterResearcherProfileCreationAction} that copy the
+ * ORCID metadata, if any, from the owner to the researcher profile item.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class OrcidMetadataCopyingAction implements AfterResearcherProfileCreationAction {
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private EPersonService ePersonService;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    @Override
+    public void perform(Context context, ResearcherProfile researcherProfile, EPerson owner) throws SQLException {
+
+        Item item = researcherProfile.getItem();
+
+        copyMetadataValues(context, owner, "eperson.orcid", item, "person.identifier.orcid");
+        copyMetadataValues(context, owner, "eperson.orcid.scope", item, "dspace.orcid.scope");
+
+        OrcidToken orcidToken = orcidTokenService.findByEPerson(context, owner);
+        if (orcidToken != null) {
+            orcidToken.setProfileItem(item);
+        }
+
+        if (isLinkedToOrcid(owner, orcidToken)) {
+            String currentDate = ISO_DATE_TIME.format(now());
+            itemService.setMetadataSingleValue(context, item, "dspace", "orcid", "authenticated", null, currentDate);
+        }
+
+    }
+
+    private void copyMetadataValues(Context context, EPerson ePerson, String ePersonMetadataField, Item item,
+        String itemMetadataField) throws SQLException {
+
+        List<String> values = getMetadataValues(ePerson, ePersonMetadataField);
+        if (CollectionUtils.isEmpty(values)) {
+            return;
+        }
+
+        MetadataFieldName metadata = new MetadataFieldName(itemMetadataField);
+        itemService.clearMetadata(context, item, metadata.schema, metadata.element, metadata.qualifier, ANY);
+        itemService.addMetadata(context, item, metadata.schema, metadata.element, metadata.qualifier, null, values);
+
+    }
+
+    private boolean isLinkedToOrcid(EPerson ePerson, OrcidToken orcidToken) {
+        return isNotEmpty(getMetadataValues(ePerson, "eperson.orcid")) && orcidToken != null;
+    }
+
+    private List<String> getMetadataValues(EPerson ePerson, String metadataField) {
+        return ePersonService.getMetadataByMetadataString(ePerson, metadataField).stream()
+            .map(MetadataValue::getValue)
+            .collect(Collectors.toList());
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/profile/OrcidProfileDisconnectionMode.java b/dspace-api/src/main/java/org/dspace/profile/OrcidProfileDisconnectionMode.java
new file mode 100644
index 0000000000..22b13f047c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidProfileDisconnectionMode.java
@@ -0,0 +1,49 @@
+/**
+ * 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/
+ */
+package org.dspace.profile;
+
+import static org.apache.commons.lang3.EnumUtils.isValidEnum;
+
+/**
+ * Enum that models all the available values of the property that which
+ * determines which users can disconnect a profile from an ORCID account.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public enum OrcidProfileDisconnectionMode {
+
+    /**
+     * The disconnection is disabled.
+     */
+    DISABLED,
+
+    /**
+     * Only the profile's owner can disconnect that profile from ORCID.
+     */
+    ONLY_OWNER,
+
+    /**
+     * Only the admins can disconnect profiles from ORCID.
+     */
+    ONLY_ADMIN,
+
+    /**
+     * Only the admin or the profile's owner can disconnect that profile from ORCID.
+     */
+    ADMIN_AND_OWNER;
+
+    public static boolean isValid(String mode) {
+        return mode != null ? isValidEnum(OrcidProfileDisconnectionMode.class, mode.toUpperCase()) : false;
+    }
+
+    public static OrcidProfileDisconnectionMode fromString(String mode) {
+        return isValid(mode) ? OrcidProfileDisconnectionMode.valueOf(mode.toUpperCase()) : null;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/profile/OrcidProfileSyncPreference.java b/dspace-api/src/main/java/org/dspace/profile/OrcidProfileSyncPreference.java
new file mode 100644
index 0000000000..a867694490
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidProfileSyncPreference.java
@@ -0,0 +1,29 @@
+/**
+ * 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/
+ */
+package org.dspace.profile;
+
+/**
+ * Enum that model the allowed values to configure the ORCID synchronization
+ * preferences for the user's profile.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public enum OrcidProfileSyncPreference {
+
+    /**
+     * Data relating to the name, country and keywords of the ORCID profile.
+     */
+    BIOGRAPHICAL,
+
+    /**
+     * Data relating to external identifiers and researcher urls of the ORCID
+     * profile.
+     */
+    IDENTIFIERS;
+}
diff --git a/dspace-api/src/main/java/org/dspace/profile/OrcidSynchronizationMode.java b/dspace-api/src/main/java/org/dspace/profile/OrcidSynchronizationMode.java
new file mode 100644
index 0000000000..8bc822261b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/OrcidSynchronizationMode.java
@@ -0,0 +1,29 @@
+/**
+ * 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/
+ */
+package org.dspace.profile;
+
+/**
+ * Enum that model the allowed values to configure the ORCID synchronization
+ * mode.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public enum OrcidSynchronizationMode {
+
+    /**
+     * Mode in which the user can manually decide when to synchronize data with
+     * ORCID.
+     */
+    MANUAL,
+
+    /**
+     * Mode in which synchronizations with ORCID occur through an automatic process.
+     */
+    BATCH;
+}
diff --git a/dspace-api/src/main/java/org/dspace/profile/ResearcherProfile.java b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfile.java
new file mode 100644
index 0000000000..72e7dc8008
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfile.java
@@ -0,0 +1,88 @@
+/**
+ * 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/
+ */
+package org.dspace.profile;
+
+import static org.dspace.core.Constants.READ;
+import static org.dspace.eperson.Group.ANONYMOUS;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.util.UUIDUtils;
+import org.springframework.util.Assert;
+
+/**
+ * Object representing a Researcher Profile.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class ResearcherProfile {
+
+    private final Item item;
+
+    private final MetadataValue dspaceObjectOwner;
+
+    /**
+     * Create a new ResearcherProfile object from the given item.
+     *
+     * @param  item                     the profile item
+     * @throws IllegalArgumentException if the given item has not a dspace.object.owner
+     *                                  metadata with a valid authority
+     */
+    public ResearcherProfile(Item item) {
+        Assert.notNull(item, "A researcher profile requires an item");
+        this.item = item;
+        this.dspaceObjectOwner = getDspaceObjectOwnerMetadata(item);
+    }
+
+    public UUID getId() {
+        return UUIDUtils.fromString(dspaceObjectOwner.getAuthority());
+    }
+
+    /**
+     * A profile is considered visible if accessible by anonymous users. This method
+     * returns true if the given item has a READ policy related to ANONYMOUS group,
+     * false otherwise.
+     */
+    public boolean isVisible() {
+        return item.getResourcePolicies().stream()
+            .filter(policy -> policy.getGroup() != null)
+            .anyMatch(policy -> READ == policy.getAction() && ANONYMOUS.equals(policy.getGroup().getName()));
+    }
+
+    public Item getItem() {
+        return item;
+    }
+
+    public Optional<String> getOrcid() {
+        return getMetadataValue(item, "person.identifier.orcid")
+            .map(metadataValue -> metadataValue.getValue());
+    }
+
+    private MetadataValue getDspaceObjectOwnerMetadata(Item item) {
+        return getMetadataValue(item, "dspace.object.owner")
+            .filter(metadata -> UUIDUtils.fromString(metadata.getAuthority()) != null)
+            .orElseThrow(
+                () -> new IllegalArgumentException("A profile item must have a valid dspace.object.owner metadata")
+            );
+    }
+
+    private Optional<MetadataValue> getMetadataValue(Item item, String metadataField) {
+        return getMetadataValues(item, metadataField).findFirst();
+    }
+
+    private Stream<MetadataValue> getMetadataValues(Item item, String metadataField) {
+        return item.getMetadata().stream()
+            .filter(metadata -> metadataField.equals(metadata.getMetadataField().toString('.')));
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
new file mode 100644
index 0000000000..80bbd68fd1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
@@ -0,0 +1,388 @@
+/**
+ * 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/
+ */
+package org.dspace.profile;
+
+import static java.util.Optional.empty;
+import static java.util.Optional.of;
+import static java.util.Optional.ofNullable;
+import static org.dspace.content.authority.Choices.CF_ACCEPTED;
+import static org.dspace.core.Constants.READ;
+import static org.dspace.core.Constants.WRITE;
+import static org.dspace.eperson.Group.ANONYMOUS;
+
+import java.io.IOException;
+import java.net.URI;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.dspace.app.exception.ResourceAlreadyExistsException;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.WorkspaceItem;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.InstallItemService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.core.Context;
+import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.DiscoverResult;
+import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.SearchService;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.discovery.indexobject.IndexableCollection;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
+import org.dspace.eperson.service.GroupService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.service.AfterResearcherProfileCreationAction;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.util.UUIDUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+
+/**
+ * Implementation of {@link ResearcherProfileService}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class ResearcherProfileServiceImpl implements ResearcherProfileService {
+
+    private static Logger log = LoggerFactory.getLogger(ResearcherProfileServiceImpl.class);
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private WorkspaceItemService workspaceItemService;
+
+    @Autowired
+    private InstallItemService installItemService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private CollectionService collectionService;
+
+    @Autowired
+    private SearchService searchService;
+
+    @Autowired
+    private GroupService groupService;
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    @Autowired
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    @Autowired(required = false)
+    private List<AfterResearcherProfileCreationAction> afterCreationActions;
+
+    @PostConstruct
+    public void postConstruct() {
+
+        if (afterCreationActions == null) {
+            afterCreationActions = Collections.emptyList();
+        }
+
+    }
+
+    @Override
+    public ResearcherProfile findById(Context context, UUID id) throws SQLException, AuthorizeException {
+        Assert.notNull(id, "An id must be provided to find a researcher profile");
+
+        Item profileItem = findResearcherProfileItemById(context, id);
+        if (profileItem == null) {
+            return null;
+        }
+
+        return new ResearcherProfile(profileItem);
+    }
+
+    @Override
+    public ResearcherProfile createAndReturn(Context context, EPerson ePerson)
+            throws AuthorizeException, SQLException, SearchServiceException {
+
+        Item profileItem = findResearcherProfileItemById(context, ePerson.getID());
+        if (profileItem != null) {
+            throw new ResourceAlreadyExistsException("A profile is already linked to the provided User");
+        }
+
+        Collection collection = findProfileCollection(context)
+            .orElseThrow(() -> new IllegalStateException("No collection found for researcher profiles"));
+
+        context.turnOffAuthorisationSystem();
+        Item item = createProfileItem(context, ePerson, collection);
+        context.restoreAuthSystemState();
+
+        ResearcherProfile researcherProfile = new ResearcherProfile(item);
+
+        for (AfterResearcherProfileCreationAction afterCreationAction : afterCreationActions) {
+            afterCreationAction.perform(context, researcherProfile, ePerson);
+        }
+
+        return researcherProfile;
+    }
+
+    @Override
+    public void deleteById(Context context, UUID id) throws SQLException, AuthorizeException {
+        Assert.notNull(id, "An id must be provided to find a researcher profile");
+
+        Item profileItem = findResearcherProfileItemById(context, id);
+        if (profileItem == null) {
+            return;
+        }
+
+        if (isHardDeleteEnabled()) {
+            deleteItem(context, profileItem);
+        } else {
+            removeOwnerMetadata(context, profileItem);
+            orcidSynchronizationService.unlinkProfile(context, profileItem);
+        }
+
+    }
+
+    @Override
+    public void changeVisibility(Context context, ResearcherProfile profile, boolean visible)
+            throws AuthorizeException, SQLException {
+
+        if (profile.isVisible() == visible) {
+            return;
+        }
+
+        Item item = profile.getItem();
+        Group anonymous = groupService.findByName(context, ANONYMOUS);
+
+        if (visible) {
+            authorizeService.addPolicy(context, item, READ, anonymous);
+        } else {
+            authorizeService.removeGroupPolicies(context, item, anonymous);
+        }
+
+    }
+
+    @Override
+    public ResearcherProfile claim(Context context, EPerson ePerson, URI uri)
+            throws SQLException, AuthorizeException, SearchServiceException {
+
+        Item profileItem = findResearcherProfileItemById(context, ePerson.getID());
+        if (profileItem != null) {
+            throw new ResourceAlreadyExistsException("A profile is already linked to the provided User");
+        }
+
+        Item item = findItemByURI(context, uri)
+            .orElseThrow(() -> new IllegalArgumentException("No item found by URI " + uri));
+
+        if (!item.isArchived() || item.isWithdrawn()) {
+            throw new IllegalArgumentException(
+                "Only archived items can be claimed to create a researcher profile. Item ID: " + item.getID());
+        }
+
+        if (!hasProfileType(item)) {
+            throw new IllegalArgumentException("The provided item has not a profile type. Item ID: " + item.getID());
+        }
+
+        if (haveDifferentEmail(item, ePerson)) {
+            throw new IllegalArgumentException("The provided item is not claimable because it has a different email "
+                + "than the given user's email. Item ID: " + item.getID());
+        }
+
+        String existingOwner = itemService.getMetadataFirstValue(item, "dspace", "object", "owner", Item.ANY);
+
+        if (StringUtils.isNotBlank(existingOwner)) {
+            throw new IllegalArgumentException("Item with provided uri has already an owner - ID: " + existingOwner);
+        }
+
+        context.turnOffAuthorisationSystem();
+        itemService.addMetadata(context, item, "dspace", "object", "owner", null,
+                                ePerson.getName(), ePerson.getID().toString(), CF_ACCEPTED);
+        context.restoreAuthSystemState();
+
+        return new ResearcherProfile(item);
+    }
+
+    @Override
+    public boolean hasProfileType(Item item) {
+        String profileType = getProfileType();
+        if (StringUtils.isBlank(profileType)) {
+            return false;
+        }
+        return profileType.equals(itemService.getEntityTypeLabel(item));
+    }
+
+    @Override
+    public String getProfileType() {
+        return configurationService.getProperty("researcher-profile.entity-type", "Person");
+    }
+
+    private Optional<Item> findItemByURI(final Context context, final URI uri) throws SQLException {
+        String path = uri.getPath();
+        UUID uuid = UUIDUtils.fromString(path.substring(path.lastIndexOf("/") + 1));
+        return ofNullable(itemService.find(context, uuid));
+    }
+
+    /**
+     * Search for an profile item owned by an eperson with the given id.
+     */
+    private Item findResearcherProfileItemById(Context context, UUID id) throws SQLException, AuthorizeException {
+
+        String profileType = getProfileType();
+
+        Iterator<Item> items = itemService.findByAuthorityValue(context, "dspace", "object", "owner", id.toString());
+        while (items.hasNext()) {
+            Item item = items.next();
+            String entityType = itemService.getEntityTypeLabel(item);
+            if (profileType.equals(entityType)) {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns a Profile collection based on a configuration or searching for a
+     * collection of researcher profile type.
+     */
+    private Optional<Collection> findProfileCollection(Context context) throws SQLException, SearchServiceException {
+        return findConfiguredProfileCollection(context)
+            .or(() -> findFirstCollectionByProfileEntityType(context));
+    }
+
+    /**
+     * Create a new profile item for the given ePerson in the provided collection.
+     */
+    private Item createProfileItem(Context context, EPerson ePerson, Collection collection)
+            throws AuthorizeException, SQLException {
+
+        String id = ePerson.getID().toString();
+        String fullName = ePerson.getFullName();
+
+        WorkspaceItem workspaceItem = workspaceItemService.create(context, collection, true);
+        Item item = workspaceItem.getItem();
+        itemService.addMetadata(context, item, "dc", "title", null, null, fullName);
+        itemService.addMetadata(context, item, "person", "email", null, null, ePerson.getEmail());
+        itemService.addMetadata(context, item, "dspace", "object", "owner", null, fullName, id, CF_ACCEPTED);
+
+        item = installItemService.installItem(context, workspaceItem);
+
+        if (isNewProfileNotVisibleByDefault()) {
+            Group anonymous = groupService.findByName(context, ANONYMOUS);
+            authorizeService.removeGroupPolicies(context, item, anonymous);
+        }
+
+        authorizeService.addPolicy(context, item, READ, ePerson);
+        authorizeService.addPolicy(context, item, WRITE, ePerson);
+
+        return reloadItem(context, item);
+    }
+
+    private Optional<Collection> findConfiguredProfileCollection(Context context) throws SQLException {
+        UUID uuid = UUIDUtils.fromString(configurationService.getProperty("researcher-profile.collection.uuid"));
+        if (uuid == null) {
+            return Optional.empty();
+        }
+
+        Collection collection = collectionService.find(context, uuid);
+        if (collection == null) {
+            return Optional.empty();
+        }
+
+        if (isNotProfileCollection(collection)) {
+            log.warn("The configured researcher-profile.collection.uuid "
+                + "has an invalid entity type, expected " + getProfileType());
+            return Optional.empty();
+        }
+
+        return of(collection);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private Optional<Collection> findFirstCollectionByProfileEntityType(Context context) {
+
+        String profileType = getProfileType();
+
+        DiscoverQuery discoverQuery = new DiscoverQuery();
+        discoverQuery.setDSpaceObjectFilter(IndexableCollection.TYPE);
+        discoverQuery.addFilterQueries("dspace.entity.type:" + profileType);
+
+        DiscoverResult discoverResult = search(context, discoverQuery);
+        List<IndexableObject> indexableObjects = discoverResult.getIndexableObjects();
+
+        if (CollectionUtils.isEmpty(indexableObjects)) {
+            return empty();
+        }
+
+        return ofNullable((Collection) indexableObjects.get(0).getIndexedObject());
+    }
+
+    private boolean isHardDeleteEnabled() {
+        return configurationService.getBooleanProperty("researcher-profile.hard-delete.enabled");
+    }
+
+    private boolean isNewProfileNotVisibleByDefault() {
+        return !configurationService.getBooleanProperty("researcher-profile.set-new-profile-visible");
+    }
+
+    private boolean isNotProfileCollection(Collection collection) {
+        String entityType = collectionService.getMetadataFirstValue(collection, "dspace", "entity", "type", Item.ANY);
+        return entityType == null || !entityType.equals(getProfileType());
+    }
+
+    private boolean haveDifferentEmail(Item item, EPerson currentUser) {
+        return itemService.getMetadataByMetadataString(item, "person.email").stream()
+            .map(MetadataValue::getValue)
+            .filter(StringUtils::isNotBlank)
+            .noneMatch(email -> email.equalsIgnoreCase(currentUser.getEmail()));
+    }
+
+    private void removeOwnerMetadata(Context context, Item profileItem) throws SQLException {
+        List<MetadataValue> metadata = itemService.getMetadata(profileItem, "dspace", "object", "owner", Item.ANY);
+        itemService.removeMetadataValues(context, profileItem, metadata);
+    }
+
+    private Item reloadItem(Context context, Item item) throws SQLException {
+        context.uncacheEntity(item);
+        return context.reloadEntity(item);
+    }
+
+    private void deleteItem(Context context, Item profileItem) throws SQLException, AuthorizeException {
+        try {
+            context.turnOffAuthorisationSystem();
+            itemService.delete(context, profileItem);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            context.restoreAuthSystemState();
+        }
+    }
+
+    private DiscoverResult search(Context context, DiscoverQuery discoverQuery) {
+        try {
+            return searchService.search(context, discoverQuery);
+        } catch (SearchServiceException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/profile/service/AfterResearcherProfileCreationAction.java b/dspace-api/src/main/java/org/dspace/profile/service/AfterResearcherProfileCreationAction.java
new file mode 100644
index 0000000000..495fe59cdc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/service/AfterResearcherProfileCreationAction.java
@@ -0,0 +1,35 @@
+/**
+ * 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/
+ */
+package org.dspace.profile.service;
+
+import java.sql.SQLException;
+
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.profile.ResearcherProfile;
+
+/**
+ * Interface to mark classes that allow to perform additional logic on created
+ * researcher profile.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface AfterResearcherProfileCreationAction {
+
+    /**
+     * Perform some actions on the given researcher profile and returns the updated
+     * profile.
+     *
+     * @param  context           the DSpace context
+     * @param  researcherProfile the created researcher profile
+     * @param  owner             the EPerson that is owner of the given profile
+     * @throws SQLException      if a SQL error occurs
+     */
+    void perform(Context context, ResearcherProfile researcherProfile, EPerson owner) throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java b/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
new file mode 100644
index 0000000000..9e52402f77
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
@@ -0,0 +1,112 @@
+/**
+ * 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/
+ */
+package org.dspace.profile.service;
+
+import java.net.URI;
+import java.sql.SQLException;
+import java.util.UUID;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.eperson.EPerson;
+import org.dspace.profile.ResearcherProfile;
+
+/**
+ * Service interface class for the {@link ResearcherProfile} object. The
+ * implementation of this class is responsible for all business logic calls for
+ * the {@link ResearcherProfile} object.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface ResearcherProfileService {
+
+    /**
+     * Find the ResearcherProfile by UUID.
+     *
+     * @param context the relevant DSpace Context.
+     * @param id      the ResearcherProfile id
+     * @return the found ResearcherProfile
+     * @throws SQLException
+     * @throws AuthorizeException
+     */
+    public ResearcherProfile findById(Context context, UUID id) throws SQLException, AuthorizeException;
+
+    /**
+     * Create a new researcher profile for the given ePerson.
+     *
+     * @param  context                the relevant DSpace Context.
+     * @param  ePerson                the ePerson
+     * @return                        the created profile
+     * @throws SQLException
+     * @throws AuthorizeException
+     * @throws SearchServiceException
+     */
+    public ResearcherProfile createAndReturn(Context context, EPerson ePerson)
+        throws AuthorizeException, SQLException, SearchServiceException;
+
+    /**
+     * Delete the profile with the given id. Based on the
+     * researcher-profile.hard-delete.enabled configuration, this method deletes the
+     * related item or removes the association between the researcher profile and
+     * eperson related to the input uuid.
+     *
+     * @param  context            the relevant DSpace Context.
+     * @param  id                 the researcher profile id
+     * @throws AuthorizeException
+     * @throws SQLException
+     */
+    public void deleteById(Context context, UUID id) throws SQLException, AuthorizeException;
+
+    /**
+     * Changes the visibility of the given profile using the given new visible
+     * value. The visiblity controls whether the Profile is Anonymous READ or not.
+     *
+     * @param  context            the relevant DSpace Context.
+     * @param  profile            the researcher profile to update
+     * @param  visible            the visible value to set. If true the profile will
+     *                            be visible to all users.
+     * @throws SQLException
+     * @throws AuthorizeException
+     */
+    public void changeVisibility(Context context, ResearcherProfile profile, boolean visible)
+        throws AuthorizeException, SQLException;
+
+    /**
+     * Claims and links an eperson to an existing DSpaceObject
+     * @param  context                  the relevant DSpace Context.
+     * @param  ePerson                  the ePerson
+     * @param  uri                      uri of existing Item to be linked to the
+     *                                  eperson
+     * @return                          the created profile
+     * @throws IllegalArgumentException if the given uri is not related to an
+     *                                  archived item or if the item cannot be
+     *                                  claimed
+     */
+    ResearcherProfile claim(Context context, EPerson ePerson, URI uri)
+        throws SQLException, AuthorizeException, SearchServiceException;
+
+    /**
+     * Check if the given item has an entity type compatible with that of the
+     * researcher profile. If the given item does not have an entity type, the check
+     * returns false.
+     * 
+     * @param  item the item to check
+     * @return      the check result
+     */
+    boolean hasProfileType(Item item);
+
+    /**
+     * Returns the profile entity type, if any.
+     *
+     * @return the profile type
+     */
+    String getProfileType();
+}
diff --git a/dspace-api/src/main/java/org/dspace/rdf/RDFConsumer.java b/dspace-api/src/main/java/org/dspace/rdf/RDFConsumer.java
index 76ae0cd2d2..34ab572d1b 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/RDFConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/RDFConsumer.java
@@ -286,51 +286,54 @@ public class RDFConsumer implements Consumer {
     @Override
     public void end(Context ctx) throws Exception {
         log.debug("Started processing of queued events.");
-        // create a new context, to be sure to work as anonymous user
-        // we don't want to store private data in a triplestore with public
-        // SPARQL endpoint.
-        ctx = new Context(Context.Mode.READ_ONLY);
-        if (toDelete == null) {
-            log.debug("Deletion queue does not exists, creating empty queue.");
-            this.toDelete = new LinkedList<>();
-        }
-        if (toConvert != null) {
-            log.debug("Starting conversion of DSpaceObjects.");
+        // store the context mode, set context read only for performance reasons, and restore the old mode
+        Context.Mode oldMode = ctx.getCurrentMode();
+        try {
+            ctx.setMode(Context.Mode.READ_ONLY);
+            if (toDelete == null) {
+                log.debug("Deletion queue does not exists, creating empty queue.");
+                this.toDelete = new LinkedList<>();
+            }
+            if (toConvert != null) {
+                log.debug("Starting conversion of DSpaceObjects.");
+                while (true) {
+                    DSOIdentifier id;
+                    try {
+                        id = toConvert.removeFirst();
+                    } catch (NoSuchElementException ex) {
+                        break;
+                    }
+
+                    if (toDelete.contains(id)) {
+                        log.debug("Skipping " + Constants.typeText[id.type] + " "
+                                      + id.id.toString() + " as it is marked for "
+                                      + "deletion as well.");
+                        continue;
+                    }
+                    log.debug("Converting " + Constants.typeText[id.type] + " "
+                                  + id.id.toString() + ".");
+                    convert(ctx, id);
+                }
+                log.debug("Conversion ended.");
+            }
+            log.debug("Starting to delete data from the triple store...");
             while (true) {
                 DSOIdentifier id;
                 try {
-                    id = toConvert.removeFirst();
+                    id = toDelete.removeFirst();
                 } catch (NoSuchElementException ex) {
                     break;
                 }
 
-                if (toDelete.contains(id)) {
-                    log.debug("Skipping " + Constants.typeText[id.type] + " "
-                                  + id.id.toString() + " as it is marked for "
-                                  + "deletion as well.");
-                    continue;
-                }
-                log.debug("Converting " + Constants.typeText[id.type] + " "
+                log.debug("Going to delete data from " +
+                              Constants.typeText[id.type] + " "
                               + id.id.toString() + ".");
-                convert(ctx, id);
+                delete(ctx, id);
             }
-            log.debug("Conversion ended.");
+        } finally {
+            // restore context mode
+            ctx.setMode(oldMode);
         }
-        log.debug("Starting to delete data from the triple store...");
-        while (true) {
-            DSOIdentifier id;
-            try {
-                id = toDelete.removeFirst();
-            } catch (NoSuchElementException ex) {
-                break;
-            }
-
-            log.debug("Going to delete data from " +
-                          Constants.typeText[id.type] + " "
-                          + id.id.toString() + ".");
-            delete(ctx, id);
-        }
-        ctx.abort();
         log.debug("Deletion finished.");
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/scripts/Process.java b/dspace-api/src/main/java/org/dspace/scripts/Process.java
index b15fd0c84c..ce41f46bdf 100644
--- a/dspace-api/src/main/java/org/dspace/scripts/Process.java
+++ b/dspace-api/src/main/java/org/dspace/scripts/Process.java
@@ -10,6 +10,7 @@ package org.dspace.scripts;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -33,6 +34,7 @@ import org.dspace.content.Bitstream;
 import org.dspace.content.ProcessStatus;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
 
 /**
  * This class is the DB Entity representation of the Process object to be stored in the Database
@@ -77,6 +79,17 @@ public class Process implements ReloadableEntity<Integer> {
     )
     private List<Bitstream> bitstreams;
 
+    /*
+     * Special Groups associated with this Process
+     */
+    @ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @JoinTable(
+        name = "process2group",
+        joinColumns = {@JoinColumn(name = "process_id")},
+        inverseJoinColumns = {@JoinColumn(name = "group_id")}
+    )
+    private List<Group> groups;
+
     @Column(name = "creation_time", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
     private Date creationTime;
@@ -211,6 +224,21 @@ public class Process implements ReloadableEntity<Integer> {
         return creationTime;
     }
 
+    /**
+     * This method will return the special groups associated with the Process.
+     */
+    public List<Group> getGroups() {
+        return groups;
+    }
+
+    /**
+     * This method sets the special groups associated with the Process.
+     * @param groups  The special groups of this process.
+     */
+    public void setGroups(List<Group> groups) {
+        this.groups = groups;
+    }
+
     /**
      * Return <code>true</code> if <code>other</code> is the same Process
      * as this object, <code>false</code> otherwise
diff --git a/dspace-api/src/main/java/org/dspace/scripts/ProcessServiceImpl.java b/dspace-api/src/main/java/org/dspace/scripts/ProcessServiceImpl.java
index 8c03a9767d..33fea75add 100644
--- a/dspace-api/src/main/java/org/dspace/scripts/ProcessServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/scripts/ProcessServiceImpl.java
@@ -21,6 +21,7 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -43,6 +44,7 @@ import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
 import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.scripts.service.ProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,13 +76,21 @@ public class ProcessServiceImpl implements ProcessService {
 
     @Override
     public Process create(Context context, EPerson ePerson, String scriptName,
-                          List<DSpaceCommandLineParameter> parameters) throws SQLException {
+                          List<DSpaceCommandLineParameter> parameters,
+                          final Set<Group> specialGroups) throws SQLException {
 
         Process process = new Process();
         process.setEPerson(ePerson);
         process.setName(scriptName);
         process.setParameters(DSpaceCommandLineParameter.concatenate(parameters));
         process.setCreationTime(new Date());
+        Optional.ofNullable(specialGroups)
+            .ifPresent(sg -> {
+                // we use a set to be sure no duplicated special groups are stored with process
+                Set<Group> specialGroupsSet = new HashSet<>(sg);
+                process.setGroups(new ArrayList<>(specialGroupsSet));
+            });
+
         Process createdProcess = processDAO.create(context, process);
         log.info(LogHelper.getHeader(context, "process_create",
                                       "Process has been created for eperson with email " + ePerson.getEmail()
@@ -295,6 +305,12 @@ public class ProcessServiceImpl implements ProcessService {
         tempFile.delete();
     }
 
+    @Override
+    public List<Process> findByStatusAndCreationTimeOlderThan(Context context, List<ProcessStatus> statuses,
+        Date date) throws SQLException {
+        return this.processDAO.findByStatusAndCreationTimeOlderThan(context, statuses, date);
+    }
+
     private String formatLogLine(int processId, String scriptName, String output, ProcessLogLevel processLogLevel) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         StringBuilder sb = new StringBuilder();
diff --git a/dspace-api/src/main/java/org/dspace/scripts/handler/DSpaceRunnableHandler.java b/dspace-api/src/main/java/org/dspace/scripts/handler/DSpaceRunnableHandler.java
index f1b37cade2..223a73dad7 100644
--- a/dspace-api/src/main/java/org/dspace/scripts/handler/DSpaceRunnableHandler.java
+++ b/dspace-api/src/main/java/org/dspace/scripts/handler/DSpaceRunnableHandler.java
@@ -10,7 +10,9 @@ package org.dspace.scripts.handler;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 import org.apache.commons.cli.Options;
 import org.dspace.authorize.AuthorizeException;
@@ -114,4 +116,12 @@ public interface DSpaceRunnableHandler {
      */
     public void writeFilestream(Context context, String fileName, InputStream inputStream, String type)
         throws IOException, SQLException, AuthorizeException;
+
+    /**
+     * This method will return a List of UUIDs for the special groups
+     * associated with the processId contained by specific implementations of this interface.
+     * Otherwise, it returns an empty collection.
+     * @return List containing UUIDs of Special Groups of the associated Process.
+     */
+    public List<UUID> getSpecialGroups();
 }
diff --git a/dspace-api/src/main/java/org/dspace/scripts/handler/impl/CommandLineDSpaceRunnableHandler.java b/dspace-api/src/main/java/org/dspace/scripts/handler/impl/CommandLineDSpaceRunnableHandler.java
index 6a108728d4..8a7f41d958 100644
--- a/dspace-api/src/main/java/org/dspace/scripts/handler/impl/CommandLineDSpaceRunnableHandler.java
+++ b/dspace-api/src/main/java/org/dspace/scripts/handler/impl/CommandLineDSpaceRunnableHandler.java
@@ -10,7 +10,10 @@ package org.dspace.scripts.handler.impl;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
@@ -113,4 +116,9 @@ public class CommandLineDSpaceRunnableHandler implements DSpaceRunnableHandler {
         File file = new File(fileName);
         FileUtils.copyInputStreamToFile(inputStream, file);
     }
+
+    @Override
+    public List<UUID> getSpecialGroups() {
+        return Collections.emptyList();
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/scripts/service/ProcessService.java b/dspace-api/src/main/java/org/dspace/scripts/service/ProcessService.java
index 27c0c75a35..ce6a173b0e 100644
--- a/dspace-api/src/main/java/org/dspace/scripts/service/ProcessService.java
+++ b/dspace-api/src/main/java/org/dspace/scripts/service/ProcessService.java
@@ -10,12 +10,16 @@ package org.dspace.scripts.service;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
+import org.dspace.content.ProcessStatus;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
 import org.dspace.scripts.DSpaceCommandLineParameter;
 import org.dspace.scripts.Process;
 import org.dspace.scripts.ProcessLogLevel;
@@ -32,11 +36,14 @@ public interface ProcessService {
      * @param ePerson       The ePerson for which this process will be created on
      * @param scriptName    The script name to be used for the process
      * @param parameters    The parameters to be used for the process
+     * @param specialGroups Allows to set special groups, associated with application context when process is created,
+     *                      other than the ones derived from the eperson membership.
      * @return The created process
      * @throws SQLException If something goes wrong
      */
     public Process create(Context context, EPerson ePerson, String scriptName,
-                          List<DSpaceCommandLineParameter> parameters) throws SQLException;
+                          List<DSpaceCommandLineParameter> parameters,
+                          final Set<Group> specialGroups) throws SQLException;
 
     /**
      * This method will retrieve a Process object from the Database with the given ID
@@ -235,4 +242,17 @@ public interface ProcessService {
      */
     void createLogBitstream(Context context, Process process)
              throws IOException, SQLException, AuthorizeException;
+
+    /**
+     * Find all the processes with one of the given status and with a creation time
+     * older than the specified date.
+     *
+     * @param  context            The relevant DSpace context
+     * @param  statuses           the statuses of the processes to search for
+     * @param  date               the creation date to search for
+     * @return                    The list of all Processes which match requirements
+     * @throws AuthorizeException If something goes wrong
+     */
+    List<Process> findByStatusAndCreationTimeOlderThan(Context context, List<ProcessStatus> statuses, Date date)
+        throws SQLException;
 }
diff --git a/dspace-api/src/main/java/org/dspace/service/impl/ClientInfoServiceImpl.java b/dspace-api/src/main/java/org/dspace/service/impl/ClientInfoServiceImpl.java
index f63a7a4f91..e83aa93e33 100644
--- a/dspace-api/src/main/java/org/dspace/service/impl/ClientInfoServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/service/impl/ClientInfoServiceImpl.java
@@ -7,8 +7,12 @@
  */
 package org.dspace.service.impl;
 
+import static org.apache.commons.lang3.StringUtils.ordinalIndexOf;
+
+import java.net.Inet4Address;
 import javax.servlet.http.HttpServletRequest;
 
+import com.google.common.net.InetAddresses;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.core.Utils;
@@ -66,6 +70,13 @@ public class ClientInfoServiceImpl implements ClientInfoService {
                          "To trust X-Forwarded-For headers, set useProxies=true.");
         }
 
+        if (isIPv4Address(ip)) {
+            int ipAnonymizationBytes = getIpAnonymizationBytes();
+            if (ipAnonymizationBytes > 0) {
+                ip = anonymizeIpAddress(ip, ipAnonymizationBytes);
+            }
+        }
+
         return ip;
     }
 
@@ -139,7 +150,7 @@ public class ClientInfoServiceImpl implements ClientInfoService {
 
         // If our IPTable is not empty, log the trusted proxies and return it
         if (!ipTable.isEmpty()) {
-            log.info("Trusted proxies (configure via 'proxies.trusted.ipranges'): {}", ipTable.toSet().toString());
+            log.info("Trusted proxies (configure via 'proxies.trusted.ipranges'): {}", ipTable);
             return ipTable;
         } else {
             return null;
@@ -192,4 +203,38 @@ public class ClientInfoServiceImpl implements ClientInfoService {
 
         return ip;
     }
+
+    /**
+     * Anonymize the given IP address by setting the last specified bytes to 0
+     * @param  ipAddress the ip address to be anonymize
+     * @param  bytes     the number of bytes to be set to 0
+     * @return           the modified ip address
+     */
+    private String anonymizeIpAddress(String ipAddress, int bytes) {
+
+        if (bytes > 4) {
+            log.warn("It is not possible to anonymize " + bytes + " bytes of an IPv4 address.");
+            return ipAddress;
+        }
+
+        if (bytes == 4) {
+            return "0.0.0.0";
+        }
+
+        String zeroSuffix = StringUtils.repeat(".0", bytes);
+        return removeLastBytes(ipAddress, bytes) + zeroSuffix;
+
+    }
+
+    private String removeLastBytes(String ipAddress, int bytes) {
+        return ipAddress.substring(0, ordinalIndexOf(ipAddress, ".", 4 - bytes));
+    }
+
+    private int getIpAnonymizationBytes() {
+        return configurationService.getIntProperty("client.ip-anonymization.parts", 0);
+    }
+
+    private boolean isIPv4Address(String ipAddress) {
+        return InetAddresses.forString(ipAddress) instanceof Inet4Address;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java b/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java
index 4b3e188662..fdaaef98b5 100644
--- a/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java
+++ b/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java
@@ -86,23 +86,23 @@ public class OrderFormat {
             }
 
             // No delegates found, so apply defaults
-            if (type.equalsIgnoreCase(OrderFormat.AUTHOR) && authorDelegate != null) {
+            if (type.equalsIgnoreCase(OrderFormat.AUTHOR)) {
                 return authorDelegate.makeSortString(value, language);
             }
 
-            if (type.equalsIgnoreCase(OrderFormat.TITLE) && titleDelegate != null) {
+            if (type.equalsIgnoreCase(OrderFormat.TITLE)) {
                 return titleDelegate.makeSortString(value, language);
             }
 
-            if (type.equalsIgnoreCase(OrderFormat.TEXT) && textDelegate != null) {
+            if (type.equalsIgnoreCase(OrderFormat.TEXT)) {
                 return textDelegate.makeSortString(value, language);
             }
 
-            if (type.equalsIgnoreCase(OrderFormat.DATE) && dateDelegate != null) {
+            if (type.equalsIgnoreCase(OrderFormat.DATE)) {
                 return dateDelegate.makeSortString(value, language);
             }
 
-            if (type.equalsIgnoreCase(OrderFormat.AUTHORITY) && authorityDelegate != null) {
+            if (type.equalsIgnoreCase(OrderFormat.AUTHORITY)) {
                 return authorityDelegate.makeSortString(value, language);
             }
         }
diff --git a/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitle.java b/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitle.java
index eb3586dc61..b745f0719c 100644
--- a/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitle.java
+++ b/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitle.java
@@ -10,6 +10,7 @@ package org.dspace.sort;
 import org.dspace.text.filter.DecomposeDiactritics;
 import org.dspace.text.filter.LowerCaseAndTrim;
 import org.dspace.text.filter.StandardInitialArticleWord;
+import org.dspace.text.filter.StripDiacritics;
 import org.dspace.text.filter.TextFilter;
 
 /**
@@ -21,6 +22,7 @@ public class OrderFormatTitle extends AbstractTextFilterOFD {
     {
         filters = new TextFilter[] {new StandardInitialArticleWord(),
             new DecomposeDiactritics(),
+            new StripDiacritics(),
             new LowerCaseAndTrim()};
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitleMarc21.java b/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitleMarc21.java
index 670e5c87e5..fa9ba29725 100644
--- a/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitleMarc21.java
+++ b/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitleMarc21.java
@@ -10,6 +10,7 @@ package org.dspace.sort;
 import org.dspace.text.filter.DecomposeDiactritics;
 import org.dspace.text.filter.LowerCaseAndTrim;
 import org.dspace.text.filter.MARC21InitialArticleWord;
+import org.dspace.text.filter.StripDiacritics;
 import org.dspace.text.filter.StripLeadingNonAlphaNum;
 import org.dspace.text.filter.TextFilter;
 
@@ -22,6 +23,7 @@ public class OrderFormatTitleMarc21 extends AbstractTextFilterOFD {
     {
         filters = new TextFilter[] {new MARC21InitialArticleWord(),
             new DecomposeDiactritics(),
+            new StripDiacritics(),
             new StripLeadingNonAlphaNum(),
             new LowerCaseAndTrim()};
     }
diff --git a/dspace-api/src/main/java/org/dspace/statistics/DataTermsFacet.java b/dspace-api/src/main/java/org/dspace/statistics/DataTermsFacet.java
deleted file mode 100644
index 9de06b7bb8..0000000000
--- a/dspace-api/src/main/java/org/dspace/statistics/DataTermsFacet.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.statistics;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gson.Gson;
-
-/**
- * A neutral data object to hold data for statistics.
- */
-public class DataTermsFacet {
-    private List<TermsFacet> terms;
-
-    public DataTermsFacet() {
-        terms = new ArrayList<TermsFacet>();
-    }
-
-    public void addTermFacet(TermsFacet termsFacet) {
-        terms.add(termsFacet);
-    }
-
-    /**
-     * Render this data object into JSON format.
-     *
-     * An example of the output could be of the format:
-     * [{"term":"247166","count":10},{"term":"247168","count":6}]
-     *
-     * @return JSON-formatted data.
-     */
-    public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(terms);
-    }
-
-
-    public static class TermsFacet {
-        private String term;
-        private Integer count;
-
-        public TermsFacet(String term, Integer count) {
-            setTerm(term);
-            setCount(count);
-        }
-
-        public String getTerm() {
-            return term;
-        }
-
-        public void setTerm(String term) {
-            this.term = term;
-        }
-
-        public Integer getCount() {
-            return count;
-        }
-
-        public void setCount(Integer count) {
-            this.count = count;
-        }
-
-
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/statistics/GeoIpService.java b/dspace-api/src/main/java/org/dspace/statistics/GeoIpService.java
new file mode 100644
index 0000000000..7f8a11e5ba
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/statistics/GeoIpService.java
@@ -0,0 +1,57 @@
+/**
+ * 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/
+ */
+package org.dspace.statistics;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import com.maxmind.geoip2.DatabaseReader;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Service that handle the GeoIP database file.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GeoIpService {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    /**
+     * Returns an instance of {@link DatabaseReader} based on the configured db
+     * file, if any.
+     *
+     * @return                       the Database reader
+     * @throws IllegalStateException if the db file is not configured correctly
+     */
+    public DatabaseReader getDatabaseReader() throws IllegalStateException {
+        String dbPath = configurationService.getProperty("usage-statistics.dbfile");
+        if (StringUtils.isBlank(dbPath)) {
+            throw new IllegalStateException("The required 'dbfile' configuration is missing in solr-statistics.cfg!");
+        }
+
+        try {
+            File dbFile = new File(dbPath);
+            return new DatabaseReader.Builder(dbFile).build();
+        } catch (FileNotFoundException fe) {
+            throw new IllegalStateException(
+                "The GeoLite Database file is missing (" + dbPath + ")! Solr Statistics cannot generate location " +
+                    "based reports! Please see the DSpace installation instructions for instructions to install " +
+                    "this file.",fe);
+        } catch (IOException e) {
+            throw new IllegalStateException(
+                "Unable to load GeoLite Database file (" + dbPath + ")! You may need to reinstall it. See the " +
+                    "DSpace installation instructions for more details.", e);
+        }
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java b/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
index 9cc032a998..a952520385 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
@@ -8,7 +8,6 @@
 package org.dspace.statistics;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -142,6 +141,8 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
     private ClientInfoService clientInfoService;
     @Autowired
     private SolrStatisticsCore solrStatisticsCore;
+    @Autowired
+    private GeoIpService geoIpService;
 
     /** URL to the current-year statistics core.  Prior-year shards will have a year suffixed. */
     private String statisticsCoreURL;
@@ -179,26 +180,10 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
         //spiderIps = SpiderDetector.getSpiderIpAddresses();
 
         DatabaseReader service = null;
-        // Get the db file for the location
-        String dbPath = configurationService.getProperty("usage-statistics.dbfile");
-        if (dbPath != null) {
-            try {
-                File dbFile = new File(dbPath);
-                service = new DatabaseReader.Builder(dbFile).build();
-            } catch (FileNotFoundException fe) {
-                log.error(
-                    "The GeoLite Database file is missing (" + dbPath + ")! Solr Statistics cannot generate location " +
-                        "based reports! Please see the DSpace installation instructions for instructions to install " +
-                        "this file.",
-                    fe);
-            } catch (IOException e) {
-                log.error(
-                    "Unable to load GeoLite Database file (" + dbPath + ")! You may need to reinstall it. See the " +
-                        "DSpace installation instructions for more details.",
-                    e);
-            }
-        } else {
-            log.error("The required 'dbfile' configuration is missing in solr-statistics.cfg!");
+        try {
+            service = geoIpService.getDatabaseReader();
+        } catch (IllegalStateException ex) {
+            log.error(ex);
         }
         locationService = service;
     }
@@ -212,7 +197,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
     @Override
     public void postView(DSpaceObject dspaceObject, HttpServletRequest request,
                          EPerson currentUser) {
-        if (solr == null || locationService == null) {
+        if (solr == null) {
             return;
         }
         initSolrYearCores();
@@ -253,7 +238,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
     @Override
     public void postView(DSpaceObject dspaceObject,
                          String ip, String userAgent, String xforwardedfor, EPerson currentUser) {
-        if (solr == null || locationService == null) {
+        if (solr == null) {
             return;
         }
         initSolrYearCores();
diff --git a/dspace-api/src/main/java/org/dspace/statistics/content/DatasetTimeGenerator.java b/dspace-api/src/main/java/org/dspace/statistics/content/DatasetTimeGenerator.java
index 1152ee669c..a8ffbb4b40 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/content/DatasetTimeGenerator.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/content/DatasetTimeGenerator.java
@@ -187,7 +187,7 @@ public class DatasetTimeGenerator extends DatasetGenerator {
             cal2.clear(Calendar.HOUR);
             cal1.clear(Calendar.HOUR_OF_DAY);
             cal2.clear(Calendar.HOUR_OF_DAY);
-            //yet i know calendar just won't clear his hours
+            //yet i know calendar just won't clear its hours
             cal1.set(Calendar.HOUR_OF_DAY, 0);
             cal2.set(Calendar.HOUR_OF_DAY, 0);
         }
diff --git a/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java b/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
index 4ee7a0f3e4..121e66af48 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
@@ -621,6 +621,10 @@ public class StatisticsDataVisits extends StatisticsData {
         }
 
         if (dsoId != null && query.dsoType != -1) {
+            // Store the UUID of the DSO as an attribute. Needed in particular for Bitstream download usage reports,
+            // as the Bitstream itself won't be available when converting points to their REST representation
+            attrs.put("id", dsoId);
+
             switch (query.dsoType) {
                 case Constants.BITSTREAM:
                     Bitstream bit = bitstreamService.findByIdOrLegacyId(context, dsoId);
diff --git a/dspace-api/src/main/java/org/dspace/statistics/export/RetryFailedOpenUrlTrackerScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/statistics/export/RetryFailedOpenUrlTrackerScriptConfiguration.java
index b5d65aa4e5..dcae4aa4cb 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/export/RetryFailedOpenUrlTrackerScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/export/RetryFailedOpenUrlTrackerScriptConfiguration.java
@@ -56,15 +56,12 @@ public class RetryFailedOpenUrlTrackerScriptConfiguration<T extends RetryFailedO
             Options options = new Options();
 
             options.addOption("a", true, "Add a new \"failed\" row to the table with a url (test purposes only)");
-            options.getOption("a").setType(String.class);
 
             options.addOption("r", false,
                               "Retry sending requests to all urls stored in the table with failed requests. " +
                                       "This includes the url that can be added through the -a option.");
-            options.getOption("r").setType(boolean.class);
 
             options.addOption("h", "help", false, "print this help message");
-            options.getOption("h").setType(boolean.class);
 
             super.options = options;
         }
diff --git a/dspace-api/src/main/java/org/dspace/statistics/export/service/OpenUrlServiceImpl.java b/dspace-api/src/main/java/org/dspace/statistics/export/service/OpenUrlServiceImpl.java
index 7dc5276951..b7a9562fb5 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/export/service/OpenUrlServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/export/service/OpenUrlServiceImpl.java
@@ -69,14 +69,21 @@ public class OpenUrlServiceImpl implements OpenUrlService {
      */
     protected int getResponseCodeFromUrl(final String urlStr) throws IOException {
         HttpGet httpGet = new HttpGet(urlStr);
-        RequestConfig requestConfig = getRequestConfigBuilder().setConnectTimeout(10 * 1000).build();
-        HttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
+        HttpClient httpClient = getHttpClient(getHttpClientRequestConfig());
         HttpResponse httpResponse = httpClient.execute(httpGet);
         return httpResponse.getStatusLine().getStatusCode();
     }
 
-    protected RequestConfig.Builder getRequestConfigBuilder() {
-        return RequestConfig.custom();
+    protected HttpClient getHttpClient(RequestConfig requestConfig) {
+        return HttpClientBuilder.create()
+            .setDefaultRequestConfig(requestConfig)
+            .build();
+    }
+
+    protected RequestConfig getHttpClientRequestConfig() {
+        return RequestConfig.custom()
+            .setConnectTimeout(10 * 1000)
+            .build();
     }
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/IPTable.java b/dspace-api/src/main/java/org/dspace/statistics/util/IPTable.java
index 139b75e8cf..cb94dcc1a1 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/IPTable.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/IPTable.java
@@ -7,11 +7,13 @@
  */
 package org.dspace.statistics.util;
 
-import java.util.HashMap;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.HashSet;
-import java.util.Map;
+import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -25,8 +27,40 @@ public class IPTable {
     private static final Logger log = LogManager.getLogger(IPTable.class);
 
     /* A lookup tree for IP addresses and SubnetRanges */
-    private final Map<String, Map<String, Map<String, Set<String>>>> map
-            = new HashMap<>();
+    private final Set<IPRange> ipRanges = new HashSet<>();
+
+    /**
+     * Internal class representing an IP range
+     */
+    static class IPRange {
+
+        /* Lowest address in the range */
+        private final long ipLo;
+
+        /* Highest address in the range */
+        private final long ipHi;
+
+        IPRange(long ipLo, long ipHi) {
+            this.ipLo = ipLo;
+            this.ipHi = ipHi;
+        }
+
+        /**
+         * Get the lowest address in the range
+         * @return  the lowest address as a long integer
+         */
+        public long getIpLo() {
+            return ipLo;
+        }
+
+        /**
+         * Get the highest address in the range
+         * @return  the highest address as a long integer
+         */
+        public long getIpHi() {
+            return ipHi;
+        }
+    }
 
     /**
      * Can be full v4 IP, subnet or range string.
@@ -45,155 +79,126 @@ public class IPTable {
      */
     public void add(String ip) throws IPFormatException {
 
-        String[] start;
+        String start;
 
-        String[] end;
+        String end;
 
         String[] range = ip.split("-");
 
-        if (range.length >= 2) {
+        if (range.length == 2) {
 
-            start = range[0].trim().split("/")[0].split("\\.");
-            end = range[1].trim().split("/")[0].split("\\.");
+            start = range[0].trim();
+            end = range[1].trim();
 
-            if (start.length != 4 || end.length != 4) {
-                throw new IPFormatException(ip + " - Ranges need to be full IPv4 Addresses");
-            }
-
-            if (!(start[0].equals(end[0]) && start[1].equals(end[1]) && start[2].equals(end[2]))) {
-                throw new IPFormatException(ip + " - Ranges can only be across the last subnet x.y.z.0 - x.y.z.254");
+            try {
+                long ipLo = ipToLong(InetAddress.getByName(start));
+                long ipHi = ipToLong(InetAddress.getByName(end));
+                ipRanges.add(new IPRange(ipLo, ipHi));
+                return;
+            } catch (UnknownHostException e) {
+                throw new IPFormatException(ip + " - Range format should be similar to 1.2.3.0-1.2.3.255");
             }
 
         } else {
-            //need to ignore CIDR notation for the moment.
-            //ip = ip.split("\\/")[0];
-
-            String[] subnets = ip.split("\\.");
-
-            if (subnets.length < 3) {
-                throw new IPFormatException(ip + " - require at least three subnet places (255.255.255.0");
+            // Convert implicit ranges to netmask format
+            //  192       -> 192.0.0.0/8
+            //  192.168   -> 192.168.0.0/16
+            //  192.168.1 -> 192.168.1.0/24
+            int periods = StringUtils.countMatches(ip, '.');
+            if (periods < 3) {
+                ip = StringUtils.join(ip, StringUtils.repeat(".0", 4 - periods - 1), "/", (periods + 1) * 8);
             }
 
-            start = subnets;
-            end = subnets;
-        }
-
-        if (start.length >= 3) {
-            Map<String, Map<String, Set<String>>> first = map.get(start[0]);
-
-            if (first == null) {
-                first = new HashMap<>();
-                map.put(start[0], first);
-            }
-
-            Map<String, Set<String>> second = first.get(start[1]);
-
-            if (second == null) {
-                second = new HashMap<>();
-                first.put(start[1], second);
-            }
-
-            Set<String> third = second.get(start[2]);
-
-            if (third == null) {
-                third = new HashSet<>();
-                second.put(start[2], third);
-            }
-
-            //now populate fourth place (* or value 0-254);
-
-            if (start.length == 3) {
-                third.add("*");
-            }
-
-            if (third.contains("*")) {
-                return;
-            }
-
-            if (start.length >= 4) {
-                int s = Integer.valueOf(start[3]);
-                int e = Integer.valueOf(end[3]);
-                for (int i = s; i <= e; i++) {
-                    third.add(String.valueOf(i));
+            if (ip.contains("/")) {
+                String[] parts = ip.split("/");
+                try {
+                    long ipLong = ipToLong(InetAddress.getByName(parts[0]));
+                    long mask = (long) Math.pow(2, 32 - Integer.parseInt(parts[1]));
+                    long ipLo = (ipLong / mask) * mask;
+                    long ipHi = (( (ipLong / mask) + 1) * mask) - 1;
+                    ipRanges.add(new IPRange(ipLo, ipHi));
+                    return;
+                } catch (Exception e) {
+                    throw new IPFormatException(ip + " - Range format should be similar to 172.16.0.0/12");
+                }
+            } else {
+                try {
+                    long ipLo = ipToLong(InetAddress.getByName(ip));
+                    ipRanges.add(new IPRange(ipLo, ipLo));
+                    return;
+                } catch (UnknownHostException e) {
+                    throw new IPFormatException(ip + " - IP address format should be similar to 1.2.3.14");
                 }
             }
         }
     }
 
+    /**
+     * Convert an IP address to a long integer
+     * @param ip    the IP address
+     * @return
+     */
+    public static long ipToLong(InetAddress ip) {
+        byte[] octets = ip.getAddress();
+        long result = 0;
+        for (byte octet : octets) {
+            result <<= 8;
+            result |= octet & 0xff;
+        }
+        return result;
+    }
+
+    /**
+     * Convert a long integer into an IP address string
+     * @param ip    the IP address as a long integer
+     * @return
+     */
+    public static String longToIp(long ip) {
+        long part = ip;
+        String[] parts = new String[4];
+        for (int i = 0; i < 4; i++) {
+            long octet = part & 0xff;
+            parts[3 - i] = String.valueOf(octet);
+            part = part / 256;
+        }
+
+        return parts[0] + "." + parts[1] + "." + parts[2] + "." + parts[3];
+    }
+
     /**
      * Check whether a given address is contained in this netblock.
      *
      * @param ip the address to be tested
      * @return true if {@code ip} is within this table's limits.  Returns false
-     *         if {@link ip} looks like an IPv6 address.
+     *         if {@code ip} looks like an IPv6 address.
      * @throws IPFormatException Exception Class to deal with IPFormat errors.
      */
     public boolean contains(String ip) throws IPFormatException {
 
-        String[] subnets = ip.split("\\.");
-
-        // Does it look like IPv6?
-        if (subnets.length > 4 || ip.contains("::")) {
-            log.warn("Address {} assumed not to match.  IPv6 is not implemented.", ip);
-            return false;
+        try {
+            long ipToTest = ipToLong(InetAddress.getByName(ip));
+            return ipRanges.stream()
+                    .anyMatch(ipRange -> (ipToTest >= ipRange.getIpLo() && ipToTest <= ipRange.getIpHi()));
+        } catch (UnknownHostException e) {
+            throw new IPFormatException("ip not valid");
         }
-
-        // Does it look like a subnet?
-        if (subnets.length < 4) {
-            throw new IPFormatException("needs to be a single IP address");
-        }
-
-        Map<String, Map<String, Set<String>>> first = map.get(subnets[0]);
-
-        if (first == null) {
-            return false;
-        }
-
-        Map<String, Set<String>> second = first.get(subnets[1]);
-
-        if (second == null) {
-            return false;
-        }
-
-        Set<String> third = second.get(subnets[2]);
-
-        if (third == null) {
-            return false;
-        }
-
-        return third.contains(subnets[3]) || third.contains("*");
-
     }
 
     /**
-     * Convert to a Set.
+     * Convert to a Set. This set contains all IPs in the range
      *
      * @return this table's content as a Set
      */
     public Set<String> toSet() {
         HashSet<String> set = new HashSet<>();
 
-        for (Map.Entry<String, Map<String, Map<String, Set<String>>>> first : map.entrySet()) {
-            String firstString = first.getKey();
-            Map<String, Map<String, Set<String>>> secondMap = first.getValue();
-
-            for (Map.Entry<String, Map<String, Set<String>>> second : secondMap.entrySet()) {
-                String secondString = second.getKey();
-                Map<String, Set<String>> thirdMap = second.getValue();
-
-                for (Map.Entry<String, Set<String>> third : thirdMap.entrySet()) {
-                    String thirdString = third.getKey();
-                    Set<String> fourthSet = third.getValue();
-
-                    if (fourthSet.contains("*")) {
-                        set.add(firstString + "." + secondString + "." + thirdString);
-                    } else {
-                        for (String fourth : fourthSet) {
-                            set.add(firstString + "." + secondString + "." + thirdString + "." + fourth);
-                        }
-                    }
-
-                }
+        Iterator<IPRange> ipRangeIterator = ipRanges.iterator();
+        while (ipRangeIterator.hasNext()) {
+            IPRange ipRange = ipRangeIterator.next();
+            long ipLo = ipRange.getIpLo();
+            long ipHi = ipRange.getIpHi();
+            for (long ip = ipLo; ip <= ipHi; ip++) {
+                set.add(longToIp(ip));
             }
         }
 
@@ -205,7 +210,7 @@ public class IPTable {
      * @return true if empty, false otherwise
      */
     public boolean isEmpty() {
-        return map.isEmpty();
+        return ipRanges.isEmpty();
     }
 
     /**
@@ -217,5 +222,23 @@ public class IPTable {
         }
     }
 
-
+    /**
+     * Represent this IP table as a string
+     * @return  a string containing all IP ranges in this IP table
+     */
+    @Override
+    public String toString() {
+        StringBuilder stringBuilder = new StringBuilder();
+        Iterator<IPRange> ipRangeIterator = ipRanges.iterator();
+        while (ipRangeIterator.hasNext()) {
+            IPRange ipRange = ipRangeIterator.next();
+            stringBuilder.append(longToIp(ipRange.getIpLo()))
+                    .append("-")
+                    .append(longToIp(ipRange.getIpHi()));
+            if (ipRangeIterator.hasNext()) {
+                stringBuilder.append(", ");
+            }
+        }
+        return stringBuilder.toString();
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsClient.java b/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsClient.java
index b1b31c0fe1..e45ce163ed 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsClient.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsClient.java
@@ -16,6 +16,7 @@ import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.logging.log4j.Logger;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Get;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.statistics.factory.StatisticsServiceFactory;
@@ -136,6 +137,7 @@ public class StatisticsClient {
                 URL url = new URL(value);
 
                 Get get = new Get();
+                get.setProject(new Project());
                 get.setDest(new File(spiders, url.getHost() + url.getPath().replace("/", "-")));
                 get.setSrc(url);
                 get.setUseTimestamp(true);
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java b/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java
index bd8662854f..95736a8bd6 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java
@@ -348,9 +348,9 @@ public class StatisticsImporter {
 
                 // Get the eperson details
                 EPerson eperson = EPersonServiceFactory.getInstance().getEPersonService().findByEmail(context, user);
-                int epersonId = 0;
+                UUID epersonId = null;
                 if (eperson != null) {
-                    eperson.getID();
+                    epersonId = eperson.getID();
                 }
 
                 // Save it in our server
@@ -365,12 +365,10 @@ public class StatisticsImporter {
                 sid.addField("city", city);
                 sid.addField("latitude", latitude);
                 sid.addField("longitude", longitude);
-                if (epersonId > 0) {
+                if (epersonId != null) {
                     sid.addField("epersonid", epersonId);
                 }
-                if (dns != null) {
-                    sid.addField("dns", dns.toLowerCase());
-                }
+                sid.addField("dns", dns.toLowerCase());
 
                 solrLoggerService.storeParents(sid, dso);
                 solr.add(sid);
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/BaseBitStoreService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/BaseBitStoreService.java
new file mode 100644
index 0000000000..209c1e21e7
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/BaseBitStoreService.java
@@ -0,0 +1,217 @@
+/**
+ * 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/
+ */
+package org.dspace.storage.bitstore;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.core.Utils;
+
+/**
+ * BaseBitStoreService base implementation to store
+ * and organize assets in digits.
+ *
+ */
+public abstract class BaseBitStoreService implements BitStoreService {
+
+    protected static Logger log = LogManager.getLogger(DSBitStoreService.class);
+    // Checksum algorithm
+    protected static final String CSA = "MD5";
+    protected static final String MODIFIED = "modified";
+    protected static final String CHECKSUM_ALGORITHM = "checksum_algorithm";
+    protected static final String CHECKSUM = "checksum";
+    protected static final String SIZE_BYTES = "size_bytes";
+
+    protected boolean initialized = false;
+
+    // These settings control the way an identifier is hashed into
+    // directory and file names
+    //
+    // With digitsPerLevel 2 and directoryLevels 3, an identifier
+    // like 12345678901234567890 turns into the relative name
+    // /12/34/56/12345678901234567890.
+    //
+    // You should not change these settings if you have data in the
+    // asset store, as the BitstreamStorageManager will be unable
+    // to find your existing data.
+    protected static final int digitsPerLevel = 2;
+    protected static final int directoryLevels = 3;
+
+    /**
+     * Return the intermediate path derived from the internal_id. This method splits
+     * the id into groups which become subdirectories.
+     *
+     * @param internalId The internal_id
+     * @return The path based on the id without leading or trailing separators
+     */
+    protected String getIntermediatePath(String internalId) {
+        StringBuilder path = new StringBuilder();
+        if (StringUtils.isEmpty(internalId) || internalId.length() <= digitsPerLevel) {
+            return path.append(internalId).append(File.separator).toString();
+        }
+        populatePathSplittingId(internalId, path);
+        appendSeparator(path);
+        return path.toString();
+    }
+
+    /**
+     * Sanity Check: If the internal ID contains a pathname separator, it's probably
+     * an attempt to make a path traversal attack, so ignore the path prefix. The
+     * internal-ID is supposed to be just a filename, so this will not affect normal
+     * operation.
+     * 
+     * @param sInternalId
+     * @return Sanitized id
+     */
+    protected String sanitizeIdentifier(String sInternalId) {
+        if (sInternalId.contains(File.separator)) {
+            sInternalId = sInternalId.substring(sInternalId.lastIndexOf(File.separator) + 1);
+        }
+        return sInternalId;
+    }
+
+    /**
+     * Append separator to target {@code StringBuilder}
+     * 
+     * @param path
+     */
+    protected void appendSeparator(StringBuilder path) {
+        if (!endsWithSeparator(path)) {
+            path.append(File.separator);
+        }
+    }
+
+    /**
+     * Utility that checks string ending with separator
+     * 
+     * @param bufFilename
+     * @return
+     */
+    protected boolean endsWithSeparator(StringBuilder bufFilename) {
+        return bufFilename.lastIndexOf(File.separator) == bufFilename.length() - 1;
+    }
+
+    /**
+     * Splits internalId into several subpaths using {@code digitsPerLevel} that
+     * indicates the folder name length, and {@code direcoryLevels} that indicates
+     * the maximum number of subfolders.
+     * 
+     * @param internalId bitStream identifier
+     * @param path
+     */
+    protected void populatePathSplittingId(String internalId, StringBuilder path) {
+        int digits = 0;
+        path.append(extractSubstringFrom(internalId, digits, digits + digitsPerLevel));
+        for (int i = 1; i < directoryLevels && !isLonger(internalId, digits + digitsPerLevel); i++) {
+            digits = i * digitsPerLevel;
+            path.append(File.separator);
+            path.append(extractSubstringFrom(internalId, digits, digits + digitsPerLevel));
+        }
+    }
+
+    /**
+     * Extract substring if is in range, otherwise will truncate to length
+     * 
+     * @param internalId
+     * @param startIndex
+     * @param endIndex
+     * @return
+     */
+    protected String extractSubstringFrom(String internalId, int startIndex, int endIndex) {
+        if (isLonger(internalId, endIndex)) {
+            endIndex = internalId.length();
+        }
+        return internalId.substring(startIndex, endIndex);
+    }
+
+    /**
+     * Checks if the {@code String} is longer than {@code endIndex}
+     * 
+     * @param internalId
+     * @param endIndex
+     * @return
+     */
+    protected boolean isLonger(String internalId, int endIndex) {
+        return endIndex > internalId.length();
+    }
+
+    /**
+     * Retrieves a map of useful metadata about the File (size, checksum, modified)
+     * 
+     * @param file The File to analyze
+     * @param attrs The map where we are storing values
+     * @return Map of updated metadatas / attrs
+     * @throws IOException
+     */
+    public Map about(File file, Map attrs) throws IOException {
+        try {
+            if (file != null && file.exists()) {
+                this.putValueIfExistsKey(attrs, SIZE_BYTES, file.length());
+                if (attrs.containsKey(CHECKSUM)) {
+                    attrs.put(CHECKSUM, Utils.toHex(this.generateChecksumFrom(file)));
+                    attrs.put(CHECKSUM_ALGORITHM, CSA);
+                }
+                this.putValueIfExistsKey(attrs, MODIFIED, String.valueOf(file.lastModified()));
+                return attrs;
+            }
+            return null;
+        } catch (Exception e) {
+            log.error("about( FilePath: " + file.getAbsolutePath() + ", Map: " + attrs.toString() + ")", e);
+            throw new IOException(e);
+        }
+    }
+
+    @Override
+    public boolean isInitialized() {
+        return this.initialized;
+    }
+
+    private byte[] generateChecksumFrom(File file) throws FileNotFoundException, IOException {
+        // generate checksum by reading the bytes
+        try (FileInputStream fis = new FileInputStream(file)) {
+            return generateChecksumFrom(fis);
+        } catch (NoSuchAlgorithmException e) {
+            log.warn("Caught NoSuchAlgorithmException", e);
+            throw new IOException("Invalid checksum algorithm");
+        }
+    }
+
+    private byte[] generateChecksumFrom(FileInputStream fis) throws IOException, NoSuchAlgorithmException {
+        try (DigestInputStream dis = new DigestInputStream(fis, MessageDigest.getInstance(CSA))) {
+            final int BUFFER_SIZE = 1024 * 4;
+            final byte[] buffer = new byte[BUFFER_SIZE];
+            while (true) {
+                final int count = dis.read(buffer, 0, BUFFER_SIZE);
+                if (count == -1) {
+                    break;
+                }
+            }
+            return dis.getMessageDigest().digest();
+        }
+    }
+
+    protected void putValueIfExistsKey(Map attrs, String key, Object value) {
+        this.putEntryIfExistsKey(attrs, key, Map.entry(key, value));
+    }
+
+    protected void putEntryIfExistsKey(Map attrs, String key, Map.Entry entry) {
+        if (attrs.containsKey(key)) {
+            attrs.put(entry.getKey(), entry.getValue());
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/BitStoreService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/BitStoreService.java
index b33867f0e2..b6ac540c50 100644
--- a/dspace-api/src/main/java/org/dspace/storage/bitstore/BitStoreService.java
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/BitStoreService.java
@@ -77,4 +77,20 @@ public interface BitStoreService {
      * @throws java.io.IOException If a problem occurs while removing the asset
      */
     public void remove(Bitstream bitstream) throws IOException;
+
+    /**
+     * Determines if a store has been initialized
+     * 
+     * @return {@code boolean} true if initialized, false otherwise
+     */
+    public boolean isInitialized();
+
+    /**
+     * Determines if a store is enabled, by default is enabled
+     * 
+     * @return {@code boolean} true if enabled, false otherwise
+     */
+    public default boolean isEnabled() {
+        return true;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageServiceImpl.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageServiceImpl.java
index 8bf5d3cbd3..0bd71088da 100644
--- a/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageServiceImpl.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 import javax.annotation.Nullable;
 
 import org.apache.commons.collections4.MapUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.checker.service.ChecksumHistoryService;
@@ -57,13 +58,12 @@ import org.springframework.beans.factory.annotation.Autowired;
  * be notified of BitstreamStorageManager actions.</p>
  *
  * @author Peter Breton, Robert Tansley, David Little, Nathan Sarr
- * @version $Revision$
  */
 public class BitstreamStorageServiceImpl implements BitstreamStorageService, InitializingBean {
     /**
      * log4j log
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(BitstreamStorageServiceImpl.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired(required = true)
     protected BitstreamService bitstreamService;
@@ -73,7 +73,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
     /**
      * asset stores
      */
-    private Map<Integer, BitStoreService> stores = new HashMap<Integer, BitStoreService>();
+    private Map<Integer, BitStoreService> stores = new HashMap<>();
 
     /**
      * The index of the asset store to use for new bitstreams
@@ -92,7 +92,9 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
     @Override
     public void afterPropertiesSet() throws Exception {
         for (Map.Entry<Integer, BitStoreService> storeEntry : stores.entrySet()) {
-            storeEntry.getValue().init();
+            if (storeEntry.getValue().isEnabled() && !storeEntry.getValue().isInitialized()) {
+                storeEntry.getValue().init();
+            }
         }
     }
 
@@ -100,19 +102,18 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
     public UUID store(Context context, Bitstream bitstream, InputStream is) throws SQLException, IOException {
         // Create internal ID
         String id = Utils.generateKey();
-
-        bitstream.setDeleted(true);
-        bitstream.setInternalId(id);
-
         /*
          * Set the store number of the new bitstream If you want to use some
          * other method of working out where to put a new bitstream, here's
          * where it should go
          */
         bitstream.setStoreNumber(incoming);
+        bitstream.setDeleted(true);
+        bitstream.setInternalId(id);
 
+        BitStoreService store = this.getStore(incoming);
         //For efficiencies sake, PUT is responsible for setting bitstream size_bytes, checksum, and checksum_algorithm
-        stores.get(incoming).put(bitstream, is);
+        store.put(bitstream, is);
         //bitstream.setSizeBytes(file.length());
         //bitstream.setChecksum(Utils.toHex(dis.getMessageDigest().digest()));
         //bitstream.setChecksumAlgorithm("MD5");
@@ -169,7 +170,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
         wantedMetadata.put("checksum", null);
         wantedMetadata.put("checksum_algorithm", null);
 
-        Map receivedMetadata = stores.get(assetstore).about(bitstream, wantedMetadata);
+        Map receivedMetadata = this.getStore(assetstore).about(bitstream, wantedMetadata);
         if (MapUtils.isEmpty(receivedMetadata)) {
             String message = "Not able to register bitstream:" + bitstream.getID() + " at path: " + bitstreamPath;
             log.error(message);
@@ -204,7 +205,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
         wantedMetadata.put("checksum", null);
         wantedMetadata.put("checksum_algorithm", null);
 
-        Map receivedMetadata = stores.get(bitstream.getStoreNumber()).about(bitstream, wantedMetadata);
+        Map receivedMetadata = this.getStore(bitstream.getStoreNumber()).about(bitstream, wantedMetadata);
         return receivedMetadata;
     }
 
@@ -217,16 +218,15 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
     public InputStream retrieve(Context context, Bitstream bitstream)
         throws SQLException, IOException {
         Integer storeNumber = bitstream.getStoreNumber();
-        return stores.get(storeNumber).get(bitstream);
+        return this.getStore(storeNumber).get(bitstream);
     }
 
     @Override
     public void cleanup(boolean deleteDbRecords, boolean verbose) throws SQLException, IOException, AuthorizeException {
-        Context context = null;
+        Context context = new Context(Context.Mode.BATCH_EDIT);
         int commitCounter = 0;
 
         try {
-            context = new Context(Context.Mode.BATCH_EDIT);
             context.turnOffAuthorisationSystem();
 
             List<Bitstream> storage = bitstreamService.findDeletedBitstreams(context);
@@ -235,7 +235,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
                 Map wantedMetadata = new HashMap();
                 wantedMetadata.put("size_bytes", null);
                 wantedMetadata.put("modified", null);
-                Map receivedMetadata = stores.get(bitstream.getStoreNumber()).about(bitstream, wantedMetadata);
+                Map receivedMetadata = this.getStore(bitstream.getStoreNumber()).about(bitstream, wantedMetadata);
 
 
                 // Make sure entries which do not exist are removed
@@ -285,7 +285,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
                 // Since versioning allows for multiple bitstreams, check if the internal identifier isn't used on
                 // another place
                 if (bitstreamService.findDuplicateInternalIdentifier(context, bitstream).isEmpty()) {
-                    stores.get(bitstream.getStoreNumber()).remove(bitstream);
+                    this.getStore(bitstream.getStoreNumber()).remove(bitstream);
 
                     String message = ("Deleted bitstreamID " + bid + ", internalID " + bitstream.getInternalId());
                     if (log.isDebugEnabled()) {
@@ -321,9 +321,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
             context.abort();
             throw sqle;
         } finally {
-            if (context != null) {
-                context.restoreAuthSystemState();
-            }
+            context.restoreAuthSystemState();
         }
     }
 
@@ -332,7 +330,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
     public Long getLastModified(Bitstream bitstream) throws IOException {
         Map attrs = new HashMap();
         attrs.put("modified", null);
-        attrs = stores.get(bitstream.getStoreNumber()).about(bitstream, attrs);
+        attrs = this.getStore(bitstream.getStoreNumber()).about(bitstream, attrs);
         if (attrs == null || !attrs.containsKey("modified")) {
             return null;
         }
@@ -386,11 +384,12 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
      * @throws AuthorizeException Exception indicating the current user of the context does not have permission
      *                            to perform a particular action.
      */
+    @Override
     public void migrate(Context context, Integer assetstoreSource, Integer assetstoreDestination, boolean deleteOld,
                         Integer batchCommitSize) throws IOException, SQLException, AuthorizeException {
         //Find all the bitstreams on the old source, copy it to new destination, update store_number, save, remove old
         Iterator<Bitstream> allBitstreamsInSource = bitstreamService.findByStoreNumber(context, assetstoreSource);
-        Integer processedCounter = 0;
+        int processedCounter = 0;
 
         while (allBitstreamsInSource.hasNext()) {
             Bitstream bitstream = allBitstreamsInSource.next();
@@ -400,13 +399,13 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
                 .getName() + ", SizeBytes:" + bitstream.getSizeBytes());
 
             InputStream inputStream = retrieve(context, bitstream);
-            stores.get(assetstoreDestination).put(bitstream, inputStream);
+            this.getStore(assetstoreDestination).put(bitstream, inputStream);
             bitstream.setStoreNumber(assetstoreDestination);
             bitstreamService.update(context, bitstream);
 
             if (deleteOld) {
                 log.info("Removing bitstream:" + bitstream.getID() + " from assetstore[" + assetstoreSource + "]");
-                stores.get(assetstoreSource).remove(bitstream);
+                this.getStore(assetstoreSource).remove(bitstream);
             }
 
             processedCounter++;
@@ -424,14 +423,18 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
                 "] completed. " + processedCounter + " objects were transferred.");
     }
 
+    @Override
     public void printStores(Context context) {
         try {
 
             for (Integer storeNumber : stores.keySet()) {
                 long countBitstreams = bitstreamService.countByStoreNumber(context, storeNumber);
-                System.out.println("store[" + storeNumber + "] == " + stores.get(storeNumber).getClass()
-                                                                            .getSimpleName() + ", which has " +
-                                       countBitstreams + " bitstreams.");
+                BitStoreService store = this.stores.get(storeNumber);
+                System.out.println(
+                    "store[" + storeNumber + "] == " + store.getClass().getSimpleName() +
+                    ", which has initialized-status: " + store.isInitialized() +
+                    ", and has: " + countBitstreams + " bitstreams."
+                );
             }
             System.out.println("Incoming assetstore is store[" + incoming + "]");
         } catch (SQLException e) {
@@ -475,4 +478,13 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
         // Less than one hour old
         return (now - lastModified) < (1 * 60 * 1000);
     }
+
+    protected BitStoreService getStore(int position) throws IOException {
+        BitStoreService bitStoreService = this.stores.get(position);
+        if (!bitStoreService.isInitialized()) {
+            bitStoreService.init();
+        }
+        return bitStoreService;
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/DSBitStoreService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/DSBitStoreService.java
index 36f75c67f9..1fdf1e84e1 100644
--- a/dspace-api/src/main/java/org/dspace/storage/bitstore/DSBitStoreService.java
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/DSBitStoreService.java
@@ -29,33 +29,17 @@ import org.dspace.core.Utils;
  * @author Peter Breton, Robert Tansley, Richard Rodgers, Peter Dietz
  */
 
-public class DSBitStoreService implements BitStoreService {
+public class DSBitStoreService extends BaseBitStoreService {
     /**
      * log4j log
      */
     private static Logger log = org.apache.logging.log4j.LogManager.getLogger(DSBitStoreService.class);
 
-    // These settings control the way an identifier is hashed into
-    // directory and file names
-    //
-    // With digitsPerLevel 2 and directoryLevels 3, an identifier
-    // like 12345678901234567890 turns into the relative name
-    // /12/34/56/12345678901234567890.
-    //
-    // You should not change these settings if you have data in the
-    // asset store, as the BitstreamStorageManager will be unable
-    // to find your existing data.
-    private static final int digitsPerLevel = 2;
-
-    private static final int directoryLevels = 3;
-
-    // Checksum algorithm
-    private static final String CSA = "MD5";
-
     /**
      * the asset directory
      */
     private File baseDir;
+    protected final String REGISTERED_FLAG = "-R";
 
     public DSBitStoreService() {
     }
@@ -66,6 +50,7 @@ public class DSBitStoreService implements BitStoreService {
     public void init() {
         // the config string contains just the asset store directory path
         //set baseDir?
+        this.initialized = true;
     }
 
     /**
@@ -152,35 +137,7 @@ public class DSBitStoreService implements BitStoreService {
             // potentially expensive, since it may calculate the checksum
             File file = getFile(bitstream);
             if (file != null && file.exists()) {
-                if (attrs.containsKey("size_bytes")) {
-                    attrs.put("size_bytes", file.length());
-                }
-                if (attrs.containsKey("checksum")) {
-                    // generate checksum by reading the bytes
-                    DigestInputStream dis = null;
-                    try {
-                        FileInputStream fis = new FileInputStream(file);
-                        dis = new DigestInputStream(fis, MessageDigest.getInstance(CSA));
-                    } catch (NoSuchAlgorithmException e) {
-                        log.warn("Caught NoSuchAlgorithmException", e);
-                        throw new IOException("Invalid checksum algorithm");
-                    }
-                    final int BUFFER_SIZE = 1024 * 4;
-                    final byte[] buffer = new byte[BUFFER_SIZE];
-                    while (true) {
-                        final int count = dis.read(buffer, 0, BUFFER_SIZE);
-                        if (count == -1) {
-                            break;
-                        }
-                    }
-                    attrs.put("checksum", Utils.toHex(dis.getMessageDigest().digest()));
-                    attrs.put("checksum_algorithm", CSA);
-                    dis.close();
-                }
-                if (attrs.containsKey("modified")) {
-                    attrs.put("modified", String.valueOf(file.lastModified()));
-                }
-                return attrs;
+                return super.about(file, attrs);
             }
             return null;
         } catch (Exception e) {
@@ -278,10 +235,7 @@ public class DSBitStoreService implements BitStoreService {
             // make a path traversal attack, so ignore the path
             // prefix.  The internal-ID is supposed to be just a
             // filename, so this will not affect normal operation.
-            if (sInternalId.contains(File.separator)) {
-                sInternalId = sInternalId.substring(sInternalId.lastIndexOf(File.separator) + 1);
-            }
-
+            sInternalId = this.sanitizeIdentifier(sInternalId);
             sIntermediatePath = getIntermediatePath(sInternalId);
         }
 
@@ -297,29 +251,6 @@ public class DSBitStoreService implements BitStoreService {
         return new File(bufFilename.toString());
     }
 
-    /**
-     * Return the intermediate path derived from the internal_id. This method
-     * splits the id into groups which become subdirectories.
-     *
-     * @param iInternalId The internal_id
-     * @return The path based on the id without leading or trailing separators
-     */
-    protected String getIntermediatePath(String iInternalId) {
-        StringBuilder buf = new StringBuilder();
-        for (int i = 0; i < directoryLevels; i++) {
-            int digits = i * digitsPerLevel;
-            if (i > 0) {
-                buf.append(File.separator);
-            }
-            buf.append(iInternalId.substring(digits, digits
-                + digitsPerLevel));
-        }
-        buf.append(File.separator);
-        return buf.toString();
-    }
-
-    protected final String REGISTERED_FLAG = "-R";
-
     public boolean isRegisteredBitstream(String internalId) {
         return internalId.startsWith(REGISTERED_FLAG);
     }
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
index ce2b3b3f05..2bad0ac012 100644
--- a/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
@@ -11,20 +11,31 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
+import java.util.function.Supplier;
+import javax.validation.constraints.NotNull;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.AmazonS3Exception;
 import com.amazonaws.services.s3.model.GetObjectRequest;
 import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.services.s3.model.PutObjectResult;
 import com.amazonaws.services.s3.model.S3Object;
+import com.amazonaws.services.s3.transfer.TransferManager;
+import com.amazonaws.services.s3.transfer.TransferManagerBuilder;
+import com.amazonaws.services.s3.transfer.Upload;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -34,6 +45,9 @@ import org.dspace.content.Bitstream;
 import org.dspace.core.Utils;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.storage.bitstore.factory.StorageServiceFactory;
+import org.dspace.storage.bitstore.service.BitstreamStorageService;
+import org.dspace.util.FunctionalUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -42,9 +56,14 @@ import org.springframework.beans.factory.annotation.Autowired;
  * NB: you must have obtained an account with Amazon to use this store
  *
  * @author Richard Rodgers, Peter Dietz
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ *
  */
 
-public class S3BitStoreService implements BitStoreService {
+public class S3BitStoreService extends BaseBitStoreService {
+    protected static final String DEFAULT_BUCKET_PREFIX = "dspace-asset-";
+    // Prefix indicating a registered bitstream
+    protected final String REGISTERED_FLAG = "-R";
     /**
      * log4j log
      */
@@ -55,9 +74,25 @@ public class S3BitStoreService implements BitStoreService {
      */
     private static final String CSA = "MD5";
 
+    // These settings control the way an identifier is hashed into
+    // directory and file names
+    //
+    // With digitsPerLevel 2 and directoryLevels 3, an identifier
+    // like 12345678901234567890 turns into the relative name
+    // /12/34/56/12345678901234567890.
+    //
+    // You should not change these settings if you have data in the
+    // asset store, as the BitstreamStorageManager will be unable
+    // to find your existing data.
+    protected static final int digitsPerLevel = 2;
+    protected static final int directoryLevels = 3;
+
+    private boolean enabled = false;
+
     private String awsAccessKey;
     private String awsSecretKey;
     private String awsRegionName;
+    private boolean useRelativePath;
 
     /**
      * container for all the assets
@@ -74,9 +109,48 @@ public class S3BitStoreService implements BitStoreService {
      */
     private AmazonS3 s3Service = null;
 
+    /**
+     * S3 transfer manager
+     * this is reused between put calls to use less resources for multiple uploads
+     */
+    private TransferManager tm = null;
+
     private static final ConfigurationService configurationService
             = DSpaceServicesFactory.getInstance().getConfigurationService();
-    public S3BitStoreService() {
+
+    /**
+     * Utility method for generate AmazonS3 builder
+     *
+     * @param regions wanted regions in client
+     * @param awsCredentials credentials of the client
+     * @return builder with the specified parameters
+     */
+    protected static Supplier<AmazonS3> amazonClientBuilderBy(
+            @NotNull Regions regions,
+            @NotNull AWSCredentials awsCredentials
+    ) {
+        return () -> AmazonS3ClientBuilder.standard()
+                .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+                .withRegion(regions)
+                .build();
+    }
+
+    public S3BitStoreService() {}
+
+    /**
+     * This constructor is used for test purpose.
+     * In this way is possible to use a mocked instance of AmazonS3
+     *
+     * @param s3Service mocked AmazonS3 service
+     */
+    protected S3BitStoreService(AmazonS3 s3Service, TransferManager tm) {
+        this.s3Service = s3Service;
+        this.tm = tm;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return this.enabled;
     }
 
     /**
@@ -88,47 +162,70 @@ public class S3BitStoreService implements BitStoreService {
      */
     @Override
     public void init() throws IOException {
-        if (StringUtils.isBlank(getAwsAccessKey()) || StringUtils.isBlank(getAwsSecretKey())) {
-            log.warn("Empty S3 access or secret");
-        }
 
-        // init client
-        AWSCredentials awsCredentials = new BasicAWSCredentials(getAwsAccessKey(), getAwsSecretKey());
-        s3Service = new AmazonS3Client(awsCredentials);
-
-        // bucket name
-        if (StringUtils.isEmpty(bucketName)) {
-            // get hostname of DSpace UI to use to name bucket
-            String hostname = Utils.getHostName(configurationService.getProperty("dspace.ui.url"));
-            bucketName = "dspace-asset-" + hostname;
-            log.warn("S3 BucketName is not configured, setting default: " + bucketName);
+        if (this.isInitialized()) {
+            return;
         }
 
         try {
-            if (!s3Service.doesBucketExist(bucketName)) {
-                s3Service.createBucket(bucketName);
-                log.info("Creating new S3 Bucket: " + bucketName);
+            if (StringUtils.isNotBlank(getAwsAccessKey()) && StringUtils.isNotBlank(getAwsSecretKey())) {
+                log.warn("Use local defined S3 credentials");
+                // region
+                Regions regions = Regions.DEFAULT_REGION;
+                if (StringUtils.isNotBlank(awsRegionName)) {
+                    try {
+                        regions = Regions.fromName(awsRegionName);
+                    } catch (IllegalArgumentException e) {
+                        log.warn("Invalid aws_region: " + awsRegionName);
+                    }
+                }
+                // init client
+                s3Service = FunctionalUtils.getDefaultOrBuild(
+                        this.s3Service,
+                        amazonClientBuilderBy(
+                                regions,
+                                new BasicAWSCredentials(getAwsAccessKey(), getAwsSecretKey())
+                                )
+                        );
+                log.warn("S3 Region set to: " + regions.getName());
+            } else {
+                log.info("Using a IAM role or aws environment credentials");
+                s3Service = FunctionalUtils.getDefaultOrBuild(
+                        this.s3Service,
+                        AmazonS3ClientBuilder::defaultClient
+                        );
             }
-        } catch (AmazonClientException e) {
-            log.error(e);
-            throw new IOException(e);
-        }
 
-        // region
-        if (StringUtils.isNotBlank(awsRegionName)) {
-            try {
-                Regions regions = Regions.fromName(awsRegionName);
-                Region region = Region.getRegion(regions);
-                s3Service.setRegion(region);
-                log.info("S3 Region set to: " + region.getName());
-            } catch (IllegalArgumentException e) {
-                log.warn("Invalid aws_region: " + awsRegionName);
+            // bucket name
+            if (StringUtils.isEmpty(bucketName)) {
+                // get hostname of DSpace UI to use to name bucket
+                String hostname = Utils.getHostName(configurationService.getProperty("dspace.ui.url"));
+                bucketName = DEFAULT_BUCKET_PREFIX + hostname;
+                log.warn("S3 BucketName is not configured, setting default: " + bucketName);
             }
+
+            try {
+                if (!s3Service.doesBucketExist(bucketName)) {
+                    s3Service.createBucket(bucketName);
+                    log.info("Creating new S3 Bucket: " + bucketName);
+                }
+            } catch (AmazonClientException e) {
+                throw new IOException(e);
+            }
+            this.initialized = true;
+            log.info("AWS S3 Assetstore ready to go! bucket:" + bucketName);
+        } catch (Exception e) {
+            this.initialized = false;
+            log.error("Can't initialize this store!", e);
         }
 
         log.info("AWS S3 Assetstore ready to go! bucket:" + bucketName);
-    }
 
+        tm = FunctionalUtils.getDefaultOrBuild(tm, () -> TransferManagerBuilder.standard()
+                                                               .withAlwaysCalculateMultipartMd5(true)
+                                                               .withS3Client(s3Service)
+                                                               .build());
+    }
 
     /**
      * Return an identifier unique to this asset store instance
@@ -151,6 +248,10 @@ public class S3BitStoreService implements BitStoreService {
     @Override
     public InputStream get(Bitstream bitstream) throws IOException {
         String key = getFullKey(bitstream.getInternalId());
+        // Strip -R from bitstream key if it's registered
+        if (isRegisteredBitstream(key)) {
+            key = key.substring(REGISTERED_FLAG.length());
+        }
         try {
             S3Object object = s3Service.getObject(new GetObjectRequest(bucketName, key));
             return (object != null) ? object.getObjectContent() : null;
@@ -179,22 +280,24 @@ public class S3BitStoreService implements BitStoreService {
         try {
             FileUtils.copyInputStreamToFile(in, scratchFile);
             long contentLength = scratchFile.length();
+            // The ETag may or may not be and MD5 digest of the object data.
+            // Therefore, we precalculate before uploading
+            String localChecksum = org.dspace.curate.Utils.checksum(scratchFile, CSA);
 
-            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, scratchFile);
-            PutObjectResult putObjectResult = s3Service.putObject(putObjectRequest);
+            Upload upload = tm.upload(bucketName, key, scratchFile);
+
+            upload.waitForUploadResult();
 
             bitstream.setSizeBytes(contentLength);
-            bitstream.setChecksum(putObjectResult.getETag());
+            bitstream.setChecksum(localChecksum);
             bitstream.setChecksumAlgorithm(CSA);
 
-            scratchFile.delete();
-
-        } catch (AmazonClientException | IOException e) {
+        } catch (AmazonClientException | IOException | InterruptedException e) {
             log.error("put(" + bitstream.getInternalId() + ", is)", e);
             throw new IOException(e);
         } finally {
-            if (scratchFile.exists()) {
-                scratchFile.delete();
+            if (!scratchFile.delete()) {
+                scratchFile.deleteOnExit();
             }
         }
     }
@@ -215,21 +318,14 @@ public class S3BitStoreService implements BitStoreService {
     @Override
     public Map about(Bitstream bitstream, Map attrs) throws IOException {
         String key = getFullKey(bitstream.getInternalId());
+        // If this is a registered bitstream, strip the -R prefix before retrieving
+        if (isRegisteredBitstream(key)) {
+            key = key.substring(REGISTERED_FLAG.length());
+        }
         try {
             ObjectMetadata objectMetadata = s3Service.getObjectMetadata(bucketName, key);
-
             if (objectMetadata != null) {
-                if (attrs.containsKey("size_bytes")) {
-                    attrs.put("size_bytes", objectMetadata.getContentLength());
-                }
-                if (attrs.containsKey("checksum")) {
-                    attrs.put("checksum", objectMetadata.getETag());
-                    attrs.put("checksum_algorithm", CSA);
-                }
-                if (attrs.containsKey("modified")) {
-                    attrs.put("modified", String.valueOf(objectMetadata.getLastModified().getTime()));
-                }
-                return attrs;
+                return this.about(objectMetadata, attrs);
             }
         } catch (AmazonS3Exception e) {
             if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
@@ -242,6 +338,34 @@ public class S3BitStoreService implements BitStoreService {
         return null;
     }
 
+    /**
+     * Populates map values by checking key existence
+     * <br>
+     * Adds technical metadata about an asset in the asset store, like:
+     * <ul>
+     *  <li>size_bytes</li>
+     *  <li>checksum</li>
+     *  <li>checksum_algorithm</li>
+     *  <li>modified</li>
+     * </ul>
+     *
+     * @param objectMetadata containing technical data
+     * @param attrs map with keys populated
+     * @return Map of enriched attrs with values
+     */
+    public Map about(ObjectMetadata objectMetadata, Map attrs) {
+        if (objectMetadata != null) {
+            this.putValueIfExistsKey(attrs, SIZE_BYTES, objectMetadata.getContentLength());
+
+            // put CHECKSUM_ALGORITHM if exists CHECKSUM
+            this.putValueIfExistsKey(attrs, CHECKSUM, objectMetadata.getETag());
+            this.putEntryIfExistsKey(attrs, CHECKSUM, Map.entry(CHECKSUM_ALGORITHM, CSA));
+
+            this.putValueIfExistsKey(attrs, MODIFIED, String.valueOf(objectMetadata.getLastModified().getTime()));
+        }
+        return attrs;
+    }
+
     /**
      * Remove an asset from the asset store. An irreversible operation.
      *
@@ -266,11 +390,53 @@ public class S3BitStoreService implements BitStoreService {
      * @return full key prefixed with a subfolder, if applicable
      */
     public String getFullKey(String id) {
+        StringBuilder bufFilename = new StringBuilder();
         if (StringUtils.isNotEmpty(subfolder)) {
-            return subfolder + "/" + id;
-        } else {
-            return id;
+            bufFilename.append(subfolder);
+            appendSeparator(bufFilename);
         }
+
+        if (this.useRelativePath) {
+            bufFilename.append(getRelativePath(id));
+        } else {
+            bufFilename.append(id);
+        }
+
+        if (log.isDebugEnabled()) {
+            log.debug("S3 filepath for " + id + " is "
+                    + bufFilename.toString());
+        }
+
+        return bufFilename.toString();
+    }
+
+    /**
+     * there are 2 cases:
+     * - conventional bitstream, conventional storage
+     * - registered bitstream, conventional storage
+     *  conventional bitstream: dspace ingested, dspace random name/path
+     *  registered bitstream: registered to dspace, any name/path
+     *
+     * @param sInternalId
+     * @return Computed Relative path
+     */
+    public String getRelativePath(String sInternalId) {
+        BitstreamStorageService bitstreamStorageService = StorageServiceFactory.getInstance()
+                .getBitstreamStorageService();
+
+        String sIntermediatePath = StringUtils.EMPTY;
+        if (bitstreamStorageService.isRegisteredBitstream(sInternalId)) {
+            sInternalId = sInternalId.substring(REGISTERED_FLAG.length());
+        } else {
+            sInternalId = sanitizeIdentifier(sInternalId);
+            sIntermediatePath = getIntermediatePath(sInternalId);
+        }
+
+        return sIntermediatePath + sInternalId;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
     }
 
     public String getAwsAccessKey() {
@@ -316,6 +482,14 @@ public class S3BitStoreService implements BitStoreService {
         this.subfolder = subfolder;
     }
 
+    public boolean isUseRelativePath() {
+        return useRelativePath;
+    }
+
+    public void setUseRelativePath(boolean useRelativePath) {
+        this.useRelativePath = useRelativePath;
+    }
+
     /**
      * Contains a command-line testing tool. Expects arguments:
      * -a accessKey -s secretKey -f assetFileName
@@ -324,27 +498,37 @@ public class S3BitStoreService implements BitStoreService {
      * @throws Exception generic exception
      */
     public static void main(String[] args) throws Exception {
-        //TODO use proper CLI, or refactor to be a unit test. Can't mock this without keys though.
+        //TODO Perhaps refactor to be a unit test. Can't mock this without keys though.
 
         // parse command line
-        String assetFile = null;
-        String accessKey = null;
-        String secretKey = null;
+        Options options = new Options();
+        Option option;
 
-        for (int i = 0; i < args.length; i += 2) {
-            if (args[i].startsWith("-a")) {
-                accessKey = args[i + 1];
-            } else if (args[i].startsWith("-s")) {
-                secretKey = args[i + 1];
-            } else if (args[i].startsWith("-f")) {
-                assetFile = args[i + 1];
-            }
-        }
+        option = Option.builder("a").desc("access key").hasArg().required().build();
+        options.addOption(option);
 
-        if (accessKey == null || secretKey == null || assetFile == null) {
-            System.out.println("Missing arguments - exiting");
+        option = Option.builder("s").desc("secret key").hasArg().required().build();
+        options.addOption(option);
+
+        option = Option.builder("f").desc("asset file name").hasArg().required().build();
+        options.addOption(option);
+
+        DefaultParser parser = new DefaultParser();
+
+        CommandLine command;
+        try {
+            command = parser.parse(options, args);
+        } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            new HelpFormatter().printHelp(
+                    S3BitStoreService.class.getSimpleName() + "options", options);
             return;
         }
+
+        String accessKey = command.getOptionValue("a");
+        String secretKey = command.getOptionValue("s");
+        String assetFile = command.getOptionValue("f");
+
         S3BitStoreService store = new S3BitStoreService();
 
         AWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
@@ -358,9 +542,9 @@ public class S3BitStoreService implements BitStoreService {
         // get hostname of DSpace UI to use to name bucket
         String hostname = Utils.getHostName(configurationService.getProperty("dspace.ui.url"));
         //Bucketname should be lowercase
-        store.bucketName = "dspace-asset-" + hostname + ".s3test";
+        store.bucketName = DEFAULT_BUCKET_PREFIX + hostname + ".s3test";
         store.s3Service.createBucket(store.bucketName);
-/* Broken in DSpace 6 TODO Refactor
+        /* Broken in DSpace 6 TODO Refactor
         // time everything, todo, swtich to caliper
         long start = System.currentTimeMillis();
         // Case 1: store a file
@@ -413,4 +597,14 @@ public class S3BitStoreService implements BitStoreService {
         store.get(id);
 */
     }
+
+    /**
+     * Is this a registered bitstream? (not stored via this service originally)
+     * @param internalId
+     * @return
+     */
+    public boolean isRegisteredBitstream(String internalId) {
+        return internalId.startsWith(REGISTERED_FLAG);
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
index 8835e03104..1464fb44ec 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
 import javax.sql.DataSource;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.core.Context;
@@ -37,6 +38,7 @@ import org.dspace.workflow.factory.WorkflowServiceFactory;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.FlywayException;
 import org.flywaydb.core.api.MigrationInfo;
+import org.flywaydb.core.api.MigrationVersion;
 import org.flywaydb.core.api.callback.Callback;
 import org.flywaydb.core.api.configuration.FluentConfiguration;
 import org.flywaydb.core.internal.info.MigrationInfoDumper;
@@ -93,7 +95,7 @@ public class DatabaseUtils {
         // Usage checks
         if (argv.length < 1) {
             System.out.println("\nDatabase action argument is missing.");
-            System.out.println("Valid actions: 'test', 'info', 'migrate', 'repair', 'validate', " +
+            System.out.println("Valid actions: 'test', 'info', 'migrate', 'repair', 'skip', 'validate', " +
                     "'update-sequences' or 'clean'");
             System.out.println("\nOr, type 'database help' for more information.\n");
             System.exit(1);
@@ -111,280 +113,339 @@ public class DatabaseUtils {
             // *before* any other Flyway commands can be run. This is a safety check.
             FlywayUpgradeUtils.upgradeFlywayTable(flyway, dataSource.getConnection());
 
-            // "test" = Test Database Connection
-            if (argv[0].equalsIgnoreCase("test")) {
-                // Try to connect to the database
-                System.out.println("\nAttempting to connect to database");
-                try (Connection connection = dataSource.getConnection()) {
-                    System.out.println("Connected successfully!");
+            // Determine action param passed to "./dspace database"
+            switch (argv[0].toLowerCase(Locale.ENGLISH)) {
+                // "test" = Test Database Connection
+                case "test":
+                    // Try to connect to the database
+                    System.out.println("\nAttempting to connect to database");
+                    try (Connection connection = dataSource.getConnection()) {
+                        System.out.println("Connected successfully!");
 
-                    // Print basic database connection information
-                    printDBInfo(connection);
+                        // Print basic database connection information
+                        printDBInfo(connection);
 
-                    // Print any database warnings/errors found (if any)
-                    boolean issueFound = printDBIssues(connection);
+                        // Print any database warnings/errors found (if any)
+                        boolean issueFound = printDBIssues(connection);
 
-                    // If issues found, exit with an error status (even if connection succeeded).
-                    if (issueFound) {
-                        System.exit(1);
-                    } else {
-                        System.exit(0);
-                    }
-                } catch (SQLException sqle) {
-                    System.err.println("\nError running 'test': ");
-                    System.err.println(" - " + sqle);
-                    System.err.println("\nPlease see the DSpace documentation for assistance.\n");
-                    sqle.printStackTrace(System.err);
-                    System.exit(1);
-                }
-            } else if (argv[0].equalsIgnoreCase("info") || argv[0].equalsIgnoreCase("status")) {
-                try (Connection connection = dataSource.getConnection()) {
-                    // Print basic Database info
-                    printDBInfo(connection);
-
-                    // Get info table from Flyway
-                    System.out.println("\n" + MigrationInfoDumper.dumpToAsciiTable(flyway.info().all()));
-
-                    // If Flyway is NOT yet initialized, also print the determined version information
-                    // NOTE: search is case sensitive, as flyway table name is ALWAYS lowercase,
-                    // See: http://flywaydb.org/documentation/faq.html#case-sensitive
-                    if (!tableExists(connection, flyway.getConfiguration().getTable(), true)) {
-                        System.out
-                            .println("\nNOTE: This database is NOT yet initialized for auto-migrations (via Flyway).");
-                        // Determine which version of DSpace this looks like
-                        String dbVersion = determineDBVersion(connection);
-                        if (dbVersion != null) {
-                            System.out
-                                .println("\nYour database looks to be compatible with DSpace version " + dbVersion);
-                            System.out.println(
-                                "All upgrades *after* version " + dbVersion + " will be run during the next migration" +
-                                    ".");
-                            System.out.println("\nIf you'd like to upgrade now, simply run 'dspace database migrate'.");
-                        }
-                    }
-
-                    // Print any database warnings/errors found (if any)
-                    boolean issueFound = printDBIssues(connection);
-
-                    // If issues found, exit with an error status
-                    if (issueFound) {
-                        System.exit(1);
-                    } else {
-                        System.exit(0);
-                    }
-                } catch (SQLException e) {
-                    System.err.println("Info exception:");
-                    e.printStackTrace(System.err);
-                    System.exit(1);
-                }
-            } else if (argv[0].equalsIgnoreCase("migrate")) {
-                try (Connection connection = dataSource.getConnection()) {
-                    System.out.println("\nDatabase URL: " + connection.getMetaData().getURL());
-
-                    // "migrate" allows for an OPTIONAL second argument (only one may be specified):
-                    //    - "ignored" = Also run any previously "ignored" migrations during the migration
-                    //    - "force" = Even if no pending migrations exist, still run a migration to trigger callbacks.
-                    //    - [version] = ONLY run migrations up to a specific DSpace version (ONLY FOR TESTING)
-                    if (argv.length == 2) {
-                        if (argv[1].equalsIgnoreCase("ignored")) {
-                            System.out.println(
-                                "Migrating database to latest version AND running previously \"Ignored\" " +
-                                    "migrations... (Check logs for details)");
-                            // Update the database to latest version, but set "outOfOrder=true"
-                            // This will ensure any old migrations in the "ignored" state are now run
-                            updateDatabase(dataSource, connection, null, true);
-                        } else if (argv[1].equalsIgnoreCase("force")) {
-                            updateDatabase(dataSource, connection, null, false, true);
+                        // If issues found, exit with an error status (even if connection succeeded).
+                        if (issueFound) {
+                            System.exit(1);
                         } else {
-                            // Otherwise, we assume "argv[1]" is a valid migration version number
-                            // This is only for testing! Never specify for Production!
+                            System.exit(0);
+                        }
+                    } catch (SQLException sqle) {
+                        System.err.println("\nError running 'test': ");
+                        System.err.println(" - " + sqle);
+                        System.err.println("\nPlease see the DSpace documentation for assistance.\n");
+                        sqle.printStackTrace(System.err);
+                        System.exit(1);
+                    }
+                    break;
+                // "info" and "status" are identical and provide database info
+                case "info":
+                case "status":
+                    try (Connection connection = dataSource.getConnection()) {
+                        // Print basic Database info
+                        printDBInfo(connection);
+
+                        // Get info table from Flyway
+                        System.out.println("\n" + MigrationInfoDumper.dumpToAsciiTable(flyway.info().all()));
+
+                        // If Flyway is NOT yet initialized, also print the determined version information
+                        // NOTE: search is case sensitive, as flyway table name is ALWAYS lowercase,
+                        // See: http://flywaydb.org/documentation/faq.html#case-sensitive
+                        if (!tableExists(connection, flyway.getConfiguration().getTable(), true)) {
+                            System.out
+                                .println("\nNOTE: This database is NOT yet initialized for auto-migrations " +
+                                             "(via Flyway).");
+                            // Determine which version of DSpace this looks like
+                            String dbVersion = determineDBVersion(connection);
+                            if (dbVersion != null) {
+                                System.out
+                                    .println("\nYour database looks to be compatible with DSpace version " + dbVersion);
+                                System.out.println(
+                                    "All upgrades *after* version " + dbVersion + " will be run during the next " +
+                                        "migration.");
+                                System.out.println("\nIf you'd like to upgrade now, simply run 'dspace database " +
+                                                       "migrate'.");
+                            }
+                        }
+
+                        // Print any database warnings/errors found (if any)
+                        boolean issueFound = printDBIssues(connection);
+
+                        // If issues found, exit with an error status
+                        if (issueFound) {
+                            System.exit(1);
+                        } else {
+                            System.exit(0);
+                        }
+                    } catch (SQLException e) {
+                        System.err.println("Info exception:");
+                        e.printStackTrace(System.err);
+                        System.exit(1);
+                    }
+                    break;
+                // "migrate" = Run all pending database migrations
+                case "migrate":
+                    try (Connection connection = dataSource.getConnection()) {
+                        System.out.println("\nDatabase URL: " + connection.getMetaData().getURL());
+
+                        // "migrate" allows for an OPTIONAL second argument (only one may be specified):
+                        //    - "ignored" = Also run any previously "ignored" migrations during the migration
+                        //    - "force" = Even if no pending migrations exist, still run migrate to trigger callbacks.
+                        //    - [version] = ONLY run migrations up to a specific DSpace version (ONLY FOR TESTING)
+                        if (argv.length == 2) {
+                            if (argv[1].equalsIgnoreCase("ignored")) {
+                                System.out.println(
+                                    "Migrating database to latest version AND running previously \"Ignored\" " +
+                                        "migrations... (Check logs for details)");
+                                // Update the database to latest version, but set "outOfOrder=true"
+                                // This will ensure any old migrations in the "ignored" state are now run
+                                updateDatabase(dataSource, connection, null, true);
+                            } else if (argv[1].equalsIgnoreCase("force")) {
+                                updateDatabase(dataSource, connection, null, false, true);
+                            } else {
+                                // Otherwise, we assume "argv[1]" is a valid migration version number
+                                // This is only for testing! Never specify for Production!
+                                String migrationVersion = argv[1];
+                                BufferedReader input = new BufferedReader(
+                                        new InputStreamReader(System.in, StandardCharsets.UTF_8));
+
+                                System.out.println(
+                                    "You've specified to migrate your database ONLY to version " + migrationVersion +
+                                        " ...");
+                                System.out.println(
+                                    "\nWARNING: In this mode, we DISABLE all callbacks, which means that you will " +
+                                        "need to manually update registries and manually run a reindex. This is " +
+                                        "because you are attempting to use an OLD version (" + migrationVersion + ") " +
+                                        "Database with a newer DSpace API. NEVER do this in a PRODUCTION scenario. " +
+                                        "The resulting database is only useful for migration testing.\n");
+
+                                System.out.print(
+                                    "Are you SURE you only want to migrate your database to version " +
+                                        migrationVersion + "? [y/n]: ");
+                                String choiceString = input.readLine();
+                                input.close();
+
+                                if (choiceString.equalsIgnoreCase("y")) {
+                                    System.out.println(
+                                        "Migrating database ONLY to version " + migrationVersion + " ... " +
+                                            "(Check logs for details)");
+                                    // Update the database, to the version specified.
+                                    updateDatabase(dataSource, connection, migrationVersion, false);
+                                } else {
+                                    System.out.println("No action performed.");
+                                }
+                            }
+                        } else {
+                            System.out.println("Migrating database to latest version... " +
+                                                   "(Check dspace logs for details)");
+                            updateDatabase(dataSource, connection);
+                        }
+                        System.out.println("Done.");
+                        System.exit(0);
+                    } catch (SQLException e) {
+                        System.err.println("Migration exception:");
+                        e.printStackTrace(System.err);
+                        System.exit(1);
+                    }
+                    break;
+                // "repair" = Run Flyway repair script
+                case "repair":
+                    try (Connection connection = dataSource.getConnection();) {
+                        System.out.println("\nDatabase URL: " + connection.getMetaData().getURL());
+                        System.out.println(
+                            "Attempting to repair any previously failed migrations (or mismatched checksums) via " +
+                                "FlywayDB... (Check dspace logs for details)");
+                        flyway.repair();
+                        System.out.println("Done.");
+                        System.exit(0);
+                    } catch (SQLException | FlywayException e) {
+                        System.err.println("Repair exception:");
+                        e.printStackTrace(System.err);
+                        System.exit(1);
+                    }
+                    break;
+                // "skip" = Skip a specific Flyway migration (by telling Flyway it succeeded)
+                case "skip":
+                    try {
+                        // "skip" requires a migration version to skip. Only that exact version will be skipped.
+                        if (argv.length == 2) {
                             String migrationVersion = argv[1];
+
                             BufferedReader input = new BufferedReader(
-                                    new InputStreamReader(System.in, StandardCharsets.UTF_8));
-
+                                new InputStreamReader(System.in, StandardCharsets.UTF_8));
                             System.out.println(
-                                "You've specified to migrate your database ONLY to version " + migrationVersion + " " +
+                                "You've specified to SKIP the migration with version='" + migrationVersion + "' " +
                                     "...");
-                            System.out.println(
-                                "\nWARNING: In this mode, we DISABLE all callbacks, which means that you will need " +
-                                    "to manually update registries and manually run a reindex. This is because you " +
-                                    "are attempting to use an OLD version (" + migrationVersion + ") Database with " +
-                                    "a newer DSpace API. NEVER do this in a PRODUCTION scenario. The resulting " +
-                                    "database is only useful for migration testing.\n");
-
                             System.out.print(
-                                "Are you SURE you only want to migrate your database to version " + migrationVersion
-                                    + "? [y/n]: ");
+                                "\nWARNING: You should only skip migrations which are no longer required or have " +
+                                    "become obsolete. Skipping a REQUIRED migration may result in DSpace failing " +
+                                    "to startup or function properly. Are you sure you want to SKIP the " +
+                                    "migration with version '" + migrationVersion + "'? [y/n]: ");
                             String choiceString = input.readLine();
                             input.close();
 
                             if (choiceString.equalsIgnoreCase("y")) {
                                 System.out.println(
-                                    "Migrating database ONLY to version " + migrationVersion + " ... (Check logs for " +
-                                        "details)");
-                                // Update the database, to the version specified.
-                                updateDatabase(dataSource, connection, migrationVersion, false);
-                            } else {
-                                System.out.println("No action performed.");
+                                    "Attempting to skip migration with version " + migrationVersion + " " +
+                                        "... (Check logs for details)");
+                                skipMigration(dataSource, migrationVersion);
+                            }
+                        } else {
+                            System.out.println("The 'skip' command REQUIRES a version to be specified. " +
+                                                   "Only that single migration will be skipped. For the list " +
+                                                   "of migration versions use the 'info' command.");
+                        }
+                    } catch (IOException e) {
+                        System.err.println("Exception when attempting to skip migration:");
+                        e.printStackTrace(System.err);
+                        System.exit(1);
+                    }
+                    break;
+                // "validate" = Run Flyway validation to check for database errors/issues
+                case "validate":
+                    try (Connection connection = dataSource.getConnection();) {
+                        System.out.println("\nDatabase URL: " + connection.getMetaData().getURL());
+                        System.out
+                            .println("Attempting to validate database status (and migration checksums) via " +
+                                         "FlywayDB...");
+                        flyway.validate();
+                        System.out.println("No errors thrown. Validation succeeded. (Check dspace logs for more " +
+                                               "details)");
+                        System.exit(0);
+                    } catch (SQLException | FlywayException e) {
+                        System.err.println("Validation exception:");
+                        e.printStackTrace(System.err);
+                        System.exit(1);
+                    }
+                    break;
+                // "clean" = Run Flyway clean script
+                case "clean":
+                    // If clean is disabled, return immediately
+                    if (flyway.getConfiguration().isCleanDisabled()) {
+                        System.out.println(
+                            "\nWARNING: 'clean' command is currently disabled, as it is dangerous to run in " +
+                                "Production scenarios!");
+                        System.out.println(
+                            "\nIn order to run a 'clean' you first must enable it in your DSpace config by " +
+                                "specifying 'db.cleanDisabled=false'.\n");
+                        System.exit(1);
+                    }
+
+                    try (Connection connection = dataSource.getConnection()) {
+                        String dbType = getDbType(connection);
+
+                        // Not all Postgres user accounts will be able to run a 'clean',
+                        // as only 'superuser' accounts can remove the 'pgcrypto' extension.
+                        if (dbType.equals(DBMS_POSTGRES)) {
+                            // Check if database user has permissions suitable to run a clean
+                            if (!PostgresUtils.checkCleanPermissions(connection)) {
+                                String username = connection.getMetaData().getUserName();
+                                // Exit immediately, providing a descriptive error message
+                                System.out.println(
+                                    "\nERROR: The database user '" + username + "' does not have sufficient " +
+                                        "privileges to run a 'database clean' (via Flyway).");
+                                System.out.println(
+                                    "\nIn order to run a 'clean', the database user MUST have 'superuser' privileges");
+                                System.out.println(
+                                    "OR the '" + PostgresUtils.PGCRYPTO + "' extension must be installed in a " +
+                                        "separate schema (see documentation).");
+                                System.out.println(
+                                    "\nOptionally, you could also manually remove the '" + PostgresUtils.PGCRYPTO +
+                                        "' extension first (DROP EXTENSION " + PostgresUtils.PGCRYPTO +
+                                        " CASCADE;), then rerun the 'clean'");
+                                System.exit(1);
                             }
                         }
-                    } else {
-                        System.out.println("Migrating database to latest version... (Check dspace logs for details)");
-                        updateDatabase(dataSource, connection);
-                    }
-                    System.out.println("Done.");
-                    System.exit(0);
-                } catch (SQLException e) {
-                    System.err.println("Migration exception:");
-                    e.printStackTrace(System.err);
-                    System.exit(1);
-                }
-            } else if (argv[0].equalsIgnoreCase("repair")) {
-                // "repair" = Run Flyway repair script
 
-                try (Connection connection = dataSource.getConnection();) {
-                    System.out.println("\nDatabase URL: " + connection.getMetaData().getURL());
-                    System.out.println(
-                        "Attempting to repair any previously failed migrations (or mismatched checksums) via " +
-                            "FlywayDB... (Check dspace logs for details)");
-                    flyway.repair();
-                    System.out.println("Done.");
-                    System.exit(0);
-                } catch (SQLException | FlywayException e) {
-                    System.err.println("Repair exception:");
-                    e.printStackTrace(System.err);
-                    System.exit(1);
-                }
-            } else if (argv[0].equalsIgnoreCase("validate")) {
-                // "validate" = Run Flyway validation to check for database errors/issues
+                        BufferedReader input = new BufferedReader(new InputStreamReader(System.in,
+                                                                                        StandardCharsets.UTF_8));
 
-                try (Connection connection = dataSource.getConnection();) {
-                    System.out.println("\nDatabase URL: " + connection.getMetaData().getURL());
-                    System.out
-                        .println("Attempting to validate database status (and migration checksums) via FlywayDB...");
-                    flyway.validate();
-                    System.out.println("No errors thrown. Validation succeeded. (Check dspace logs for more details)");
-                    System.exit(0);
-                } catch (SQLException | FlywayException e) {
-                    System.err.println("Validation exception:");
-                    e.printStackTrace(System.err);
-                    System.exit(1);
-                }
-            } else if (argv[0].equalsIgnoreCase("clean")) {
-                // "clean" = Run Flyway clean script
-
-                // If clean is disabled, return immediately
-                if (flyway.getConfiguration().isCleanDisabled()) {
-                    System.out.println(
-                        "\nWARNING: 'clean' command is currently disabled, as it is dangerous to run in Production " +
-                            "scenarios!");
-                    System.out.println(
-                        "\nIn order to run a 'clean' you first must enable it in your DSpace config by specifying 'db" +
-                            ".cleanDisabled=false'.\n");
-                    System.exit(1);
-                }
-
-                try (Connection connection = dataSource.getConnection()) {
-                    String dbType = getDbType(connection);
-
-                    // Not all Postgres user accounts will be able to run a 'clean',
-                    // as only 'superuser' accounts can remove the 'pgcrypto' extension.
-                    if (dbType.equals(DBMS_POSTGRES)) {
-                        // Check if database user has permissions suitable to run a clean
-                        if (!PostgresUtils.checkCleanPermissions(connection)) {
-                            String username = connection.getMetaData().getUserName();
-                            // Exit immediately, providing a descriptive error message
+                        System.out.println("\nDatabase URL: " + connection.getMetaData().getURL());
+                        System.out
+                            .println("\nWARNING: ALL DATA AND TABLES IN YOUR DATABASE WILL BE PERMANENTLY DELETED.\n");
+                        System.out.println("There is NO turning back from this action. Backup your DB before " +
+                                               "continuing.");
+                        if (dbType.equals(DBMS_ORACLE)) {
+                            System.out.println("\nORACLE WARNING: your RECYCLEBIN will also be PURGED.\n");
+                        } else if (dbType.equals(DBMS_POSTGRES)) {
                             System.out.println(
-                                "\nERROR: The database user '" + username + "' does not have sufficient privileges to" +
-                                    " run a 'database clean' (via Flyway).");
-                            System.out.println(
-                                "\nIn order to run a 'clean', the database user MUST have 'superuser' privileges");
-                            System.out.println(
-                                "OR the '" + PostgresUtils.PGCRYPTO + "' extension must be installed in a separate " +
-                                    "schema (see documentation).");
-                            System.out.println(
-                                "\nOptionally, you could also manually remove the '" + PostgresUtils.PGCRYPTO + "' " +
-                                    "extension first (DROP EXTENSION " + PostgresUtils.PGCRYPTO + " CASCADE;), then " +
-                                    "rerun the 'clean'");
-                            System.exit(1);
+                                "\nPOSTGRES WARNING: the '" + PostgresUtils.PGCRYPTO + "' extension will be dropped " +
+                                "if it is in the same schema as the DSpace database.\n");
                         }
-                    }
+                        System.out.print("Do you want to PERMANENTLY DELETE everything from your database? [y/n]: ");
+                        String choiceString = input.readLine();
+                        input.close();
 
-                    BufferedReader input = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
-
-                    System.out.println("\nDatabase URL: " + connection.getMetaData().getURL());
-                    System.out
-                        .println("\nWARNING: ALL DATA AND TABLES IN YOUR DATABASE WILL BE PERMANENTLY DELETED.\n");
-                    System.out.println("There is NO turning back from this action. Backup your DB before continuing.");
-                    if (dbType.equals(DBMS_ORACLE)) {
-                        System.out.println("\nORACLE WARNING: your RECYCLEBIN will also be PURGED.\n");
-                    } else if (dbType.equals(DBMS_POSTGRES)) {
-                        System.out.println(
-                            "\nPOSTGRES WARNING: the '" + PostgresUtils.PGCRYPTO + "' extension will be dropped if it" +
-                                " is in the same schema as the DSpace database.\n");
-                    }
-                    System.out.print("Do you want to PERMANENTLY DELETE everything from your database? [y/n]: ");
-                    String choiceString = input.readLine();
-                    input.close();
-
-                    if (choiceString.equalsIgnoreCase("y")) {
-                        System.out.println("Scrubbing database clean... (Check dspace logs for details)");
-                        cleanDatabase(flyway, dataSource);
-                        System.out.println("Done.");
-                        System.exit(0);
-                    } else {
-                        System.out.println("No action performed.");
-                    }
-                } catch (SQLException e) {
-                    System.err.println("Clean exception:");
-                    e.printStackTrace(System.err);
-                    System.exit(1);
-                }
-            } else if (argv[0].equalsIgnoreCase("update-sequences")) {
-                try (Connection connection = dataSource.getConnection()) {
-                    String dbType = getDbType(connection);
-                    String sqlfile = "org/dspace/storage/rdbms/sqlmigration/" + dbType +
-                            "/update-sequences.sql";
-                    InputStream sqlstream = DatabaseUtils.class.getClassLoader().getResourceAsStream(sqlfile);
-                    if (sqlstream != null) {
-                        String s = IOUtils.toString(sqlstream, "UTF-8");
-                        if (!s.isEmpty()) {
-                            System.out.println("Running " + sqlfile);
-                            connection.createStatement().execute(s);
-                            System.out.println("update-sequences complete");
+                        if (choiceString.equalsIgnoreCase("y")) {
+                            System.out.println("Scrubbing database clean... (Check dspace logs for details)");
+                            cleanDatabase(flyway, dataSource);
+                            System.out.println("Done.");
+                            System.exit(0);
                         } else {
-                            System.err.println(sqlfile + " contains no SQL to execute");
+                            System.out.println("No action performed.");
                         }
-                    } else {
-                        System.err.println(sqlfile + " not found");
+                    } catch (SQLException e) {
+                        System.err.println("Clean exception:");
+                        e.printStackTrace(System.err);
+                        System.exit(1);
                     }
-                }
-            } else {
-                System.out.println("\nUsage: database [action]");
-                System.out.println("Valid actions: 'test', 'info', 'migrate', 'repair', " +
-                    "'update-sequences' or 'clean'");
-                System.out.println(
-                    " - test             = Performs a test connection to database to " +
-                    "validate connection settings");
-                System.out.println(
-                    " - info / status    = Describe basic info/status about database, including validating the " +
-                    "compatibility of this database");
-                System.out.println(
-                    " - migrate          = Migrate the database to the latest version");
-                System.out.println(
-                    " - repair           = Attempt to repair any previously failed database " +
-                    "migrations or checksum mismatches (via Flyway repair)");
-                System.out.println(
-                    " - validate         = Validate current database's migration status (via Flyway validate), " +
-                    "validating all migration checksums.");
-                System.out.println(
-                    " - update-sequences = Update database sequences after running AIP ingest.");
-                System.out.println(
-                    " - clean            = DESTROY all data and tables in database " +
-                    "(WARNING there is no going back!). " +
-                    "Requires 'db.cleanDisabled=false' setting in config.");
-                System.out.println("");
-                System.exit(0);
+                    break;
+                // "update-sequences" = Run DSpace's "update-sequences.sql" script
+                case "update-sequences":
+                    try (Connection connection = dataSource.getConnection()) {
+                        String dbType = getDbType(connection);
+                        String sqlfile = "org/dspace/storage/rdbms/sqlmigration/" + dbType +
+                                "/update-sequences.sql";
+                        InputStream sqlstream = DatabaseUtils.class.getClassLoader().getResourceAsStream(sqlfile);
+                        if (sqlstream != null) {
+                            String s = IOUtils.toString(sqlstream, StandardCharsets.UTF_8);
+                            if (!s.isEmpty()) {
+                                System.out.println("Running " + sqlfile);
+                                connection.createStatement().execute(s);
+                                System.out.println("update-sequences complete");
+                            } else {
+                                System.err.println(sqlfile + " contains no SQL to execute");
+                            }
+                        } else {
+                            System.err.println(sqlfile + " not found");
+                        }
+                    }
+                    break;
+                // default = show help information
+                default:
+                    System.out.println("\nUsage: database [action]");
+                    System.out.println("Valid actions: 'test', 'info', 'migrate', 'repair', 'skip', " +
+                        "'validate', 'update-sequences' or 'clean'");
+                    System.out.println(
+                        " - test             = Performs a test connection to database to " +
+                        "validate connection settings");
+                    System.out.println(
+                        " - info / status    = Describe basic info/status about database, including validating the " +
+                        "compatibility of this database");
+                    System.out.println(
+                        " - migrate          = Migrate the database to the latest version");
+                    System.out.println(
+                        " - repair           = Attempt to repair any previously failed database " +
+                        "migrations or checksum mismatches (via Flyway repair)");
+                    System.out.println(
+                        " - skip [version]   = Skip a single, pending or ignored migration, " +
+                        "ensuring it never runs.");
+                    System.out.println(
+                        " - validate         = Validate current database's migration status (via Flyway validate), " +
+                        "validating all migration checksums.");
+                    System.out.println(
+                        " - update-sequences = Update database sequences after running AIP ingest.");
+                    System.out.println(
+                        " - clean            = DESTROY all data and tables in database " +
+                        "(WARNING there is no going back!). " +
+                        "Requires 'db.cleanDisabled=false' setting in config.");
+                    System.out.println("");
+                    System.exit(0);
+                    break;
             }
 
         } catch (Exception e) {
@@ -406,6 +467,12 @@ public class DatabaseUtils {
         DatabaseMetaData meta = connection.getMetaData();
         String dbType = getDbType(connection);
         System.out.println("\nDatabase Type: " + dbType);
+        if (dbType.equals(DBMS_ORACLE)) {
+            System.out.println("====================================");
+            System.out.println("WARNING: Oracle support is deprecated!");
+            System.out.println("See https://github.com/DSpace/DSpace/issues/8214");
+            System.out.println("=====================================");
+        }
         System.out.println("Database URL: " + meta.getURL());
         System.out.println("Database Schema: " + getSchemaName(connection));
         System.out.println("Database Username: " + meta.getUserName());
@@ -539,6 +606,10 @@ public class DatabaseUtils {
             String dbType = getDbType(connection);
             connection.close();
 
+            if (dbType.equals(DBMS_ORACLE)) {
+                log.warn("ORACLE SUPPORT IS DEPRECATED! See https://github.com/DSpace/DSpace/issues/8214");
+            }
+
             // Determine location(s) where Flyway will load all DB migrations
             ArrayList<String> scriptLocations = new ArrayList<>();
 
@@ -776,6 +847,89 @@ public class DatabaseUtils {
         }
     }
 
+    /**
+     * Skips the given migration by marking it as "successful" in the Flyway table. This ensures
+     * the given migration will never be run again.
+     * <P>
+     * WARNING: Skipping a required migration can result in unexpected errors. Make sure the migration is
+     * not required (or obsolete) before skipping it.
+     * @param dataSource current DataSource
+     * @param skipVersion version of migration to skip
+     * @throws SQLException if error occurs
+     */
+    private static synchronized void skipMigration(DataSource dataSource,
+                                                   String skipVersion) throws SQLException {
+        if (null == dataSource) {
+            throw new SQLException("The datasource is a null reference -- cannot continue.");
+        }
+
+        try (Connection connection = dataSource.getConnection()) {
+            // Setup Flyway API against our database
+            FluentConfiguration flywayConfiguration = setupFlyway(dataSource);
+
+            // In order to allow for skipping "Ignored" migrations, we MUST set "outOfOrder=true".
+            // (Otherwise Ignored migrations never appear in the pending list)
+            flywayConfiguration.outOfOrder(true);
+
+            // Initialized Flyway object based on this configuration
+            Flyway flyway = flywayConfiguration.load();
+
+            // Find the migration we are skipping in the list of pending migrations
+            boolean foundMigration = false;
+            for (MigrationInfo migration : flyway.info().pending()) {
+                // If this migration matches our "skipVersion"
+                if (migration.getVersion().equals(MigrationVersion.fromVersion(skipVersion))) {
+                    foundMigration = true;
+                    System.out.println("Found migration matching version='" + skipVersion + "'. " +
+                                           "Changing state to 'Success' in order to skip it.");
+
+                    PreparedStatement statement = null;
+                    try {
+                        // Create SQL Insert which will log this migration as having already been run.
+                        String INSERT_SQL = "INSERT INTO " + FLYWAY_TABLE  + " " +
+                            "(" +
+                              "installed_rank, version, description, type, script, " +
+                              "checksum, installed_by, execution_time, success" +
+                            ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
+                        statement = connection.prepareStatement(INSERT_SQL);
+                        // installed_rank
+                        statement.setInt(1, getNextFlywayInstalledRank(flyway));
+                        // version
+                        statement.setString(2, migration.getVersion().getVersion());
+                        // description
+                        statement.setString(3, migration.getDescription());
+                        // type
+                        statement.setString(4, migration.getType().toString());
+                        // script
+                        statement.setString(5, migration.getScript());
+                        // checksum
+                        statement.setInt(6, migration.getChecksum());
+                        // installed_by
+                        statement.setString(7, getDBUserName(connection));
+                        // execution_time is set to zero as we didn't really execute it
+                        statement.setInt(8, 0);
+                        // success=true tells Flyway this migration no longer needs to be run.
+                        statement.setBoolean(9, true);
+
+                        // Run the INSERT
+                        statement.executeUpdate();
+                    } finally {
+                        if (statement != null && !statement.isClosed()) {
+                            statement.close();
+                        }
+                    }
+                }
+            }
+            if (!foundMigration) {
+                System.err.println("Could not find migration to skip! " +
+                                       "No 'Pending' or 'Ignored' migrations match version='" + skipVersion + "'");
+            }
+        } catch (FlywayException fe) {
+            // If any FlywayException (Runtime) is thrown, change it to a SQLException
+            throw new SQLException("Flyway error occurred", fe);
+        }
+    }
+
     /**
      * Clean the existing database, permanently removing all data and tables
      * <P>
@@ -1182,6 +1336,34 @@ public class DatabaseUtils {
         return schema;
     }
 
+    /**
+     * Get the Database User Name in use by this Connection.
+     *
+     * @param connection Current Database Connection
+     * @return User name as a string, or "null" if cannot be determined or unspecified
+     * @throws SQLException An exception that provides information on a database access error or other errors.
+     */
+    public static String getDBUserName(Connection connection)
+        throws SQLException {
+        String username = null;
+
+        // Try to get the schema from the DB connection itself.
+        // As long as the Database driver supports JDBC4.1, there should be a getSchema() method
+        // If this method is unimplemented or doesn't exist, it will throw an exception (likely an AbstractMethodError)
+        try {
+            username = connection.getMetaData().getUserName();
+        } catch (Exception | AbstractMethodError e) {
+            // ignore
+        }
+
+        // If we don't know our schema, let's try the schema in the DSpace configuration
+        if (StringUtils.isBlank(username)) {
+            username = canonicalize(connection, DSpaceServicesFactory.getInstance().getConfigurationService()
+                                                                     .getProperty("db.username"));
+        }
+        return username;
+    }
+
     /**
      * Return the canonical name for a database identifier based on whether this
      * database defaults to storing identifiers in uppercase or lowercase.
@@ -1433,4 +1615,22 @@ public class DatabaseUtils {
         }
         return null;
     }
+
+    /**
+     * Determine next valid "installed_rank" value from Flyway, based on the "installed_rank" of the
+     * last applied migration.
+     * @param flyway currently loaded Flyway
+     * @return next installed rank value
+     */
+    private static int getNextFlywayInstalledRank(Flyway flyway) throws FlywayException {
+        // Load all applied migrations
+        MigrationInfo[] appliedMigrations = flyway.info().applied();
+        // If no applied migrations, throw an error.
+        // This should never happen, but this would mean Flyway is not installed or initialized
+        if (ArrayUtils.isEmpty(appliedMigrations)) {
+            throw new FlywayException("Cannot determine next 'installed_rank' as no applied migrations exist");
+        }
+        // Find the last migration in the list, and increment its "installed_rank" by one.
+        return appliedMigrations[appliedMigrations.length - 1].getInstalledRank() + 1;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/EntityTypeServiceInitializer.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/EntityTypeServiceInitializer.java
index ebf790900b..e0e41516d0 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/EntityTypeServiceInitializer.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/EntityTypeServiceInitializer.java
@@ -49,6 +49,16 @@ public class EntityTypeServiceInitializer implements Callback {
         }
     }
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return EntityTypeServiceInitializer.class.getSimpleName();
+    }
+
     @Override
     public boolean supports(Event event, org.flywaydb.core.api.callback.Context context) {
         // Must run AFTER all migrations complete, since it is dependent on Hibernate
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/GroupServiceInitializer.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/GroupServiceInitializer.java
index 7338dd75bc..54498a1c64 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/GroupServiceInitializer.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/GroupServiceInitializer.java
@@ -51,6 +51,16 @@ public class GroupServiceInitializer implements Callback {
 
     }
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return GroupServiceInitializer.class.getSimpleName();
+    }
+
     /**
      * Events supported by this callback.
      * @param event Flyway event
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgreSQLCryptoChecker.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgreSQLCryptoChecker.java
index 5798f4254c..5459cc3cc3 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgreSQLCryptoChecker.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgreSQLCryptoChecker.java
@@ -97,6 +97,16 @@ public class PostgreSQLCryptoChecker implements Callback {
         }
     }
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return PostgreSQLCryptoChecker.class.getSimpleName();
+    }
+
     /**
      * Events supported by this callback.
      * @param event Flyway event
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
index ae8be0988a..7debf3ba44 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
@@ -12,6 +12,7 @@ import java.io.IOException;
 import java.sql.SQLException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
 
 import org.dspace.administer.MetadataImporter;
 import org.dspace.administer.RegistryImportException;
@@ -89,7 +90,7 @@ public class RegistryUpdater implements Callback {
         } catch (IOException | SQLException | ParserConfigurationException
                 | TransformerException | RegistryImportException
                 | AuthorizeException | NonUniqueMetadataException
-                | SAXException e) {
+                | SAXException | XPathExpressionException e) {
             log.error("Error attempting to update Bitstream Format and/or Metadata Registries", e);
             throw new RuntimeException("Error attempting to update Bitstream Format and/or Metadata Registries", e);
         } finally {
@@ -101,6 +102,16 @@ public class RegistryUpdater implements Callback {
     }
 
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return RegistryUpdater.class.getSimpleName();
+    }
+
     /**
      * Events supported by this callback.
      * @param event Flyway event
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/SiteServiceInitializer.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/SiteServiceInitializer.java
index 26e76804e1..872a633146 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/SiteServiceInitializer.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/SiteServiceInitializer.java
@@ -73,6 +73,16 @@ public class SiteServiceInitializer implements Callback {
 
     }
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return SiteServiceInitializer.class.getSimpleName();
+    }
+
     /**
      * Events supported by this callback.
      * @param event Flyway event
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/hibernate/DatabaseAwareLobType.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/hibernate/DatabaseAwareLobType.java
new file mode 100644
index 0000000000..95939f9902
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/hibernate/DatabaseAwareLobType.java
@@ -0,0 +1,57 @@
+/**
+ * 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/
+ */
+package org.dspace.storage.rdbms.hibernate;
+
+import org.apache.commons.lang.StringUtils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.hibernate.type.AbstractSingleColumnStandardBasicType;
+import org.hibernate.type.descriptor.java.StringTypeDescriptor;
+import org.hibernate.type.descriptor.sql.ClobTypeDescriptor;
+import org.hibernate.type.descriptor.sql.LongVarcharTypeDescriptor;
+import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
+
+/**
+ * A Hibernate @Type used to properly support the CLOB in both Postgres and Oracle.
+ * PostgreSQL doesn't have a CLOB type, instead it's a TEXT field.
+ * Normally, you'd use org.hibernate.type.TextType to support TEXT, but that won't work for Oracle.
+ * https://github.com/hibernate/hibernate-orm/blob/5.6/hibernate-core/src/main/java/org/hibernate/type/TextType.java
+ *
+ * This Type checks if we are using PostgreSQL.
+ * If so, it configures Hibernate to map CLOB to LongVarChar (same as org.hibernate.type.TextType)
+ * If not, it uses default CLOB (which works for other databases).
+ */
+public class DatabaseAwareLobType extends AbstractSingleColumnStandardBasicType<String> {
+
+    public static final DatabaseAwareLobType INSTANCE = new DatabaseAwareLobType();
+
+    public DatabaseAwareLobType() {
+        super( getDbDescriptor(), StringTypeDescriptor.INSTANCE );
+    }
+
+    public static SqlTypeDescriptor getDbDescriptor() {
+        if ( isPostgres() ) {
+            return LongVarcharTypeDescriptor.INSTANCE;
+        } else {
+            return ClobTypeDescriptor.DEFAULT;
+        }
+    }
+
+    private static boolean isPostgres() {
+        ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String dbDialect = configurationService.getProperty("db.dialect");
+
+        return StringUtils.containsIgnoreCase(dbDialect, "PostgreSQL");
+    }
+
+    @Override
+    public String getName() {
+        return "database_aware_lob";
+    }
+}
+
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/hibernate/postgres/DSpacePostgreSQL82Dialect.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/hibernate/postgres/DSpacePostgreSQL82Dialect.java
deleted file mode 100644
index 2701c22fd2..0000000000
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/hibernate/postgres/DSpacePostgreSQL82Dialect.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.storage.rdbms.hibernate.postgres;
-
-import java.sql.Types;
-
-import org.hibernate.dialect.PostgreSQL82Dialect;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.type.PostgresUUIDType;
-import org.hibernate.type.descriptor.sql.LongVarcharTypeDescriptor;
-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
-
-/**
- * UUID's are not supported by default in hibernate due to differences in the database in order to fix this a custom
- * sql dialect is needed.
- * Source: https://forum.hibernate.org/viewtopic.php?f=1&amp;t=1014157
- *
- * @author kevinvandevelde at atmire.com
- */
-public class DSpacePostgreSQL82Dialect extends PostgreSQL82Dialect {
-    @Override
-    public void contributeTypes(final org.hibernate.boot.model.TypeContributions typeContributions,
-                                final ServiceRegistry serviceRegistry) {
-        super.contributeTypes(typeContributions, serviceRegistry);
-        typeContributions.contributeType(new InternalPostgresUUIDType());
-    }
-
-    @Override
-    protected void registerHibernateType(int code, String name) {
-        super.registerHibernateType(code, name);
-    }
-
-    protected static class InternalPostgresUUIDType extends PostgresUUIDType {
-
-        @Override
-        protected boolean registerUnderJavaType() {
-            return true;
-        }
-    }
-
-    /**
-     * Override is needed to properly support the CLOB on metadatavalue in Postgres and Oracle.
-     *
-     * @param sqlCode {@linkplain java.sql.Types JDBC type-code} for the column mapped by this type.
-     * @return Descriptor for the SQL/JDBC side of a value mapping.
-     */
-    @Override
-    public SqlTypeDescriptor getSqlTypeDescriptorOverride(int sqlCode) {
-        SqlTypeDescriptor descriptor;
-        switch (sqlCode) {
-            case Types.CLOB: {
-                descriptor = LongVarcharTypeDescriptor.INSTANCE;
-                break;
-            }
-            default: {
-                descriptor = super.getSqlTypeDescriptorOverride(sqlCode);
-                break;
-            }
-        }
-        return descriptor;
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/MigrationUtils.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/MigrationUtils.java
index 624d0cb55a..842fc15e16 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/MigrationUtils.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/MigrationUtils.java
@@ -86,10 +86,11 @@ public class MigrationUtils {
                 cascade = true;
                 break;
             case "h2":
-                // In H2, constraints are listed in the "information_schema.constraints" table
+                // In H2, column constraints are listed in the "INFORMATION_SCHEMA.KEY_COLUMN_USAGE" table
                 constraintNameSQL = "SELECT DISTINCT CONSTRAINT_NAME " +
-                    "FROM information_schema.constraints " +
-                    "WHERE table_name = ? AND column_list = ?";
+                    "FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE " +
+                    "WHERE TABLE_NAME = ? AND COLUMN_NAME = ?";
+                cascade = true;
                 break;
             default:
                 throw new SQLException("DBMS " + dbtype + " is unsupported in this migration.");
diff --git a/dspace-api/src/main/java/org/dspace/submit/migration/SubmissionFormsMigration.java b/dspace-api/src/main/java/org/dspace/submit/migration/SubmissionFormsMigration.java
index 362f2720bb..db1fdcdd19 100644
--- a/dspace-api/src/main/java/org/dspace/submit/migration/SubmissionFormsMigration.java
+++ b/dspace-api/src/main/java/org/dspace/submit/migration/SubmissionFormsMigration.java
@@ -64,12 +64,6 @@ public class SubmissionFormsMigration extends DSpaceRunnable<SubmissionFormsMigr
         "<!ELEMENT input-forms (form-map, form-definitions, form-value-pairs) >";
     private List<File> tempFiles = new ArrayList<>();
 
-    /**
-     * We need to force this, because some dependency elsewhere interferes.
-     */
-    private static final String TRANSFORMER_FACTORY_CLASS
-        = "org.apache.xalan.processor.TransformerFactoryImpl";
-
     @Override
     public void internalRun() throws TransformerException {
         if (help) {
@@ -101,8 +95,7 @@ public class SubmissionFormsMigration extends DSpaceRunnable<SubmissionFormsMigr
         Result result = new StreamResult(new File(outputPath));
 
         // Create an instance of TransformerFactory
-        TransformerFactory transformerFactory = TransformerFactory.newInstance(
-            TRANSFORMER_FACTORY_CLASS, null);
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
 
         Transformer trans;
         try {
diff --git a/dspace-api/src/main/java/org/dspace/submit/migration/SubmissionFormsMigrationCliScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/submit/migration/SubmissionFormsMigrationCliScriptConfiguration.java
index ca0c93fbe7..41b15ddd7a 100644
--- a/dspace-api/src/main/java/org/dspace/submit/migration/SubmissionFormsMigrationCliScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/submit/migration/SubmissionFormsMigrationCliScriptConfiguration.java
@@ -53,11 +53,8 @@ public class SubmissionFormsMigrationCliScriptConfiguration<T extends Submission
             Options options = new Options();
 
             options.addOption("f", "input-forms", true, "Path to source input-forms.xml file location");
-            options.getOption("f").setType(String.class);
             options.addOption("s", "item-submission", true, "Path to source item-submission.xml file location");
-            options.getOption("s").setType(String.class);
             options.addOption("h", "help", false, "help");
-            options.getOption("h").setType(boolean.class);
 
             super.options = options;
         }
diff --git a/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java b/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
index bc2f117b3c..a6421b3f7a 100644
--- a/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
@@ -8,15 +8,17 @@
 package org.dspace.submit.model;
 
 import java.util.List;
+import javax.inject.Inject;
 
 import org.dspace.services.ConfigurationService;
 
 /**
+ * A collection of conditions to be met when uploading Bitstreams.
  * @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
  */
 public class UploadConfiguration {
 
-    private ConfigurationService configurationService;
+    private final ConfigurationService configurationService;
 
     private String metadataDefinition;
     private List<AccessConditionOption> options;
@@ -24,22 +26,52 @@ public class UploadConfiguration {
     private Boolean required;
     private String name;
 
+    /**
+     * Construct a bitstream uploading configuration.
+     * @param configurationService DSpace configuration provided by the DI container.
+     */
+    @Inject
+    public UploadConfiguration(ConfigurationService configurationService) {
+        this.configurationService = configurationService;
+    }
+
+    /**
+     * The list of access restriction types from which a submitter may choose.
+     * @return choices for restricting access to Bitstreams.
+     */
     public List<AccessConditionOption> getOptions() {
         return options;
     }
 
+    /**
+     * Set the list of access restriction types from which to choose.
+     * Required.  May be empty.
+     * @param options choices for restricting access to Bitstreams.
+     */
     public void setOptions(List<AccessConditionOption> options) {
         this.options = options;
     }
 
+    /**
+     * Name of the submission form to which these conditions are attached.
+     * @return the form's name.
+     */
     public String getMetadata() {
         return metadataDefinition;
     }
 
+    /**
+     * Name the submission form to which these conditions are attached.
+     * @param metadata the form's name.
+     */
     public void setMetadata(String metadata) {
         this.metadataDefinition = metadata;
     }
 
+    /**
+     * Limit on the maximum size of an uploaded Bitstream.
+     * @return maximum upload size in bytes.
+     */
     public Long getMaxSize() {
         if (maxSize == null) {
             maxSize = configurationService.getLongProperty("upload.max");
@@ -47,10 +79,18 @@ public class UploadConfiguration {
         return maxSize;
     }
 
+    /**
+     * Limit the maximum size of an uploaded Bitstream.
+     * @param maxSize maximum upload size in bytes.
+     */
     public void setMaxSize(Long maxSize) {
         this.maxSize = maxSize;
     }
 
+    /**
+     * Is at least one Bitstream required when submitting a new Item?
+     * @return true if a Bitstream is required.
+     */
     public Boolean isRequired() {
         if (required == null) {
             //defaults to true
@@ -60,25 +100,27 @@ public class UploadConfiguration {
         return required;
     }
 
+    /**
+     * Is at least one Bitstream required when submitting a new Item?
+     * @param required true if a Bitstream is required.
+     */
     public void setRequired(Boolean required) {
         this.required = required;
     }
 
-    public ConfigurationService getConfigurationService() {
-        return configurationService;
-    }
-
-    public void setConfigurationService(ConfigurationService configurationService) {
-        this.configurationService = configurationService;
-    }
-
+    /**
+     * The unique name of this configuration.
+     * @return configuration's name.
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Give this configuration a unique name.  Required.
+     * @param name configuration's name.
+     */
     public void setName(String name) {
         this.name = name;
     }
-
-
 }
diff --git a/dspace-api/src/main/java/org/dspace/testing/PubMedToImport.java b/dspace-api/src/main/java/org/dspace/testing/PubMedToImport.java
index b7ded5ecbf..ec51528429 100644
--- a/dspace-api/src/main/java/org/dspace/testing/PubMedToImport.java
+++ b/dspace-api/src/main/java/org/dspace/testing/PubMedToImport.java
@@ -24,10 +24,10 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
diff --git a/dspace-api/src/main/java/org/dspace/util/FunctionalUtils.java b/dspace-api/src/main/java/org/dspace/util/FunctionalUtils.java
new file mode 100644
index 0000000000..422c2405a8
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/util/FunctionalUtils.java
@@ -0,0 +1,61 @@
+/**
+ * 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/
+ */
+package org.dspace.util;
+
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * 
+ * These methods are linked to the functional paradigm and use {@code Functional} interfaces of java 8+, all the main
+ * interfaces are in the package {@link java.util.function}.
+ * 
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ *
+ */
+public class FunctionalUtils {
+
+    /**
+     * Private constructor, it's an Utils class with static methods / functions.
+     */
+    private FunctionalUtils() {
+    }
+
+    /**
+     * 
+     * Tests that {@code defaultValue} isn't null. If this test is positive, then
+     * returns the {@code defaultValue}; Otherwise builds a new instance using the
+     * {@code builder}
+     * 
+     * @param defaultValue default instance value
+     * @param builder      instance generator
+     * @return corresponding non-null instance
+     */
+    public static <T> T getDefaultOrBuild(T defaultValue, Supplier<T> builder) {
+        return getCheckDefaultOrBuild(Objects::nonNull, defaultValue, builder);
+    }
+
+    /**
+     * Tests the {@code defaultValue} using the {@code defaultValueChecker}. If its
+     * test is positive, then returns the {@code defaultValue}; Otherwise builds a
+     * new instance using the {@code builder}
+     * 
+     * @param defaultValueChecker checker that tests the defaultValue
+     * @param defaultValue        default instance value
+     * @param builder             supplier that generates a typed instance
+     * @return corresponding instance after check
+     */
+    public static <T> T getCheckDefaultOrBuild(Predicate<T> defaultValueChecker, T defaultValue, Supplier<T> builder) {
+        if (defaultValueChecker.test(defaultValue)) {
+            return defaultValue;
+        }
+        return builder.get();
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/util/SimpleMapConverter.java b/dspace-api/src/main/java/org/dspace/util/SimpleMapConverter.java
new file mode 100644
index 0000000000..2b0d8d96dd
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/util/SimpleMapConverter.java
@@ -0,0 +1,107 @@
+/**
+ * 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/
+ */
+package org.dspace.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.services.ConfigurationService;
+import org.springframework.util.Assert;
+
+/**
+ * Class that parse a properties file present in the crosswalks directory and
+ * allows to get its values given a key.
+ *
+ * @author Andrea Bollini
+ * @author Kostas Stamatis
+ * @author Luigi Andrea Pascarelli
+ * @author Panagiotis Koutsourakis
+ * @author Luca Giamminonni
+ */
+public class SimpleMapConverter {
+
+    private String converterNameFile; // The properties filename
+
+    private ConfigurationService configurationService;
+
+    private Map<String, String> mapping;
+
+    private String defaultValue = "";
+
+    /**
+     * Parse the configured property file.
+     */
+    public void init() {
+
+        Assert.notNull(converterNameFile, "No properties file name provided");
+        Assert.notNull(configurationService, "No configuration service provided");
+
+        String mappingFile = configurationService.getProperty(
+            "dspace.dir") + File.separator + "config" + File.separator + "crosswalks" + File.separator +
+            converterNameFile;
+
+        try (FileInputStream fis = new FileInputStream(new File(mappingFile))) {
+
+            Properties mapConfig = new Properties();
+            mapConfig.load(fis);
+
+            this.mapping = parseProperties(mapConfig);
+
+        } catch (Exception e) {
+            throw new IllegalArgumentException("An error occurs parsing " + mappingFile, e);
+        }
+
+    }
+
+    /**
+     * Returns the value related to the given key. If the given key is not found the
+     * incoming value is returned.
+     *
+     * @param  key the key to search for a value
+     * @return     the value
+     */
+    public String getValue(String key) {
+
+        String value = mapping.getOrDefault(key, defaultValue);
+
+        if (StringUtils.isBlank(value)) {
+            return key;
+        }
+
+        return value;
+    }
+
+    private Map<String, String> parseProperties(Properties properties) {
+
+        Map<String, String> mapping = new HashMap<String, String>();
+
+        for (Object key : properties.keySet()) {
+            String keyString = (String) key;
+            mapping.put(keyString, properties.getProperty(keyString, ""));
+        }
+
+        return mapping;
+
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public void setConverterNameFile(String converterNameFile) {
+        this.converterNameFile = converterNameFile;
+    }
+
+    public void setConfigurationService(ConfigurationService configurationService) {
+        this.configurationService = configurationService;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/util/SolrUpgradePre6xStatistics.java b/dspace-api/src/main/java/org/dspace/util/SolrUpgradePre6xStatistics.java
index 12a9970539..7dcebcc09f 100644
--- a/dspace-api/src/main/java/org/dspace/util/SolrUpgradePre6xStatistics.java
+++ b/dspace-api/src/main/java/org/dspace/util/SolrUpgradePre6xStatistics.java
@@ -240,8 +240,8 @@ public class SolrUpgradePre6xStatistics {
     /**
      * Print a status message appended with the processing time for the operation
      *
-     * @param header
-     *            Message to display
+     * @param numProcessed
+     *            count of records processed so far.
      * @param fromStart
      *            if true, report on processing time since the start of the program
      */
diff --git a/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java b/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java
index 8b0ca9aeb8..329332d315 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java
@@ -21,6 +21,7 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataSchema;
 import org.dspace.content.MetadataValue;
+import org.dspace.content.RelationshipMetadataValue;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
@@ -55,14 +56,24 @@ public abstract class AbstractVersionProvider {
             MetadataSchema metadataSchema = metadataField.getMetadataSchema();
             String unqualifiedMetadataField = metadataSchema.getName() + "." + metadataField.getElement();
             if (getIgnoredMetadataFields().contains(metadataField.toString('.')) ||
-                getIgnoredMetadataFields().contains(unqualifiedMetadataField + "." + Item.ANY)) {
-                //Skip this metadata field
+                getIgnoredMetadataFields().contains(unqualifiedMetadataField + "." + Item.ANY) ||
+                aMd instanceof RelationshipMetadataValue) {
+                //Skip this metadata field (ignored and/or virtual)
                 continue;
             }
 
-            itemService
-                .addMetadata(context, itemNew, metadataField, aMd.getLanguage(), aMd.getValue(), aMd.getAuthority(),
-                             aMd.getConfidence());
+            itemService.addMetadata(
+                context,
+                itemNew,
+                metadataField.getMetadataSchema().getName(),
+                metadataField.getElement(),
+                metadataField.getQualifier(),
+                aMd.getLanguage(),
+                aMd.getValue(),
+                aMd.getAuthority(),
+                aMd.getConfidence(),
+                aMd.getPlace()
+            );
         }
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java b/dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java
index 7903a49c31..d4590ae24e 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java
@@ -15,7 +15,9 @@ import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.content.Item;
+import org.dspace.content.Relationship;
 import org.dspace.content.WorkspaceItem;
+import org.dspace.content.service.RelationshipService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.core.Context;
 import org.dspace.identifier.IdentifierException;
@@ -44,6 +46,8 @@ public class DefaultItemVersionProvider extends AbstractVersionProvider implemen
     protected VersioningService versioningService;
     @Autowired(required = true)
     protected IdentifierService identifierService;
+    @Autowired(required = true)
+    protected RelationshipService relationshipService;
 
     @Override
     public Item createNewItemAndAddItInWorkspace(Context context, Item nativeItem) {
@@ -89,10 +93,18 @@ public class DefaultItemVersionProvider extends AbstractVersionProvider implemen
         }
     }
 
+    /**
+     * Copy all data (minus a few exceptions) from the old item to the new item.
+     * @param c the DSpace context.
+     * @param itemNew the new version of the item.
+     * @param previousItem the old version of the item.
+     * @return the new version of the item, with data from the old item.
+     */
     @Override
     public Item updateItemState(Context c, Item itemNew, Item previousItem) {
         try {
             copyMetadata(c, itemNew, previousItem);
+            copyRelationships(c, itemNew, previousItem);
             createBundlesAndAddBitstreams(c, itemNew, previousItem);
             try {
                 identifierService.reserve(c, itemNew);
@@ -114,4 +126,49 @@ public class DefaultItemVersionProvider extends AbstractVersionProvider implemen
             throw new RuntimeException(e.getMessage(), e);
         }
     }
+
+    /**
+     * Copy all relationships of the old item to the new item.
+     * At this point in the lifecycle of the item-version (before archival), only the opposite item receives
+     * "latest" status. On item archival of the item-version, the "latest" status of the relevant relationships
+     * will be updated.
+     * @param context the DSpace context.
+     * @param newItem the new version of the item.
+     * @param oldItem the old version of the item.
+     */
+    protected void copyRelationships(
+        Context context, Item newItem, Item oldItem
+    ) throws SQLException, AuthorizeException {
+        List<Relationship> oldRelationships = relationshipService.findByItem(context, oldItem, -1, -1, false, true);
+        for (Relationship oldRelationship : oldRelationships) {
+            if (oldRelationship.getLeftItem().equals(oldItem)) {
+                // current item is on left side of this relationship
+                relationshipService.create(
+                    context,
+                    newItem,  // new item
+                    oldRelationship.getRightItem(),
+                    oldRelationship.getRelationshipType(),
+                    oldRelationship.getLeftPlace(),
+                    oldRelationship.getRightPlace(),
+                    oldRelationship.getLeftwardValue(),
+                    oldRelationship.getRightwardValue(),
+                    Relationship.LatestVersionStatus.RIGHT_ONLY // only mark the opposite side as "latest" for now
+                );
+            } else if (oldRelationship.getRightItem().equals(oldItem)) {
+                // current item is on right side of this relationship
+                relationshipService.create(
+                    context,
+                    oldRelationship.getLeftItem(),
+                    newItem, // new item
+                    oldRelationship.getRelationshipType(),
+                    oldRelationship.getLeftPlace(),
+                    oldRelationship.getRightPlace(),
+                    oldRelationship.getLeftwardValue(),
+                    oldRelationship.getRightwardValue(),
+                    Relationship.LatestVersionStatus.LEFT_ONLY // only mark the opposite side as "latest" for now
+                );
+            }
+        }
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/versioning/ItemVersionProvider.java b/dspace-api/src/main/java/org/dspace/versioning/ItemVersionProvider.java
index 83369e0465..74014b6262 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/ItemVersionProvider.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/ItemVersionProvider.java
@@ -22,5 +22,12 @@ public interface ItemVersionProvider {
 
     public void deleteVersionedItem(Context c, Version versionToDelete, VersionHistory history) throws SQLException;
 
+    /**
+     * Copy all data (minus a few exceptions) from the old item to the new item.
+     * @param c the DSpace context.
+     * @param itemNew the new version of the item.
+     * @param previousItem the old version of the item.
+     * @return the new version of the item, with data from the old item.
+     */
     public Item updateItemState(Context c, Item itemNew, Item previousItem);
 }
diff --git a/dspace-api/src/main/java/org/dspace/versioning/VersioningConsumer.java b/dspace-api/src/main/java/org/dspace/versioning/VersioningConsumer.java
index 6683419844..63b5391d0a 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/VersioningConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/VersioningConsumer.java
@@ -7,39 +7,66 @@
  */
 package org.dspace.versioning;
 
-import java.util.HashSet;
-import java.util.Set;
+import static org.dspace.versioning.utils.RelationshipVersioningUtils.LatestVersionStatusChangelog.NO_CHANGES;
 
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.EntityType;
 import org.dspace.content.Item;
+import org.dspace.content.Relationship;
+import org.dspace.content.RelationshipType;
 import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.EntityTypeService;
 import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.discovery.IndexEventConsumer;
 import org.dspace.event.Consumer;
 import org.dspace.event.Event;
 import org.dspace.versioning.factory.VersionServiceFactory;
 import org.dspace.versioning.service.VersionHistoryService;
-import org.dspace.versioning.service.VersioningService;
+import org.dspace.versioning.utils.RelationshipVersioningUtils;
+import org.dspace.versioning.utils.RelationshipVersioningUtils.LatestVersionStatusChangelog;
 
 /**
+ * When a new version of an item is published, unarchive the previous version and
+ * update {@link Relationship#latestVersionStatus} of the relevant relationships.
+ *
  * @author Fabio Bolognesi (fabio at atmire dot com)
  * @author Mark Diggory (markd at atmire dot com)
  * @author Ben Bosman (ben at atmire dot com)
  */
 public class VersioningConsumer implements Consumer {
 
-    private static Set<Item> itemsToProcess;
+    private static final Logger log = LogManager.getLogger(VersioningConsumer.class);
+
+    private Set<Item> itemsToProcess;
 
     private VersionHistoryService versionHistoryService;
-    private VersioningService versioningService;
     private ItemService itemService;
-
+    private EntityTypeService entityTypeService;
+    private RelationshipTypeService relationshipTypeService;
+    private RelationshipService relationshipService;
+    private RelationshipVersioningUtils relationshipVersioningUtils;
 
     @Override
     public void initialize() throws Exception {
         versionHistoryService = VersionServiceFactory.getInstance().getVersionHistoryService();
-        versioningService = VersionServiceFactory.getInstance().getVersionService();
         itemService = ContentServiceFactory.getInstance().getItemService();
+        entityTypeService = ContentServiceFactory.getInstance().getEntityTypeService();
+        relationshipTypeService = ContentServiceFactory.getInstance().getRelationshipTypeService();
+        relationshipService = ContentServiceFactory.getInstance().getRelationshipService();
+        relationshipVersioningUtils = VersionServiceFactory.getInstance().getRelationshipVersioningUtils();
     }
 
     @Override
@@ -49,37 +76,399 @@ public class VersioningConsumer implements Consumer {
     @Override
     public void consume(Context ctx, Event event) throws Exception {
         if (itemsToProcess == null) {
-            itemsToProcess = new HashSet<Item>();
+            itemsToProcess = new HashSet<>();
         }
 
-        int st = event.getSubjectType();
-        int et = event.getEventType();
+        // only items
+        if (event.getSubjectType() != Constants.ITEM) {
+            return;
+        }
 
-        if (st == Constants.ITEM && et == Event.INSTALL) {
-            Item item = (Item) event.getSubject(ctx);
-            if (item != null && item.isArchived()) {
-                VersionHistory history = versionHistoryService.findByItem(ctx, item);
-                if (history != null) {
-                    Version latest = versionHistoryService.getLatestVersion(ctx, history);
-                    Version previous = versionHistoryService.getPrevious(ctx, history, latest);
-                    if (previous != null) {
-                        Item previousItem = previous.getItem();
-                        if (previousItem != null) {
-                            previousItem.setArchived(false);
-                            itemsToProcess.add(previousItem);
-                            //Fire a new modify event for our previous item
-                            //Due to the need to reindex the item in the search
-                            //and browse index we need to fire a new event
-                            ctx.addEvent(new Event(Event.MODIFY,
-                                                   previousItem.getType(), previousItem.getID(),
-                                                   null, itemService.getIdentifiers(ctx, previousItem)));
-                        }
-                    }
+        // only install events
+        if (event.getEventType() != Event.INSTALL) {
+            return;
+        }
+
+        // get the item (should be archived)
+        Item item = (Item) event.getSubject(ctx);
+        if (item == null || !item.isArchived()) {
+            return;
+        }
+
+        // get version history
+        VersionHistory history = versionHistoryService.findByItem(ctx, item);
+        if (history == null) {
+            return;
+        }
+
+        // get latest version
+        Version latestVersion = versionHistoryService.getLatestVersion(ctx, history);
+        if (latestVersion == null) {
+            return;
+        }
+
+        // get previous version
+        Version previousVersion = versionHistoryService.getPrevious(ctx, history, latestVersion);
+        if (previousVersion == null) {
+            return;
+        }
+
+        // get latest item
+        Item latestItem = latestVersion.getItem();
+        if (latestItem == null) {
+            String msg = String.format(
+                "Illegal state: Obtained version history of item with uuid %s, handle %s, but the latest item is null",
+                item.getID(), item.getHandle()
+            );
+            log.error(msg);
+            throw new IllegalStateException(msg);
+        }
+
+        // get previous item
+        Item previousItem = previousVersion.getItem();
+        if (previousItem == null) {
+            return;
+        }
+
+        // unarchive previous item
+        unarchiveItem(ctx, previousItem);
+
+        // update relationships
+        updateRelationships(ctx, latestItem, previousItem);
+    }
+
+    protected void unarchiveItem(Context ctx, Item item) {
+        item.setArchived(false);
+        itemsToProcess.add(item);
+        //Fire a new modify event for our previous item
+        //Due to the need to reindex the item in the search
+        //and browse index we need to fire a new event
+        ctx.addEvent(new Event(
+            Event.MODIFY, item.getType(), item.getID(), null, itemService.getIdentifiers(ctx, item)
+        ));
+    }
+
+    /**
+     * Update {@link Relationship#latestVersionStatus} of the relationships of both the old version and the new version
+     * of the item.
+     *
+     * This method will first locate all relationships that are eligible for an update,
+     * then it will try to match each of those relationships on the old version of given item
+     * with a relationship on the new version.
+     *
+     * One of the following scenarios will happen:
+     * - if a match is found, then the "latest" status on the side of given item is transferred from
+     *   the old relationship to the new relationship. This implies that on the page of the third-party item,
+     *   the old version of given item will NOT be shown anymore and the new version of given item will appear.
+     *   Both versions of the given item still show the third-party item on their pages.
+     * - if a relationship only exists on the new version of given item, then this method does nothing.
+     *   The status of those relationships should already have been set to "latest" on both sides during relationship
+     *   creation.
+     * - if a relationship only exists on the old version of given item, then we assume that the relationship is no
+     *   longer relevant to / has been removed from the new version of the item. The "latest" status is removed from
+     *   the side of the given item. This implies that on the page of the third-party item,
+     *   the relationship with given item will no longer be listed. The old version of given item still lists
+     *   the third-party item and the new version doesn't.
+     * @param ctx the DSpace context.
+     * @param latestItem the new version of the item.
+     * @param previousItem the old version of the item.
+     */
+    protected void updateRelationships(Context ctx, Item latestItem, Item previousItem) {
+        // check that the entity types of both items match
+        if (!doEntityTypesMatch(latestItem, previousItem)) {
+            return;
+        }
+
+        // get the entity type (same for both items)
+        EntityType entityType = getEntityType(ctx, latestItem);
+        if (entityType == null) {
+            return;
+        }
+
+        // get all relationship types that are linked to the given entity type
+        List<RelationshipType> relationshipTypes = getRelationshipTypes(ctx, entityType);
+        if (CollectionUtils.isEmpty(relationshipTypes)) {
+            return;
+        }
+
+        for (RelationshipType relationshipType : relationshipTypes) {
+            List<Relationship> latestItemRelationships = getAllRelationships(ctx, latestItem, relationshipType);
+            if (latestItemRelationships == null) {
+                continue;
+            }
+
+            List<Relationship> previousItemRelationships = getAllRelationships(ctx, previousItem, relationshipType);
+            if (previousItemRelationships == null) {
+                continue;
+            }
+
+            // NOTE: no need to loop through latestItemRelationships, because if no match can be found
+            //       (meaning a relationship is only present on the new version of the item), then it's
+            //       a newly added relationship and its status should have been set to BOTH during creation.
+            for (Relationship previousItemRelationship : previousItemRelationships) {
+                // determine on which side of the relationship the latest and previous item should be
+                boolean isLeft = previousItem.equals(previousItemRelationship.getLeftItem());
+                boolean isRight = previousItem.equals(previousItemRelationship.getRightItem());
+                if (isLeft == isRight) {
+                    Item leftItem = previousItemRelationship.getLeftItem();
+                    Item rightItem = previousItemRelationship.getRightItem();
+                    String msg = String.format(
+                        "Illegal state: could not determine side of item with uuid %s, handle %s in " +
+                        "relationship with id %s, rightward name %s between " +
+                        "left item with uuid %s, handle %s and right item with uuid %s, handle %s",
+                        previousItem.getID(), previousItem.getHandle(), previousItemRelationship.getID(),
+                        previousItemRelationship.getRelationshipType().getRightwardType(),
+                        leftItem.getID(), leftItem.getHandle(), rightItem.getID(), rightItem.getHandle()
+                    );
+                    log.error(msg);
+                    throw new IllegalStateException(msg);
+                }
+
+                // get the matching relationship on the latest item
+                Relationship latestItemRelationship =
+                    getMatchingRelationship(latestItem, isLeft, previousItemRelationship, latestItemRelationships);
+
+                // the other side of the relationship should be "latest", otherwise the relationship could not have been
+                // copied to the new item in the first place (by DefaultVersionProvider#copyRelationships)
+                if (relationshipVersioningUtils.otherSideIsLatest(
+                    isLeft, previousItemRelationship.getLatestVersionStatus()
+                )) {
+                    // Set the previous version of the item to non-latest. This implies that the previous version
+                    // of the item will not be shown anymore on the page of the third-party item. That makes sense,
+                    // because either the relationship has been deleted from the new version of the item (no match),
+                    // or the matching relationship (linked to new version) will receive "latest" status in
+                    // the next step.
+                    LatestVersionStatusChangelog changelog =
+                        relationshipVersioningUtils.updateLatestVersionStatus(previousItemRelationship, isLeft, false);
+                    reindexRelationship(ctx, changelog, previousItemRelationship);
+                }
+
+                if (latestItemRelationship != null) {
+                    // Set the new version of the item to latest if the relevant relationship exists (match found).
+                    // This implies that the new version of the item will appear on the page of the third-party item.
+                    // The old version of the item will not appear anymore on the page of the third-party item,
+                    // see previous step.
+                    LatestVersionStatusChangelog changelog =
+                        relationshipVersioningUtils.updateLatestVersionStatus(latestItemRelationship, isLeft, true);
+                    reindexRelationship(ctx, changelog, latestItemRelationship);
                 }
             }
         }
     }
 
+    /**
+     * If the {@link Relationship#latestVersionStatus} of the relationship has changed,
+     * an "item modified" event should be fired for both the left and right item of the relationship.
+     * On one item the relation.* fields will change. On the other item the relation.*.latestForDiscovery will change.
+     * The event will cause the items to be re-indexed by the {@link IndexEventConsumer}.
+     * @param ctx the DSpace context.
+     * @param changelog indicates which side of the relationship has changed.
+     * @param relationship the relationship.
+     */
+    protected void reindexRelationship(
+        Context ctx, LatestVersionStatusChangelog changelog, Relationship relationship
+    ) {
+        if (changelog == NO_CHANGES) {
+            return;
+        }
+
+        // on one item, relation.* fields will change
+        // on the other item, relation.*.latestForDiscovery will change
+
+        // reindex left item
+        Item leftItem = relationship.getLeftItem();
+        itemsToProcess.add(leftItem);
+        ctx.addEvent(new Event(
+            Event.MODIFY, leftItem.getType(), leftItem.getID(), null, itemService.getIdentifiers(ctx, leftItem)
+        ));
+
+        // reindex right item
+        Item rightItem = relationship.getRightItem();
+        itemsToProcess.add(rightItem);
+        ctx.addEvent(new Event(
+            Event.MODIFY, rightItem.getType(), rightItem.getID(), null, itemService.getIdentifiers(ctx, rightItem)
+        ));
+    }
+
+    /**
+     * Given two items, check if their entity types match.
+     * If one or both items don't have an entity type, comparing is pointless and this method will return false.
+     * @param latestItem the item that represents the most recent version.
+     * @param previousItem the item that represents the second-most recent version.
+     * @return true if the entity types of both items are non-null and equal, false otherwise.
+     */
+    protected boolean doEntityTypesMatch(Item latestItem, Item previousItem) {
+        String latestItemEntityType = itemService.getEntityTypeLabel(latestItem);
+        String previousItemEntityType = itemService.getEntityTypeLabel(previousItem);
+
+        // check if both items have an entity type
+        if (latestItemEntityType == null || previousItemEntityType == null) {
+            if (previousItemEntityType != null) {
+                log.warn(
+                    "Inconsistency: Item with uuid {}, handle {} has NO entity type, " +
+                    "but the previous version of that item with uuid {}, handle {} has entity type {}",
+                    latestItem.getID(), latestItem.getHandle(),
+                    previousItem.getID(), previousItem.getHandle(), previousItemEntityType
+                );
+            }
+
+            // one or both items do not have an entity type, so comparing is pointless
+            return false;
+        }
+
+        // check if the entity types are equal
+        if (!StringUtils.equals(latestItemEntityType, previousItemEntityType)) {
+            log.warn(
+                "Inconsistency: Item with uuid {}, handle {} has entity type {}, " +
+                "but the previous version of that item with uuid {}, handle {} has entity type {}",
+                latestItem.getID(), latestItem.getHandle(), latestItemEntityType,
+                previousItem.getID(), previousItem.getHandle(), previousItemEntityType
+            );
+            return false;
+        }
+
+        // success - the entity types of both items are non-null and equal
+        log.info(
+            "Item with uuid {}, handle {} and the previous version of that item with uuid {}, handle {} " +
+            "have the same entity type: {}",
+            latestItem.getID(), latestItem.getHandle(), previousItem.getID(), previousItem.getHandle(),
+            latestItemEntityType
+        );
+        return true;
+    }
+
+    /**
+     * Get the entity type (stored in metadata field dspace.entity.type) of any item.
+     * @param item the item.
+     * @return the entity type.
+     */
+    protected EntityType getEntityType(Context ctx, Item item) {
+        try {
+            return itemService.getEntityType(ctx, item);
+        } catch (SQLException e) {
+            log.error(
+                "Exception occurred when trying to obtain entity type with label {} of item with uuid {}, handle {}",
+                itemService.getEntityTypeLabel(item), item.getID(), item.getHandle(), e
+            );
+            return null;
+        }
+    }
+
+    /**
+     * Get all relationship types that have the given entity type on their left and/or right side.
+     * @param ctx the DSpace context.
+     * @param entityType the entity type for which all relationship types should be found.
+     * @return a list of relationship types (possibly empty), or null in case of error.
+     */
+    protected List<RelationshipType> getRelationshipTypes(Context ctx, EntityType entityType) {
+        try {
+            return relationshipTypeService.findByEntityType(ctx, entityType);
+        } catch (SQLException e) {
+            log.error(
+                "Exception occurred when trying to obtain relationship types via entity type with id {}, label {}",
+                entityType.getID(), entityType.getLabel(), e
+            );
+            return null;
+        }
+    }
+
+    /**
+     * Get all relationships of the given type linked to the given item.
+     * @param ctx the DSpace context.
+     * @param item the item.
+     * @param relationshipType the relationship type.
+     * @return a list of relationships (possibly empty), or null in case of error.
+     */
+    protected List<Relationship> getAllRelationships(Context ctx, Item item, RelationshipType relationshipType) {
+        try {
+            return relationshipService.findByItemAndRelationshipType(ctx, item, relationshipType, -1, -1, false);
+        } catch (SQLException e) {
+            log.error(
+                "Exception occurred when trying to obtain relationships of type with id {}, rightward name {} " +
+                "for item with uuid {}, handle {}",
+                relationshipType.getID(), relationshipType.getRightwardType(), item.getID(), item.getHandle(), e
+            );
+            return null;
+        }
+    }
+
+    /**
+     * From a list of relationships, find the relationship with the correct relationship type and items.
+     * If isLeft is true, the provided item should be on the left side of the relationship.
+     * If isLeft is false, the provided item should be on the right side of the relationship.
+     * In both cases, the other item is taken from the given relationship.
+     * @param latestItem the item that should either be on the left or right side of the returned relationship (if any).
+     * @param isLeft decide on which side of the relationship the provided item should be.
+     * @param previousItemRelationship the relationship from which the type and the other item are read.
+     * @param relationships the list of relationships that we'll search through.
+     * @return the relationship that satisfies the requirements (can only be one or zero).
+     */
+    protected Relationship getMatchingRelationship(
+        Item latestItem, boolean isLeft, Relationship previousItemRelationship, List<Relationship> relationships
+    ) {
+        Item leftItem = previousItemRelationship.getLeftItem();
+        RelationshipType relationshipType = previousItemRelationship.getRelationshipType();
+        Item rightItem = previousItemRelationship.getRightItem();
+
+        if (isLeft) {
+            return getMatchingRelationship(latestItem, relationshipType, rightItem, relationships);
+        } else {
+            return getMatchingRelationship(leftItem, relationshipType, latestItem, relationships);
+        }
+    }
+
+
+    /**
+     * Find the relationship with the given left item, relation type and right item, from a list of relationships.
+     * @param expectedLeftItem the relationship that we're looking for has this item on the left side.
+     * @param expectedRelationshipType the relationship that we're looking for has this relationship type.
+     * @param expectedRightItem the relationship that we're looking for has this item on the right side.
+     * @param relationships the list of relationships that we'll search through.
+     * @return the relationship that satisfies the requirements (can only be one or zero).
+     */
+    protected Relationship getMatchingRelationship(
+        Item expectedLeftItem, RelationshipType expectedRelationshipType, Item expectedRightItem,
+        List<Relationship> relationships
+    ) {
+        Integer expectedRelationshipTypeId = expectedRelationshipType.getID();
+
+        List<Relationship> matchingRelationships = relationships.stream()
+            .filter(relationship -> {
+                int relationshipTypeId = relationship.getRelationshipType().getID();
+
+                boolean leftItemMatches = expectedLeftItem.equals(relationship.getLeftItem());
+                boolean relationshipTypeMatches = expectedRelationshipTypeId == relationshipTypeId;
+                boolean rightItemMatches = expectedRightItem.equals(relationship.getRightItem());
+
+                return leftItemMatches && relationshipTypeMatches && rightItemMatches;
+            })
+            .distinct()
+            .collect(Collectors.toUnmodifiableList());
+
+        if (matchingRelationships.isEmpty()) {
+            return null;
+        }
+
+        // NOTE: this situation should never occur because the relationship table has a unique constraint
+        //       over the "left_id", "type_id" and "right_id" columns
+        if (matchingRelationships.size() > 1) {
+            String msg = String.format(
+                "Illegal state: expected 0 or 1 relationship, but found %s relationships (ids: %s) " +
+                "of type with id %s, rightward name %s " +
+                "between left item with uuid %s, handle %s and right item with uuid %s, handle %s",
+                matchingRelationships.size(),
+                matchingRelationships.stream().map(Relationship::getID).collect(Collectors.toUnmodifiableList()),
+                expectedRelationshipTypeId, expectedRelationshipType.getRightwardType(),
+                expectedLeftItem.getID(), expectedLeftItem.getHandle(),
+                expectedRightItem.getID(), expectedRightItem.getHandle()
+            );
+            log.error(msg);
+            throw new IllegalStateException(msg);
+        }
+
+        return matchingRelationships.get(0);
+    }
+
     @Override
     public void end(Context ctx) throws Exception {
         if (itemsToProcess != null) {
diff --git a/dspace-api/src/main/java/org/dspace/versioning/factory/VersionServiceFactory.java b/dspace-api/src/main/java/org/dspace/versioning/factory/VersionServiceFactory.java
index ecc3315a72..8e8cc786ca 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/factory/VersionServiceFactory.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/factory/VersionServiceFactory.java
@@ -10,6 +10,7 @@ package org.dspace.versioning.factory;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.versioning.service.VersionHistoryService;
 import org.dspace.versioning.service.VersioningService;
+import org.dspace.versioning.utils.RelationshipVersioningUtils;
 
 /**
  * Abstract factory to get services for the versioning package, use VersionServiceFactory.getInstance() to retrieve
@@ -23,6 +24,8 @@ public abstract class VersionServiceFactory {
 
     public abstract VersioningService getVersionService();
 
+    public abstract RelationshipVersioningUtils getRelationshipVersioningUtils();
+
     public static VersionServiceFactory getInstance() {
         return DSpaceServicesFactory.getInstance().getServiceManager()
                                     .getServiceByName("versionServiceFactory", VersionServiceFactory.class);
diff --git a/dspace-api/src/main/java/org/dspace/versioning/factory/VersionServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/versioning/factory/VersionServiceFactoryImpl.java
index 613cb4faf4..97e4083426 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/factory/VersionServiceFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/factory/VersionServiceFactoryImpl.java
@@ -9,6 +9,7 @@ package org.dspace.versioning.factory;
 
 import org.dspace.versioning.service.VersionHistoryService;
 import org.dspace.versioning.service.VersioningService;
+import org.dspace.versioning.utils.RelationshipVersioningUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -25,6 +26,9 @@ public class VersionServiceFactoryImpl extends VersionServiceFactory {
     @Autowired(required = true)
     protected VersioningService versionService;
 
+    @Autowired(required = true)
+    protected RelationshipVersioningUtils relationshipVersioningUtils;
+
     @Override
     public VersionHistoryService getVersionHistoryService() {
         return versionHistoryService;
@@ -34,4 +38,10 @@ public class VersionServiceFactoryImpl extends VersionServiceFactory {
     public VersioningService getVersionService() {
         return versionService;
     }
+
+    @Override
+    public RelationshipVersioningUtils getRelationshipVersioningUtils() {
+        return relationshipVersioningUtils;
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/versioning/utils/RelationshipVersioningUtils.java b/dspace-api/src/main/java/org/dspace/versioning/utils/RelationshipVersioningUtils.java
new file mode 100644
index 0000000000..5e40176082
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/versioning/utils/RelationshipVersioningUtils.java
@@ -0,0 +1,114 @@
+/**
+ * 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/
+ */
+package org.dspace.versioning.utils;
+
+import static org.dspace.versioning.utils.RelationshipVersioningUtils.LatestVersionStatusChangelog.LEFT_SIDE_CHANGED;
+import static org.dspace.versioning.utils.RelationshipVersioningUtils.LatestVersionStatusChangelog.NO_CHANGES;
+import static org.dspace.versioning.utils.RelationshipVersioningUtils.LatestVersionStatusChangelog.RIGHT_SIDE_CHANGED;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Relationship;
+import org.dspace.content.Relationship.LatestVersionStatus;
+
+/**
+ * Class with utility methods to manipulate relationships that are linked to versioned items.
+ * Specifically focussed on the "latest version status" of relationships,
+ * which controls which related items are relevant (visible) to any given item.
+ */
+public class RelationshipVersioningUtils {
+
+    private static final Logger log = LogManager.getLogger(RelationshipVersioningUtils.class);
+
+    /**
+     * Given a latest version status, check if the other side is "latest".
+     * If we look from the left, this implies BOTH and RIGHT_ONLY return true.
+     * If we look from the right, this implies BOTH and LEFT_ONLY return true.
+     * @param isLeft whether we should look from the left or right side.
+     * @param latestVersionStatus the latest version status.
+     * @return true if the other side has "latest" status, false otherwise.
+     */
+    public boolean otherSideIsLatest(boolean isLeft, LatestVersionStatus latestVersionStatus) {
+        if (latestVersionStatus == LatestVersionStatus.BOTH) {
+            return true;
+        }
+
+        return latestVersionStatus == (isLeft ? LatestVersionStatus.RIGHT_ONLY : LatestVersionStatus.LEFT_ONLY);
+    }
+
+    public enum LatestVersionStatusChangelog {
+        NO_CHANGES,
+        LEFT_SIDE_CHANGED,
+        RIGHT_SIDE_CHANGED
+    }
+
+    /**
+     * Update {@link Relationship#latestVersionStatus} of the given relationship.
+     * If isLatest = true, this method will never throw IllegalStateException.
+     * If isLatest = false, you should make sure that the selected side of given relationship
+     * currently has "latest" status, otherwise IllegalStateException will be thrown.
+     * @param relationship the relationship.
+     * @param updateLeftSide whether the status of the left item or the right item should be updated.
+     * @param isLatest to what the status should be set.
+     * @throws IllegalStateException if the operation would result in both the left side and the right side
+     *                               being set to non-latest.
+     */
+    public LatestVersionStatusChangelog updateLatestVersionStatus(
+        Relationship relationship, boolean updateLeftSide, boolean isLatest
+    ) throws IllegalStateException {
+        LatestVersionStatus lvs = relationship.getLatestVersionStatus();
+
+        boolean leftSideIsLatest = lvs == LatestVersionStatus.BOTH || lvs == LatestVersionStatus.LEFT_ONLY;
+        boolean rightSideIsLatest = lvs == LatestVersionStatus.BOTH || lvs == LatestVersionStatus.RIGHT_ONLY;
+
+        if (updateLeftSide) {
+            if (leftSideIsLatest == isLatest) {
+                return NO_CHANGES; // no change needed
+            }
+            leftSideIsLatest = isLatest;
+        } else {
+            if (rightSideIsLatest == isLatest) {
+                return NO_CHANGES; // no change needed
+            }
+            rightSideIsLatest = isLatest;
+        }
+
+        LatestVersionStatus newVersionStatus;
+        if (leftSideIsLatest && rightSideIsLatest) {
+            newVersionStatus = LatestVersionStatus.BOTH;
+        } else if (leftSideIsLatest) {
+            newVersionStatus = LatestVersionStatus.LEFT_ONLY;
+        } else if (rightSideIsLatest) {
+            newVersionStatus = LatestVersionStatus.RIGHT_ONLY;
+        } else {
+            String msg = String.format(
+                "Illegal state: cannot set %s item to latest = false, because relationship with id %s, " +
+                "rightward name %s between left item with uuid %s, handle %s and right item with uuid %s, handle %s " +
+                "has latest version status set to %s",
+                updateLeftSide ? "left" : "right", relationship.getID(),
+                relationship.getRelationshipType().getRightwardType(),
+                relationship.getLeftItem().getID(), relationship.getLeftItem().getHandle(),
+                relationship.getRightItem().getID(), relationship.getRightItem().getHandle(), lvs
+            );
+            log.error(msg);
+            throw new IllegalStateException(msg);
+        }
+
+        log.info(
+            "set latest version status from {} to {} for relationship with id {}, rightward name {} " +
+            "between left item with uuid {}, handle {} and right item with uuid {}, handle {}",
+            lvs, newVersionStatus, relationship.getID(), relationship.getRelationshipType().getRightwardType(),
+            relationship.getLeftItem().getID(), relationship.getLeftItem().getHandle(),
+            relationship.getRightItem().getID(), relationship.getRightItem().getHandle()
+        );
+        relationship.setLatestVersionStatus(newVersionStatus);
+
+        return updateLeftSide ? LEFT_SIDE_CHANGED : RIGHT_SIDE_CHANGED;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/vocabulary/ControlledVocabulary.java b/dspace-api/src/main/java/org/dspace/vocabulary/ControlledVocabulary.java
index ee1b0445bb..7f2bdc6ef7 100644
--- a/dspace-api/src/main/java/org/dspace/vocabulary/ControlledVocabulary.java
+++ b/dspace-api/src/main/java/org/dspace/vocabulary/ControlledVocabulary.java
@@ -15,8 +15,11 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
-import org.apache.xpath.XPathAPI;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.w3c.dom.Document;
@@ -56,7 +59,7 @@ public class ControlledVocabulary {
      *                                      TODO: add some caching !
      */
     public static ControlledVocabulary loadVocabulary(String fileName)
-        throws IOException, SAXException, ParserConfigurationException, TransformerException {
+        throws IOException, SAXException, ParserConfigurationException, XPathExpressionException {
         StringBuilder filePath = new StringBuilder();
         ConfigurationService configurationService
                 = DSpaceServicesFactory.getInstance().getConfigurationService();
@@ -70,7 +73,9 @@ public class ControlledVocabulary {
         if (controlledVocFile.exists()) {
             DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
             Document document = builder.parse(controlledVocFile);
-            return loadVocabularyNode(XPathAPI.selectSingleNode(document, "node"), "");
+            XPath xPath = XPathFactory.newInstance().newXPath();
+            Node node = (Node) xPath.compile("node").evaluate(document, XPathConstants.NODE);
+            return loadVocabularyNode(node, "");
         } else {
             return null;
         }
@@ -85,7 +90,8 @@ public class ControlledVocabulary {
      * @return a vocabulary node with all its children
      * @throws TransformerException should something go wrong with loading the xml
      */
-    private static ControlledVocabulary loadVocabularyNode(Node node, String initialValue) throws TransformerException {
+    private static ControlledVocabulary loadVocabularyNode(Node node, String initialValue)
+        throws XPathExpressionException {
         Node idNode = node.getAttributes().getNamedItem("id");
         String id = null;
         if (idNode != null) {
@@ -102,7 +108,9 @@ public class ControlledVocabulary {
         } else {
             value = label;
         }
-        NodeList subNodes = XPathAPI.selectNodeList(node, "isComposedBy/node");
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        NodeList subNodes = (NodeList) xPath.compile("isComposedBy/node").evaluate(node,
+                                                                                   XPathConstants.NODESET);
 
         List<ControlledVocabulary> subVocabularies = new ArrayList<>(subNodes.getLength());
         for (int i = 0; i < subNodes.getLength(); i++) {
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java
index c651097fcb..aecdccd55a 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java
@@ -100,7 +100,7 @@ public class WorkflowRequirementsServiceImpl implements WorkflowRequirementsServ
         //Then remove the current user from the inProgressUsers
         inProgressUserService.delete(context, inProgressUserService.findByWorkflowItemAndEPerson(context, wfi, user));
 
-        //Make sure the removed user has his custom rights removed
+        //Make sure the removed user has their custom rights removed
         xmlWorkflowService.removeUserItemPolicies(context, wfi.getItem(), user);
 
         Workflow workflow = workflowFactory.getWorkflow(wfi.getCollection());
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
index fbe06245ab..90f180ec87 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
@@ -447,7 +447,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
                                               enteredNewStep);
                     }
                 } else if (enteredNewStep) {
-                    // If the user finished his/her step, we keep processing until there is a UI step action or no
+                    // If the user finished their step, we keep processing until there is a UI step action or no
                     // step at all
                     nextStep = workflow.getNextStep(c, wfi, currentStep, currentOutcome.getResult());
                     c.turnOffAuthorisationSystem();
@@ -938,7 +938,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
                     authorizeService.removeEPersonPolicies(context, bitstream, e);
                 }
             }
-            // Ensure that the submitter always retains his resource policies
+            // Ensure that the submitter always retains their resource policies
             if (e.getID().equals(item.getSubmitter().getID())) {
                 grantSubmitterReadPolicies(context, item);
             }
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/Workflow.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/Workflow.java
index 636007344c..fd081b3a1b 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/Workflow.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/Workflow.java
@@ -8,7 +8,7 @@
 package org.dspace.xmlworkflow.state;
 
 import java.sql.SQLException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -118,7 +118,7 @@ public class Workflow implements BeanNameAware {
      * @return a map containing the roles, the role name will the key, the role itself the value
      */
     public Map<String, Role> getRoles() {
-        Map<String, Role> roles = new HashMap<>();
+        Map<String, Role> roles = new LinkedHashMap<>();
         for (Step step : steps) {
             if (step.getRole() != null) {
                 roles.put(step.getRole().getId(), step.getRole());
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SingleUserReviewAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SingleUserReviewAction.java
index 9ef554821d..27cf98f77f 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SingleUserReviewAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SingleUserReviewAction.java
@@ -25,7 +25,7 @@ import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 
 /**
  * Processing class of an action where a single user has
- * been assigned and he can either accept/reject the workflow item
+ * been assigned and they can either accept/reject the workflow item
  * or reject the task
  *
  * @author Bram De Schouwer (bram.deschouwer at dot com)
@@ -90,7 +90,7 @@ public class SingleUserReviewAction extends ProcessingAction {
             } else {
                 request.setAttribute("page", REJECT_PAGE);
             }
-            // We have pressed reject item, so take the user to a page where he can reject
+            // We have pressed reject item, so take the user to a page where they can reject
             return new ActionResult(ActionResult.TYPE.TYPE_PAGE);
         } else if (request.getParameter(SUBMIT_DECLINE_TASK) != null) {
             return new ActionResult(ActionResult.TYPE.TYPE_OUTCOME, OUTCOME_REJECT);
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignOriginalSubmitterAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignOriginalSubmitterAction.java
index 5d934ba189..0cd82fe770 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignOriginalSubmitterAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignOriginalSubmitterAction.java
@@ -136,7 +136,7 @@ public class AssignOriginalSubmitterAction extends UserSelectionAction {
     protected void createTaskForEPerson(Context c, XmlWorkflowItem wfi, Step step, WorkflowActionConfig actionConfig,
                                         EPerson user) throws SQLException, AuthorizeException, IOException {
         if (claimedTaskService.find(c, wfi, step.getId(), actionConfig.getId()) != null) {
-            workflowRequirementsService.addClaimedUser(c, wfi, step, c.getCurrentUser());
+            workflowRequirementsService.addClaimedUser(c, wfi, step, user);
             XmlWorkflowServiceFactory.getInstance().getXmlWorkflowService()
                                      .createOwnedTask(c, wfi, step, actionConfig, user);
         }
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java
index f64f1b3942..fb673725e1 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java
@@ -92,7 +92,7 @@ public class PoolTaskServiceImpl implements PoolTaskService {
             return poolTask;
         } else {
             //If the user has a is processing or has finished the step for a workflowitem, there is no need to look
-            // for pooltasks for one of his
+            // for pooltasks for one of their
             //groups because the user already has the task claimed
             if (inProgressUserService.findByWorkflowItemAndEPerson(context, workflowItem, ePerson) != null) {
                 return null;
diff --git a/dspace-api/src/main/resources/Messages.properties b/dspace-api/src/main/resources/Messages.properties
index 0583fb493c..c478e4e69b 100644
--- a/dspace-api/src/main/resources/Messages.properties
+++ b/dspace-api/src/main/resources/Messages.properties
@@ -119,3 +119,5 @@ org.dspace.app.rest.exception.RESTEmptyWorkflowGroupException.message = Refused
     workflow group {1}. Delete the tasks and group first if you want to remove this user.
 org.dspace.app.rest.exception.EPersonNameNotProvidedException.message = The eperson.firstname and eperson.lastname values need to be filled in
 org.dspace.app.rest.exception.GroupNameNotProvidedException.message = Cannot create group, no group name is provided
+org.dspace.app.rest.exception.GroupHasPendingWorkflowTasksException.message = Cannot delete group, the associated workflow role still has pending tasks
+org.dspace.app.rest.exception.PasswordNotValidException.message = New password is invalid. Valid passwords must be at least 8 characters long!
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V1.4__Upgrade_to_DSpace_1.4_schema.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V1.4__Upgrade_to_DSpace_1.4_schema.sql
index e00a651626..62d12fe5ce 100644
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V1.4__Upgrade_to_DSpace_1.4_schema.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V1.4__Upgrade_to_DSpace_1.4_schema.sql
@@ -245,13 +245,13 @@ insert into most_recent_checksum
 )
 select 
     bitstream.bitstream_id, 
-    '1', 
+    true,
     CASE WHEN bitstream.checksum IS NULL THEN '' ELSE bitstream.checksum END, 
     CASE WHEN bitstream.checksum IS NULL THEN '' ELSE bitstream.checksum END, 
     FORMATDATETIME(NOW(),'DD-MM-RRRR HH24:MI:SS'),
     FORMATDATETIME(NOW(),'DD-MM-RRRR HH24:MI:SS'),
     CASE WHEN bitstream.checksum_algorithm IS NULL THEN 'MD5' ELSE bitstream.checksum_algorithm END,
-    '1'
+    true
 from bitstream; 
 
 -- Update all the deleted checksums
@@ -263,7 +263,7 @@ update most_recent_checksum
 set to_be_processed = 0
 where most_recent_checksum.bitstream_id in (
 select bitstream_id
-from bitstream where deleted = '1' );
+from bitstream where deleted = true );
 
 -- this will insert into history table
 -- for the initial start 
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V5.0_2014.09.26__DS-1582_Metadata_For_All_Objects.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V5.0_2014.09.26__DS-1582_Metadata_For_All_Objects.sql
index 87551bdf4e..cd908279f1 100644
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V5.0_2014.09.26__DS-1582_Metadata_For_All_Objects.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V5.0_2014.09.26__DS-1582_Metadata_For_All_Objects.sql
@@ -36,7 +36,7 @@ alter table metadatavalue alter column resource_id set not null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 community_id AS resource_id,
 4 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'description' and qualifier is null) AS metadata_field_id,
@@ -47,7 +47,7 @@ FROM community where not introductory_text is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 community_id AS resource_id,
 4 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'description' and qualifier = 'abstract') AS metadata_field_id,
@@ -58,7 +58,7 @@ FROM community where not short_description is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 community_id AS resource_id,
 4 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'description' and qualifier = 'tableofcontents') AS metadata_field_id,
@@ -69,7 +69,7 @@ FROM community where not side_bar_text is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 community_id AS resource_id,
 4 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'rights' and qualifier is null) AS metadata_field_id,
@@ -80,7 +80,7 @@ FROM community where not copyright_text is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 community_id AS resource_id,
 4 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'title' and qualifier is null) AS metadata_field_id,
@@ -104,7 +104,7 @@ alter table community drop column name;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 collection_id AS resource_id,
 3 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'description' and qualifier is null) AS metadata_field_id,
@@ -115,7 +115,7 @@ FROM collection where not introductory_text is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 collection_id AS resource_id,
 3 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'description' and qualifier = 'abstract') AS metadata_field_id,
@@ -126,7 +126,7 @@ FROM collection where not short_description is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 collection_id AS resource_id,
 3 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'description' and qualifier = 'tableofcontents') AS metadata_field_id,
@@ -137,7 +137,7 @@ FROM collection where not side_bar_text is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 collection_id AS resource_id,
 3 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'rights' and qualifier is null) AS metadata_field_id,
@@ -148,7 +148,7 @@ FROM collection where not copyright_text is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 collection_id AS resource_id,
 3 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'title' and qualifier is null) AS metadata_field_id,
@@ -159,7 +159,7 @@ FROM collection where not name is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 collection_id AS resource_id,
 3 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'provenance' and qualifier is null) AS metadata_field_id,
@@ -170,7 +170,7 @@ FROM collection where not provenance_description is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 collection_id AS resource_id,
 3 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'rights' and qualifier = 'license') AS metadata_field_id,
@@ -194,7 +194,7 @@ alter table collection drop column provenance_description;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 bundle_id AS resource_id,
 1 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'title' and qualifier is null) AS metadata_field_id,
@@ -214,7 +214,7 @@ alter table bundle drop column name;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 bitstream_id AS resource_id,
 0 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'title' and qualifier is null) AS metadata_field_id,
@@ -225,7 +225,7 @@ FROM bitstream where not name is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 bitstream_id AS resource_id,
 0 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'description' and qualifier is null) AS metadata_field_id,
@@ -236,7 +236,7 @@ FROM bitstream where not description is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 bitstream_id AS resource_id,
 0 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'format' and qualifier is null) AS metadata_field_id,
@@ -247,7 +247,7 @@ FROM bitstream where not user_format_description is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 bitstream_id AS resource_id,
 0 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'source' and qualifier is null) AS metadata_field_id,
@@ -269,7 +269,7 @@ alter table bitstream drop column source;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 eperson_group_id AS resource_id,
 6 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='dc') and element = 'title' and qualifier is null) AS metadata_field_id,
@@ -288,7 +288,7 @@ alter table epersongroup drop column name;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 eperson_id AS resource_id,
 7 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='eperson') and element = 'firstname' and qualifier is null) AS metadata_field_id,
@@ -299,7 +299,7 @@ FROM eperson where not firstname is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 eperson_id AS resource_id,
 7 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='eperson') and element = 'lastname' and qualifier is null) AS metadata_field_id,
@@ -310,7 +310,7 @@ FROM eperson where not lastname is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 eperson_id AS resource_id,
 7 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='eperson') and element = 'phone' and qualifier is null) AS metadata_field_id,
@@ -321,7 +321,7 @@ FROM eperson where not phone is null;
 
 INSERT INTO metadatavalue (metadata_value_id, resource_id, resource_type_id, metadata_field_id, text_value, text_lang, place)
 SELECT
-metadatavalue_seq.nextval as metadata_value_id,
+NEXT VALUE FOR metadatavalue_seq as metadata_value_id,
 eperson_id AS resource_id,
 7 AS resource_type_id,
 (select metadata_field_id from metadatafieldregistry where metadata_schema_id=(select metadata_schema_id from metadataschemaregistry where short_id='eperson') and element = 'language' and qualifier is null) AS metadata_field_id,
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V5.6_2016.08.23__DS-3097.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V5.6_2016.08.23__DS-3097.sql
index 2e09b807de..0bd68c5201 100644
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V5.6_2016.08.23__DS-3097.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V5.6_2016.08.23__DS-3097.sql
@@ -14,11 +14,11 @@ UPDATE resourcepolicy SET action_id = 12 where action_id = 0 and resource_type_i
 	SELECT bundle2bitstream.bitstream_id FROM bundle2bitstream
 		LEFT JOIN item2bundle ON bundle2bitstream.bundle_id = item2bundle.bundle_id
 		LEFT JOIN item ON item2bundle.item_id = item.item_id
-		WHERE item.withdrawn = 1
+		WHERE item.withdrawn = true
 );
 
 UPDATE resourcepolicy SET action_id = 12 where action_id = 0 and resource_type_id = 1 and resource_id in (
 	SELECT item2bundle.bundle_id FROM item2bundle
 		LEFT JOIN item ON item2bundle.item_id = item.item_id
-		WHERE item.withdrawn = 1
+		WHERE item.withdrawn = true
 );
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2016.04.14__DS-3125-fix-bundle-bitstream-delete-rights.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2016.04.14__DS-3125-fix-bundle-bitstream-delete-rights.sql
index 1c98ceef2a..1ee23246ea 100644
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2016.04.14__DS-3125-fix-bundle-bitstream-delete-rights.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2016.04.14__DS-3125-fix-bundle-bitstream-delete-rights.sql
@@ -17,7 +17,7 @@
 INSERT INTO resourcepolicy (policy_id, resource_type_id, resource_id, action_id, start_date, end_date, rpname,
 rptype, rpdescription, eperson_id, epersongroup_id, dspace_object)
 SELECT
-resourcepolicy_seq.nextval AS policy_id,
+NEXT VALUE FOR resourcepolicy_seq AS policy_id,
 resource_type_id,
 resource_id,
 -- Insert the Constants.DELETE action
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2016.08.23__DS-3097.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2016.08.23__DS-3097.sql
index e1220c8c7c..5bb59970c5 100644
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2016.08.23__DS-3097.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2016.08.23__DS-3097.sql
@@ -14,11 +14,11 @@ UPDATE resourcepolicy SET action_id = 12 where action_id = 0 and dspace_object i
 	SELECT bundle2bitstream.bitstream_id FROM bundle2bitstream
 		LEFT JOIN item2bundle ON bundle2bitstream.bundle_id = item2bundle.bundle_id
 		LEFT JOIN item ON item2bundle.item_id = item.uuid
-		WHERE item.withdrawn = 1
+		WHERE item.withdrawn = true
 );
 
 UPDATE resourcepolicy SET action_id = 12 where action_id = 0 and dspace_object in (
 	SELECT item2bundle.bundle_id FROM item2bundle
 		LEFT JOIN item ON item2bundle.item_id = item.uuid
-		WHERE item.withdrawn = 1
+		WHERE item.withdrawn = true
 );
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.1_2021.10.18__Fix_MDV_place_after_migrating_from_DSpace_5.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.1_2021.10.18__Fix_MDV_place_after_migrating_from_DSpace_5.sql
index 3b649a321c..7506433cdd 100644
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.1_2021.10.18__Fix_MDV_place_after_migrating_from_DSpace_5.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.1_2021.10.18__Fix_MDV_place_after_migrating_from_DSpace_5.sql
@@ -9,10 +9,11 @@
 ----------------------------------------------------
 -- Make sure the metadatavalue.place column starts at 0 instead of 1
 ----------------------------------------------------
+
 CREATE LOCAL TEMPORARY TABLE mdv_minplace (
   dspace_object_id UUID NOT NULL,
   metadata_field_id INT NOT NULL,
-  minplace INT NOT NULL,
+  minplace INT NOT NULL
 );
 
 INSERT INTO mdv_minplace
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.04.29__orcid_queue_and_history.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.04.29__orcid_queue_and_history.sql
new file mode 100644
index 0000000000..e76926480a
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.04.29__orcid_queue_and_history.sql
@@ -0,0 +1,54 @@
+--
+-- 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/
+--
+
+-----------------------------------------------------------------------------------
+-- Create tables for ORCID Queue and History
+-----------------------------------------------------------------------------------
+
+CREATE SEQUENCE orcid_queue_id_seq;
+
+CREATE TABLE orcid_queue
+(
+    id INTEGER NOT NULL,
+    owner_id UUID NOT NULL,
+    entity_id UUID,
+    put_code VARCHAR(255),
+    record_type VARCHAR(255),
+    description VARCHAR(255),
+    operation VARCHAR(255),
+    metadata CLOB,
+    attempts INTEGER,
+    CONSTRAINT orcid_queue_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_queue_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES item (uuid),
+    CONSTRAINT orcid_queue_entity_id_fkey FOREIGN KEY (entity_id) REFERENCES item (uuid)
+);
+
+CREATE INDEX orcid_queue_owner_id_index on orcid_queue(owner_id);
+
+
+CREATE SEQUENCE orcid_history_id_seq;
+
+CREATE TABLE orcid_history
+(
+    id INTEGER NOT NULL,
+    owner_id UUID NOT NULL,
+    entity_id UUID,
+    put_code VARCHAR(255),
+    timestamp_last_attempt TIMESTAMP,
+	response_message CLOB,
+	status INTEGER,
+	metadata CLOB,
+	operation VARCHAR(255),
+	record_type VARCHAR(255),
+	description VARCHAR(255),
+    CONSTRAINT orcid_history_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_history_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES item (uuid),
+    CONSTRAINT orcid_history_entity_id_fkey FOREIGN KEY (entity_id) REFERENCES item (uuid)
+);
+
+CREATE INDEX orcid_history_owner_id_index on orcid_history(owner_id);
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.05.16__Orcid_token_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.05.16__Orcid_token_table.sql
new file mode 100644
index 0000000000..8bda3a8acd
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.05.16__Orcid_token_table.sql
@@ -0,0 +1,24 @@
+--
+-- 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/
+--
+
+-----------------------------------------------------------------------------------
+-- Create table for ORCID access tokens
+-----------------------------------------------------------------------------------
+
+CREATE SEQUENCE orcid_token_id_seq;
+
+CREATE TABLE orcid_token
+(
+    id INTEGER NOT NULL,
+    eperson_id UUID NOT NULL UNIQUE,
+    profile_item_id UUID,
+    access_token VARCHAR(100) NOT NULL,
+    CONSTRAINT orcid_token_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_token_eperson_id_fkey FOREIGN KEY (eperson_id) REFERENCES eperson (uuid),
+    CONSTRAINT orcid_token_profile_item_id_fkey FOREIGN KEY (profile_item_id) REFERENCES item (uuid)
+);
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.06.16__process_to_group.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.06.16__process_to_group.sql
new file mode 100644
index 0000000000..0e7d417ae5
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.06.16__process_to_group.sql
@@ -0,0 +1,18 @@
+--
+-- 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/
+--
+
+-------------------------------------------------------------------------------
+-- Table to store Groups related to a Process on its creation
+-------------------------------------------------------------------------------
+
+CREATE TABLE Process2Group
+(
+    process_id INTEGER REFERENCES Process(process_id),
+    group_id UUID REFERENCES epersongroup (uuid) ON DELETE CASCADE,
+    CONSTRAINT PK_Process2Group PRIMARY KEY (process_id, group_id)
+);
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql
new file mode 100644
index 0000000000..7bf3948d3a
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql
@@ -0,0 +1,10 @@
+--
+-- 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/
+--
+
+-- NOTE: default 0 ensures that existing relations have "latest_version_status" set to "both" (first constant in enum, see Relationship class)
+ALTER TABLE relationship ADD COLUMN IF NOT EXISTS latest_version_status INTEGER DEFAULT 0 NOT NULL;
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.5_2022.12.06__index_action_resource_policy.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.5_2022.12.06__index_action_resource_policy.sql
new file mode 100644
index 0000000000..696e84433d
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.5_2022.12.06__index_action_resource_policy.sql
@@ -0,0 +1,9 @@
+--
+-- 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/
+--
+
+CREATE INDEX resourcepolicy_action_idx ON resourcepolicy(action_id);
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md
index 229b70ec37..6cef123859 100644
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md
@@ -1,5 +1,10 @@
 # Oracle Flyway Database Migrations (i.e. Upgrades)
 
+---
+WARNING: Oracle Support is deprecated.
+See https://github.com/DSpace/DSpace/issues/8214
+---
+
 The SQL scripts in this directory are Oracle-specific database migrations. They are
 used to automatically upgrade your DSpace database using [Flyway](http://flywaydb.org/).
 As such, these scripts are automatically called by Flyway when the DSpace
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.04.29__orcid_queue_and_history.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.04.29__orcid_queue_and_history.sql
new file mode 100644
index 0000000000..3fe424cf6c
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.04.29__orcid_queue_and_history.sql
@@ -0,0 +1,54 @@
+--
+-- 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/
+--
+
+-----------------------------------------------------------------------------------
+-- Create tables for ORCID Queue and History
+-----------------------------------------------------------------------------------
+
+CREATE SEQUENCE orcid_queue_id_seq;
+
+CREATE TABLE orcid_queue
+(
+    id INTEGER NOT NULL,
+    owner_id RAW(16) NOT NULL,
+    entity_id RAW(16),
+    put_code VARCHAR(255),
+ 	record_type VARCHAR(255),
+ 	description VARCHAR(255),
+ 	operation VARCHAR(255),
+ 	metadata CLOB,
+ 	attempts INTEGER,
+    CONSTRAINT orcid_queue_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_queue_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES item (uuid),
+    CONSTRAINT orcid_queue_entity_id_fkey FOREIGN KEY (entity_id) REFERENCES item (uuid)
+);
+
+CREATE INDEX orcid_queue_owner_id_index on orcid_queue(owner_id);
+
+
+CREATE SEQUENCE orcid_history_id_seq;
+
+CREATE TABLE orcid_history
+(
+    id INTEGER NOT NULL,
+    owner_id RAW(16) NOT NULL,
+    entity_id RAW(16),
+    put_code VARCHAR(255),
+    timestamp_last_attempt TIMESTAMP,
+	response_message CLOB,
+	status INTEGER,
+	metadata CLOB,
+	operation VARCHAR(255),
+	record_type VARCHAR(255),
+	description VARCHAR(255),
+    CONSTRAINT orcid_history_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_history_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES item (uuid),
+    CONSTRAINT orcid_history_entity_id_fkey FOREIGN KEY (entity_id) REFERENCES item (uuid)
+);
+
+CREATE INDEX orcid_history_owner_id_index on orcid_history(owner_id);
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.05.16__Orcid_token_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.05.16__Orcid_token_table.sql
new file mode 100644
index 0000000000..14bf853143
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.05.16__Orcid_token_table.sql
@@ -0,0 +1,24 @@
+--
+-- 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/
+--
+
+-----------------------------------------------------------------------------------
+-- Create table for ORCID access tokens
+-----------------------------------------------------------------------------------
+
+CREATE SEQUENCE orcid_token_id_seq;
+
+CREATE TABLE orcid_token
+(
+    id INTEGER NOT NULL,
+    eperson_id RAW(16) NOT NULL UNIQUE,
+    profile_item_id RAW(16),
+    access_token VARCHAR2(100) NOT NULL,
+    CONSTRAINT orcid_token_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_token_eperson_id_fkey FOREIGN KEY (eperson_id) REFERENCES eperson (uuid),
+    CONSTRAINT orcid_token_profile_item_id_fkey FOREIGN KEY (profile_item_id) REFERENCES item (uuid)
+);
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.06.16__process_to_group.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.06.16__process_to_group.sql
new file mode 100644
index 0000000000..0e7d417ae5
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.06.16__process_to_group.sql
@@ -0,0 +1,18 @@
+--
+-- 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/
+--
+
+-------------------------------------------------------------------------------
+-- Table to store Groups related to a Process on its creation
+-------------------------------------------------------------------------------
+
+CREATE TABLE Process2Group
+(
+    process_id INTEGER REFERENCES Process(process_id),
+    group_id UUID REFERENCES epersongroup (uuid) ON DELETE CASCADE,
+    CONSTRAINT PK_Process2Group PRIMARY KEY (process_id, group_id)
+);
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql
new file mode 100644
index 0000000000..3eb9ae6dd4
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql
@@ -0,0 +1,10 @@
+--
+-- 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/
+--
+
+-- NOTE: default 0 ensures that existing relations have "latest_version_status" set to "both" (first constant in enum, see Relationship class)
+ALTER TABLE relationship ADD latest_version_status INTEGER DEFAULT 0 NOT NULL;
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.04.29__orcid_queue_and_history.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.04.29__orcid_queue_and_history.sql
new file mode 100644
index 0000000000..3031602515
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.04.29__orcid_queue_and_history.sql
@@ -0,0 +1,54 @@
+--
+-- 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/
+--
+
+-----------------------------------------------------------------------------------
+-- Create tables for ORCID Queue and History
+-----------------------------------------------------------------------------------
+
+CREATE SEQUENCE orcid_queue_id_seq;
+
+CREATE TABLE orcid_queue
+(
+    id INTEGER NOT NULL,
+    owner_id uuid NOT NULL,
+    entity_id uuid,
+    attempts INTEGER,
+    put_code CHARACTER VARYING(255),    
+	record_type CHARACTER VARYING(255),     
+	description CHARACTER VARYING(255),     
+	operation CHARACTER VARYING(255),      
+	metadata TEXT,                    
+    CONSTRAINT orcid_queue_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_queue_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES item (uuid),
+    CONSTRAINT orcid_queue_entity_id_fkey FOREIGN KEY (entity_id) REFERENCES item (uuid)
+);
+
+CREATE INDEX orcid_queue_owner_id_index on orcid_queue(owner_id);
+
+
+CREATE SEQUENCE orcid_history_id_seq;
+
+CREATE TABLE orcid_history
+(
+    id INTEGER NOT NULL,
+    owner_id uuid NOT NULL,
+    entity_id uuid,
+    put_code CHARACTER VARYING(255),
+    timestamp_last_attempt TIMESTAMP,
+	response_message text,
+	status INTEGER,
+	metadata TEXT,                 
+	operation CHARACTER VARYING(255), 
+	record_type CHARACTER VARYING(255),
+	description CHARACTER VARYING(255),
+    CONSTRAINT orcid_history_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_history_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES item (uuid),
+    CONSTRAINT orcid_history_entity_id_fkey FOREIGN KEY (entity_id) REFERENCES item (uuid)
+);
+
+CREATE INDEX orcid_history_owner_id_index on orcid_history(owner_id);
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.05.16__Orcid_token_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.05.16__Orcid_token_table.sql
new file mode 100644
index 0000000000..6c3793d422
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.05.16__Orcid_token_table.sql
@@ -0,0 +1,24 @@
+--
+-- 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/
+--
+
+-----------------------------------------------------------------------------------
+-- Create table for ORCID access tokens
+-----------------------------------------------------------------------------------
+
+CREATE SEQUENCE orcid_token_id_seq;
+
+CREATE TABLE orcid_token
+(
+    id INTEGER NOT NULL,
+    eperson_id uuid NOT NULL UNIQUE,
+    profile_item_id uuid,
+    access_token VARCHAR(100) NOT NULL,
+    CONSTRAINT orcid_token_pkey PRIMARY KEY (id),
+    CONSTRAINT orcid_token_eperson_id_fkey FOREIGN KEY (eperson_id) REFERENCES eperson (uuid),
+    CONSTRAINT orcid_token_profile_item_id_fkey FOREIGN KEY (profile_item_id) REFERENCES item (uuid)
+);
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.06.16__process_to_group.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.06.16__process_to_group.sql
new file mode 100644
index 0000000000..0e7d417ae5
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.06.16__process_to_group.sql
@@ -0,0 +1,18 @@
+--
+-- 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/
+--
+
+-------------------------------------------------------------------------------
+-- Table to store Groups related to a Process on its creation
+-------------------------------------------------------------------------------
+
+CREATE TABLE Process2Group
+(
+    process_id INTEGER REFERENCES Process(process_id),
+    group_id UUID REFERENCES epersongroup (uuid) ON DELETE CASCADE,
+    CONSTRAINT PK_Process2Group PRIMARY KEY (process_id, group_id)
+);
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql
new file mode 100644
index 0000000000..7bf3948d3a
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.3_2022.06.20__add_last_version_status_column_to_relationship_table.sql
@@ -0,0 +1,10 @@
+--
+-- 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/
+--
+
+-- NOTE: default 0 ensures that existing relations have "latest_version_status" set to "both" (first constant in enum, see Relationship class)
+ALTER TABLE relationship ADD COLUMN IF NOT EXISTS latest_version_status INTEGER DEFAULT 0 NOT NULL;
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.5_2022.12.06__index_action_resource_policy.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.5_2022.12.06__index_action_resource_policy.sql
new file mode 100644
index 0000000000..696e84433d
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.5_2022.12.06__index_action_resource_policy.sql
@@ -0,0 +1,9 @@
+--
+-- 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/
+--
+
+CREATE INDEX resourcepolicy_action_idx ON resourcepolicy(action_id);
diff --git a/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml b/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
index 5e69ee9c42..b8f02c46ff 100644
--- a/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
+++ b/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
@@ -34,6 +34,14 @@
          </property>
     </bean>
 
+    <bean id="DataCiteImportService"
+          class="org.dspace.importer.external.datacite.DataCiteImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="DataCiteMetadataFieldMapping"/>
+    </bean>
+    <bean id="DataCiteMetadataFieldMapping"
+          class="org.dspace.importer.external.datacite.DataCiteFieldMapping">
+    </bean>
+
     <bean id="ArXivImportService"
           class="org.dspace.importer.external.arxiv.service.ArXivImportMetadataSourceServiceImpl" scope="singleton">
         <property name="metadataFieldMapping" ref="ArXivMetadataFieldMapping"/>
@@ -43,11 +51,11 @@
           class="org.dspace.importer.external.arxiv.metadatamapping.ArXivFieldMapping">
     </bean>
 
-
     <bean id="pubmedImportService"
           class="org.dspace.importer.external.pubmed.service.PubmedImportMetadataSourceServiceImpl">
         <property name="metadataFieldMapping" ref="pubmedMetadataFieldMapping"/>
-        <property name="baseAddress" value="https://eutils.ncbi.nlm.nih.gov/entrez/eutils/"/>
+        <property name="urlFetch" value="${pubmed.url.fetch}"/>
+        <property name="urlSearch" value="${pubmed.url.search}"/>
         <property name="generateQueryForItem" ref="pubmedService"></property>
         <property name="supportedExtensions">
             <list>
@@ -56,7 +64,6 @@
         </property>
     </bean>
 
-
     <bean id="pubmedMetadataFieldMapping"
           class="org.dspace.importer.external.pubmed.metadatamapping.PubmedFieldMapping">
     </bean>
@@ -115,10 +122,81 @@
           </property>
     </bean>
 
+    <bean id="CrossRefImportService" class="org.dspace.importer.external.crossref.CrossRefImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="CrossRefMetadataFieldMapping"/>
+        <property name="url" value="${crossref.url}"/>
+    </bean>
+    <bean id="CrossRefMetadataFieldMapping" class="org.dspace.importer.external.crossref.CrossRefFieldMapping"/>
+
+    <bean id="EpoImportService" class="org.dspace.importer.external.epo.service.EpoImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="epoMetadataFieldMapping"/>
+        <property name="consumerKey" value="${epo.consumerKey}" />
+        <property name="consumerSecret" value="${epo.consumerSecretKey}" />
+        <property name="url" value="${epo.url}" />
+        <property name="authUrl" value="${epo.authUrl}" />
+        <property name="searchUrl" value="${epo.searchUrl}" />
+        <!-- date filed mapped metadata, see epo-integration.xml -->
+        <property name="dateFiled" ref="epo.dc.date.filed" />
+        <property name="applicationNumber" ref="epo.dc.identifier" />
+    </bean>
+    <bean id="epoMetadataFieldMapping" class="org.dspace.importer.external.epo.service.EpoFieldMapping"/>
+
+    <bean id="ScopusImportService" class="org.dspace.importer.external.scopus.service.ScopusImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="scopusMetadataFieldMapping"/>
+        <property name="url" value="${scopus.url}"/>
+        <property name="apiKey" value="${scopus.apiKey}"/>
+        <property name="instKey" value="${scopus.instToken}"/>
+        <property name="viewMode" value="${scopus.search-api.viewMode}"/>
+    </bean>
+    <bean id="scopusMetadataFieldMapping" class="org.dspace.importer.external.scopus.service.ScopusFieldMapping"/>
+
+    <bean id="vufindImportService" class="org.dspace.importer.external.vufind.VuFindImportMetadataSourceServiceImpl" scope="singleton">
+          <!-- Set to empty to use the default set of fields  -->
+          <constructor-arg type="java.lang.String" value=""/>
+          <property name="metadataFieldMapping" ref="vufindMetadataFieldMapping"/>
+          <property name="url" value="${vufind.url}"/>
+          <property name="urlSearch" value="${vufind.url.search}"/>
+    </bean>
+    <bean id="vufindMetadataFieldMapping" class="org.dspace.importer.external.vufind.metadatamapping.VuFindFieldMapping"/>
+
+    <bean id="ScieloImportService" class="org.dspace.importer.external.scielo.service.ScieloImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="scieloMetadataFieldMapping"/>
+        <property name="url" value="${scielo.url}"/>
+    </bean>
+    <bean id="scieloMetadataFieldMapping" class="org.dspace.importer.external.scielo.service.ScieloFieldMapping"/>
+
+    <bean id="WosImportService" class="org.dspace.importer.external.wos.service.WOSImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="wosMetadataFieldMapping"/>
+        <property name="apiKey" value="${wos.apiKey}"/>
+        <property name="url" value="${wos.url}"/>
+        <property name="urlSearch" value="${wos.url.search}"/>
+    </bean>
+    <bean id="wosMetadataFieldMapping" class="org.dspace.importer.external.wos.service.WOSFieldMapping"/>
+
+    <bean id="PubmedEuropeImportService" class="org.dspace.importer.external.pubmedeurope.PubmedEuropeMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="PubmedEuropeMetadataFieldMapping"/>
+        <property name="url" value="${pubmedeurope.url}"/>
+    </bean>
+    <bean id="PubmedEuropeMetadataFieldMapping" class="org.dspace.importer.external.pubmedeurope.PubmedEuropeFieldMapping"/>
+
+    <bean id="CiniiImportService" class="org.dspace.importer.external.cinii.CiniiImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="CiniiMetadataFieldMapping"/>
+        <property name="url" value="${cinii.url}"/>
+        <property name="urlSearch" value="${cinii.url.search}"/>
+    </bean>
+    <bean id="CiniiMetadataFieldMapping" class="org.dspace.importer.external.cinii.CiniiFieldMapping"/>
+
+    <bean id="ADSImportService" class="org.dspace.importer.external.ads.ADSImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="apiKey" value="${ads.key}" />
+        <property name="url" value="${ads.url}" />
+        <property name="resultFieldList" value="${ads.resultFieldList}" />
+        <property name="metadataFieldMapping" ref="ADSMetadataFieldMapping"/>
+    </bean>
+    <bean id="ADSMetadataFieldMapping" class="org.dspace.importer.external.ads.ADSFieldMapping"/>
 
     <!-- Metadatafield used to check against if it's already imported or not during the JSONLookupSearcher-->
     <bean id="lookupID" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
         <constructor-arg value="dc.identifier.other"/>
     </bean>
 
-</beans>
+</beans>
\ No newline at end of file
diff --git a/dspace-api/src/main/resources/spring/spring-dspace-addon-sherpa-configuration-services.xml b/dspace-api/src/main/resources/spring/spring-dspace-addon-sherpa-configuration-services.xml
deleted file mode 100644
index c8197970a9..0000000000
--- a/dspace-api/src/main/resources/spring/spring-dspace-addon-sherpa-configuration-services.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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/
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-2.5.xsd"
-       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
-
-    <context:annotation-config/> <!-- allows us to use spring annotations in beans -->
-
-    <bean class="org.dspace.app.sherpa.submit.SHERPASubmitConfigurationService"
-          id="org.dspace.app.sherpa.submit.SHERPASubmitConfigurationService">
-        <property name="issnItemExtractors">
-            <list>
-                <bean class="org.dspace.app.sherpa.submit.MetadataValueISSNExtractor">
-                    <property name="metadataList">
-                        <list>
-                            <value>dc.identifier.issn</value>
-                        </list>
-                    </property>
-                </bean>
-                <!-- Use the follow if you have the SHERPARoMEOJournalTitle enabled
-                <bean class="org.dspace.app.sherpa.submit.MetadataAuthorityISSNExtractor">
-                    <property name="metadataList">
-                        <list>
-                            <value>dc.title.alternative</value>
-                        </list>
-                    </property>
-                </bean>  -->
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/dspace-api/src/main/resources/spring/spring-dspace-addon-sherpa-services.xml b/dspace-api/src/main/resources/spring/spring-dspace-addon-sherpa-services.xml
index 6fe8ddb07b..76891d169c 100644
--- a/dspace-api/src/main/resources/spring/spring-dspace-addon-sherpa-services.xml
+++ b/dspace-api/src/main/resources/spring/spring-dspace-addon-sherpa-services.xml
@@ -25,10 +25,38 @@
         <property name="timeout" value="5000"/>
     </bean>
 
-
     <bean class="org.dspace.app.sherpa.submit.SHERPASubmitService"
           id="org.dspace.app.sherpa.submit.SHERPASubmitService">
         <property name="sherpaService" ref="org.dspace.app.sherpa.SHERPAService"/>
         <property name="configuration" ref="org.dspace.app.sherpa.submit.SHERPASubmitConfigurationService"/>
     </bean>
+
+    <bean class="org.dspace.app.sherpa.submit.SHERPASubmitConfigurationService"
+          id="org.dspace.app.sherpa.submit.SHERPASubmitConfigurationService">
+        <property name="issnItemExtractors">
+            <list>
+                <bean class="org.dspace.app.sherpa.submit.MetadataValueISSNExtractor">
+                    <property name="metadataList">
+                        <list>
+                            <value>dc.identifier.issn</value>
+                        </list>
+                    </property>
+                </bean>
+                <!-- Use the follow if you have the SHERPARoMEOJournalTitle enabled
+                <bean class="org.dspace.app.sherpa.submit.MetadataAuthorityISSNExtractor">
+                    <property name="metadataList">
+                        <list>
+                            <value>dc.title.alternative</value>
+                        </list>
+                    </property>
+                </bean>  -->
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.dspace.app.sherpa.cache.SherpaCacheEvictService">
+         <property name="sherpaSubmitService"
+                   ref="org.dspace.app.sherpa.submit.SHERPASubmitService"/>
+         <property name="cacheManager" ref="cacheManager" />
+    </bean>
 </beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
index a8165dd5d4..f40298db30 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
@@ -21,6 +21,7 @@
         <name-map collection-handle="123456789/language-test-1" submission-name="languagetestprocess"/>
         <name-map collection-handle="123456789/extraction-test" submission-name="extractiontestprocess"/>
         <name-map collection-handle="123456789/qualdrop-test" submission-name="qualdroptest"/>
+        <name-map collection-handle="123456789/typebind-test" submission-name="typebindtest"/>
         <name-map collection-handle="123456789/accessCondition-not-discoverable" submission-name="accessConditionNotDiscoverable"/>
     </submission-map>
 
@@ -82,6 +83,11 @@
             <type>submission-form</type>
         </step-definition>
 
+        <step-definition id="typebindtest">
+            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+            <type>submission-form</type>
+        </step-definition>
+
         <step-definition id="defaultAC">
             <heading>submit.progressbar.accessCondition</heading>
             <processing-class>org.dspace.app.rest.submit.step.AccessConditionStep</processing-class>
@@ -131,6 +137,12 @@
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
+
+        <step-definition id="sherpaPolicies" mandatory="true">
+            <heading>submit.progressbar.sherpapolicy</heading>
+            <processing-class>org.dspace.app.rest.submit.step.SherpaPolicyStep</processing-class>
+            <type>sherpaPolicy</type>
+        </step-definition>
     </step-definitions>
 
     <!-- The submission-definitions map lays out the detailed definition of -->
@@ -166,6 +178,7 @@
             <!-- <step id="upload-with-embargo"/> -->
             <!-- <step id="extractionstep"/> -->
             <step id="defaultAC"/>
+            <step id="sherpaPolicies"/>
 
             <!--Step will be to Sign off on the License -->
             <step id="license"/>
@@ -191,6 +204,10 @@
             <step id="qualdroptest" />
         </submission-process>
 
+        <submission-process name="typebindtest">
+            <step id="typebindtest" />
+        </submission-process>
+
         <submission-process name="accessConditionNotDiscoverable">
             <step id="collection"/>
             <step id="traditionalpageone"/>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/local.cfg b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
index 3c19a68e9f..9cc6b7ebea 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/local.cfg
+++ b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
@@ -70,6 +70,17 @@ mail.server.disabled = true
 # (Defaults to a dummy/fake prefix of 123456789)
 handle.prefix = 123456789
 
+# Whether to enable the DSpace handle resolver endpoints necessary for
+# https://github.com/DSpace/Remote-Handle-Resolver
+# Defaults to "false" which means these handle resolver endpoints are not available.
+handle.remote-resolver.enabled = true
+
+# Whether to enable the DSpace listhandles resolver that lists all available
+# handles for this DSpace installation.
+# Defaults to "false" which means is possible to obtain the list of handles
+# of this DSpace installation, whenever the `handle.remote-resolver.enabled = true`. 
+handle.hide.listhandles = false
+
 #####################
 # LOGLEVEL SETTINGS #
 #####################
@@ -84,7 +95,7 @@ loglevel.dspace = INFO
 #  IIIF TEST SETTINGS  #
 ########################
 iiif.enabled = true
-event.dispatcher.default.consumers = versioning, discovery, eperson, iiif
+event.dispatcher.default.consumers = versioning, discovery, eperson, orcidqueue, iiif
 
 ###########################################
 # CUSTOM UNIT / INTEGRATION TEST SETTINGS #
@@ -144,3 +155,19 @@ authentication-ip.Student = 6.6.6.6
 useProxies = true
 proxies.trusted.ipranges = 7.7.7.7
 proxies.trusted.include_ui_ip = true
+
+csvexport.dir = dspace-server-webapp/src/test/data/dspaceFolder/exports
+
+# For the tests we have to disable this health indicator because there isn't a mock server and the calculated status was DOWN
+management.health.solrOai.enabled = false
+
+# Enable researcher profiles and orcid synchronization for tests
+researcher-profile.entity-type = Person
+orcid.synchronization-enabled = true
+
+# Configuration settings required for Researcher Profiles
+# These settings ensure "dspace.object.owner" field are indexed by Authority Control
+choices.plugin.dspace.object.owner = EPersonAuthority
+choices.presentation.dspace.object.owner = suggest
+authority.controlled.dspace.object.owner = true
+
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/access-conditions.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/access-conditions.xml
index e21a85cca4..450ed3ad0b 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/access-conditions.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/access-conditions.xml
@@ -3,10 +3,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-	
+
 	<bean id="uploadConfigurationDefault" class="org.dspace.submit.model.UploadConfiguration">
-		<property name="name" value="upload"></property>
-		<property name="configurationService" ref="org.dspace.services.ConfigurationService"/>
+		<property name="name" value="upload"/>
 		<property name="metadata" value="bitstream-metadata" />
         <property name="options">
             <list>
@@ -18,7 +17,7 @@
             </list>
         </property>
     </bean>
-  
+
     <bean id="openAccess" class="org.dspace.submit.model.AccessConditionOption">
         <property name="groupName" value="Anonymous"/>
         <property name="name" value="openaccess"/>
@@ -31,7 +30,7 @@
         <property name="hasStartDate" value="false"/>
         <property name="hasEndDate" value="true"/>
         <property name="endDateLimit" value="+6MONTHS"/>
-    </bean> 
+    </bean>
     <bean id="embargoed" class="org.dspace.submit.model.AccessConditionOption">
         <property name="groupName" value="Anonymous"/>
         <property name="name" value="embargo"/>
@@ -43,13 +42,13 @@
         <property name="groupName" value="Administrator"/>
         <property name="name" value="administrator"/>
         <property name="hasStartDate" value="false"/>
-        <property name="hasEndDate" value="false"/>       
+        <property name="hasEndDate" value="false"/>
     </bean>
 <!--     <bean id="networkAdministration" class="org.dspace.submit.model.AccessConditionOption">
     	<property name="groupName" value="INSTITUTIONAL_NETWORK"/>
         <property name="name" value="networkAdministration"/>
         <property name="hasStartDate" value="false"/>
-        <property name="hasEndDate" value="false"/>                
+        <property name="hasEndDate" value="false"/>
     </bean> -->
 
     <bean id="uploadConfigurationService" class="org.dspace.submit.model.UploadConfigurationService">
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
index e10d04a16f..f1e6c30d13 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util
+                           http://www.springframework.org/schema/util/spring-util.xsd"
        default-lazy-init="true">
 
     <bean id="mockOpenAIRERestConnector" class="org.dspace.external.MockOpenAIRERestConnector">
@@ -15,11 +19,71 @@
 		init-method="init">
 		<property name="sourceIdentifier" value="openAIREFunding" />
 		<property name="connector" ref="mockOpenAIRERestConnector" />
+	    <property name="metadataFields" ref="mapOfmetadata"/>
 		<property name="supportedEntityTypes">
 			<list>
 				<value>Project</value>
 			</list>
 		</property>
 	</bean>
+
+    <util:map id="mapOfmetadata"
+        map-class="java.util.HashMap" key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <entry key="awardNumber" value-ref="openaireAwardNumber" />
+        <entry key="fundingStream" value-ref="openaireFundingStream" />
+        <entry key="awardURI" value-ref="openaireAwardURI" />
+        <entry key="funderName" value-ref="openaireFunderName" />
+        <entry key="funderIdentifier" value-ref="openaireFunderIdentifier" />
+        <entry key="dcTitle" value-ref="openaireTitle" />
+        <entry key="titleAlternative" value-ref="openaireTitleAlternative" />
+        <entry key="dcIdentifier" value-ref="openaireIdentifier" />
+        <entry key="coverageSpatial" value-ref="openaireSpatial" />
+        <entry key="dcDescription" value-ref="openaireDescription" />
+        <entry key="dcSubject" value-ref="openaireSubject" />
+    </util:map>
+
+    <bean id="openaireAwardNumber" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.awardNumber"/>
+    </bean>
+
+    <bean id="openaireFundingStream" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.fundingStream"/>
+    </bean>
+    
+    <bean id="openaireAwardURI" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.awardURI"/>
+    </bean>
+
+    <bean id="openaireFunderName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="project.funder.name"/>
+    </bean>
+
+    <bean id="openaireFunderIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="project.funder.identifier"/>
+    </bean>
+
+    <bean id="openaireTitle" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="openaireTitleAlternative" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title.alternative"/>
+    </bean>
+
+    <bean id="openaireIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier"/>
+    </bean>
+
+    <bean id="openaireSpatial" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.coverage.spatial"/>
+    </bean>
+
+    <bean id="openaireDescription" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description"/>
+    </bean>
+
+    <bean id="openaireSubject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
 	
 </beans>
\ No newline at end of file
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-services.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-services.xml
index ac163d3581..37e1fb5089 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-services.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-services.xml
@@ -6,6 +6,8 @@
 
     <bean class="org.dspace.external.service.impl.ExternalDataServiceImpl"/>
 
+    <bean class="org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl"/>
+
     <bean class="org.dspace.external.provider.impl.MockDataProvider" init-method="init">
         <property name="sourceIdentifier" value="mock"/>
     </bean>
@@ -13,13 +15,7 @@
     <!-- SHERPA data providers set up to use mock SHERPA service -->
     <bean class="org.dspace.external.provider.impl.SHERPAv2JournalISSNDataProvider" init-method="init">
         <property name="sourceIdentifier" value="sherpaJournalIssn"/>
-        <property name="sherpaService">
-            <bean class="org.dspace.app.sherpa.MockSHERPAService">
-                <property name="maxNumberOfTries" value="3"/>
-                <property name="sleepBetweenTimeouts" value="2000"/>
-                <property name="timeout" value="5000"/>
-            </bean>
-        </property>
+        <property name="sherpaService" ref="org.dspace.app.sherpa.MockSHERPAService" />
         <property name="supportedEntityTypes">
             <list>
                 <value>Journal</value>
@@ -28,13 +24,7 @@
     </bean>
     <bean class="org.dspace.external.provider.impl.SHERPAv2JournalDataProvider" init-method="init">
         <property name="sourceIdentifier" value="sherpaJournal"/>
-        <property name="sherpaService">
-            <bean class="org.dspace.app.sherpa.MockSHERPAService">
-                <property name="maxNumberOfTries" value="3"/>
-                <property name="sleepBetweenTimeouts" value="2000"/>
-                <property name="timeout" value="5000"/>
-            </bean>
-        </property>
+        <property name="sherpaService" ref="org.dspace.app.sherpa.MockSHERPAService" />
         <property name="supportedEntityTypes">
             <list>
                 <value>Journal</value>
@@ -43,13 +33,7 @@
     </bean>
     <bean class="org.dspace.external.provider.impl.SHERPAv2PublisherDataProvider" init-method="init">
         <property name="sourceIdentifier" value="sherpaPublisher"/>
-        <property name="sherpaService">
-            <bean class="org.dspace.app.sherpa.MockSHERPAService">
-                <property name="maxNumberOfTries" value="3"/>
-                <property name="sleepBetweenTimeouts" value="2000"/>
-                <property name="timeout" value="5000"/>
-            </bean>
-        </property>
+        <property name="sherpaService" ref="org.dspace.app.sherpa.MockSHERPAService" />
         <property name="supportedEntityTypes">
             <list>
                 <value>OrgUnit</value>
@@ -58,10 +42,10 @@
     </bean>
     <bean class="org.dspace.external.provider.impl.OrcidV3AuthorDataProvider" init-method="init">
         <property name="sourceIdentifier" value="orcid"/>
-        <property name="orcidUrl" value="${orcid.url}" />
-        <property name="clientId" value="${orcid.clientid}" />
-        <property name="clientSecret" value="${orcid.clientsecret}" />
-        <property name="OAUTHUrl" value="${orcid.oauth.url}" />
+        <property name="orcidUrl" value="${orcid.domain-url}" />
+        <property name="clientId" value="${orcid.application-client-id}" />
+        <property name="clientSecret" value="${orcid.application-client-secret}" />
+        <property name="OAUTHUrl" value="${orcid.token-url}" />
         <property name="orcidRestConnector" ref="orcidRestConnector"/>
         <property name="supportedEntityTypes">
             <list>
@@ -71,26 +55,52 @@
     </bean>
 
     <bean id="orcidRestConnector" class="org.dspace.external.OrcidRestConnector">
-        <constructor-arg value="${orcid.api.url}"/>
+        <constructor-arg value="${orcid.api-url}"/>
     </bean>
-
-    <bean id="pubmedLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
-        <property name="metadataSource" ref="mockPubmedImportService"/>
-        <property name="sourceIdentifier" value="pubmed"/>
-        <property name="recordIdMetadata" value="dc.identifier.other"/>
-    </bean>
-
-    <bean id="mockPubmedImportService"
-          class="org.dspace.external.provider.impl.MockPubmedImportMetadataSourceServiceImpl">
-        <property name="metadataFieldMapping" ref="pubmedMetadataFieldMapping"/>
-        <property name="baseAddress" value="https://eutils.ncbi.nlm.nih.gov/entrez/eutils/"/>
-        <property name="supportedExtensions">
+    
+    <bean id="orcidPublicationDataProvider" class="org.dspace.external.provider.impl.OrcidPublicationDataProvider">
+        <property name="sourceIdentifier" value="orcidWorks"/>
+        <property name="fieldMapping" ref="orcidPublicationDataProviderFieldMapping"/>
+        <property name="supportedEntityTypes">
             <list>
-                 <value>xml</value>
+                <value>Publication</value>
             </list>
         </property>
     </bean>
 
+    <bean id="pubmedLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="pubmedImportService"/>
+        <property name="sourceIdentifier" value="pubmed"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="scopusLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="ScopusImportService"/>
+        <property name="sourceIdentifier" value="scopus"/>
+        <property name="recordIdMetadata" value="dc.identifier.scopus"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="dataciteLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="DataCiteImportService"/>
+        <property name="sourceIdentifier" value="datacite"/>
+        <property name="recordIdMetadata" value="dc.identifier.doi"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
 </beans>
 
-
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/iiif-processing.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/iiif-processing.xml
new file mode 100644
index 0000000000..ea2c654608
--- /dev/null
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/iiif-processing.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-lazy-init="true">
+
+    <bean id="iiifCanvasDimensionServiceFactory" class="org.dspace.iiif.canvasdimension.factory.IIIFCanvasDimensionServiceFactoryImpl"/>
+    <bean class="org.dspace.iiif.canvasdimension.IIIFCanvasDimensionServiceImpl" scope="prototype"/>
+    <bean class="org.dspace.iiif.MockIIIFApiQueryServiceImpl" id="org.dspace.iiif.IIIFApiQueryServiceImpl"
+          autowire-candidate="true"/>
+
+</beans>
\ No newline at end of file
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
index 69524e4f14..140fe0abf5 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
@@ -22,6 +22,11 @@
         <property name="dspaceRunnableClass" value="org.dspace.app.bulkedit.MetadataExportCli"/>
     </bean>
 
+    <bean id="metadata-export-search" class="org.dspace.app.bulkedit.MetadataExportSearchCliScriptConfiguration">
+        <property name="description" value="export metadata from a discovery search" />
+        <property name="dspaceRunnableClass" value="org.dspace.app.bulkedit.MetadataExportSearchCli" />
+    </bean>
+
     <bean id="curate"
           class="org.dspace.curate.CurationCliScriptConfiguration">
         <property name="description"
@@ -45,14 +50,40 @@
         <property name="dspaceRunnableClass" value="org.dspace.app.mediafilter.MediaFilterScript"/>
     </bean>
 
+    <bean id="solr-database-resync" class="org.dspace.app.solrdatabaseresync.SolrDatabaseResyncCliScriptConfiguration">
+        <property name="description" value="Update the database status of Items in solr"/>
+        <property name="dspaceRunnableClass" value="org.dspace.app.solrdatabaseresync.SolrDatabaseResyncCli"/>
+    </bean>
+
     <bean id="another-mock-script" class="org.dspace.scripts.MockDSpaceRunnableScriptConfiguration" scope="prototype">
         <property name="description" value="Mocking a script for testing purposes" />
         <property name="dspaceRunnableClass" value="org.dspace.scripts.impl.MockDSpaceRunnableScript"/>
     </bean>
+    
+    <bean id="orcid-bulk-push" class="org.dspace.orcid.script.OrcidBulkPushScriptConfiguration">
+        <property name="description" value="Perform the bulk synchronization of all the BATCH configured ORCID entities placed in the ORCID queue"/>
+        <property name="dspaceRunnableClass" value="org.dspace.orcid.script.OrcidBulkPush"/>
+    </bean>
+
+    <bean id="process-cleaner" class="org.dspace.administer.ProcessCleanerCliConfiguration">
+        <property name="description" value="Cleanup all the old processes in the specified state"/>
+        <property name="dspaceRunnableClass" value="org.dspace.administer.ProcessCleanerCli"/>
+    </bean>
+
     <!-- Keep as last script; for test ScriptRestRepository#findOneScriptByNameTest -->
     <bean id="mock-script" class="org.dspace.scripts.MockDSpaceRunnableScriptConfiguration" scope="prototype">
         <property name="description" value="Mocking a script for testing purposes" />
         <property name="dspaceRunnableClass" value="org.dspace.scripts.impl.MockDSpaceRunnableScript"/>
     </bean>
 
+    <bean id="import" class="org.dspace.app.itemimport.ItemImportCLIScriptConfiguration" primary="true">
+        <property name="description" value="Batch Import from Simple Archive Format (SAF)" />
+        <property name="dspaceRunnableClass" value="org.dspace.app.itemimport.ItemImportCLI"/>
+    </bean>
+
+    <bean id="export" class="org.dspace.app.itemexport.ItemExportCLIScriptConfiguration" primary="true">
+        <property name="description" value="Batch Export to Simple Archive Format (SAF)"/>
+        <property name="dspaceRunnableClass" value="org.dspace.app.itemexport.ItemExportCLI"/>
+    </bean>
+
 </beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/sherpa.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/sherpa.xml
index fb9e31b9a0..206326f3db 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/sherpa.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/sherpa.xml
@@ -33,4 +33,18 @@
 		</property>	
 	</bean>
 
+    <!-- during test we need the mock sherpa service everywhere -->
+    <alias name="org.dspace.app.sherpa.SHERPAService" alias="org.dspace.app.sherpa.MockSHERPAService"/>
+    <bean class="org.dspace.app.sherpa.MockSHERPAService" id="org.dspace.app.sherpa.SHERPAService">
+        <property name="maxNumberOfTries" value="3"/>
+        <property name="sleepBetweenTimeouts" value="2000"/>
+        <property name="timeout" value="5000"/>
+    </bean>
+
+    <bean class="org.dspace.app.sherpa.submit.SHERPASubmitService"
+          id="org.dspace.app.sherpa.submit.SHERPASubmitService">
+        <property name="sherpaService" ref="org.dspace.app.sherpa.MockSHERPAService"/>
+        <property name="configuration" ref="org.dspace.app.sherpa.submit.SHERPASubmitConfigurationService"/>
+    </bean>
+
 </beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/solr-services.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/solr-services.xml
index 5f86c73598..32ab90b2cc 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/solr-services.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/solr-services.xml
@@ -47,5 +47,7 @@
     <bean id="org.dspace.statistics.SolrStatisticsCore"
           class="org.dspace.statistics.MockSolrStatisticsCore"
           autowire-candidate="true"/>
+          
+    <bean class="org.dspace.statistics.GeoIpService" autowire-candidate="true"/>
 
 </beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/spring-dspace-addon-sherpa-services.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/spring-dspace-addon-sherpa-services.xml
deleted file mode 100644
index adb2340f10..0000000000
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/spring-dspace-addon-sherpa-services.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context.xsd"
-       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
-
-    <context:annotation-config/> <!-- allows us to use spring annotations in beans -->
-
-    <!-- during test we need the mock sherpa service everywhere -->
-    <alias name="org.dspace.app.sherpa.SHERPAService" alias="org.dspace.app.sherpa.MockSHERPAService"/>
-    <bean class="org.dspace.app.sherpa.MockSHERPAService" id="org.dspace.app.sherpa.SHERPAService">
-        <property name="maxNumberOfTries" value="3"/>
-        <property name="sleepBetweenTimeouts" value="2000"/>
-        <property name="timeout" value="5000"/>
-    </bean>
-
-
-    <bean class="org.dspace.app.sherpa.submit.SHERPASubmitService"
-          id="org.dspace.app.sherpa.submit.SHERPASubmitService">
-        <property name="sherpaService" ref="org.dspace.app.sherpa.MockSHERPAService"/>
-        <property name="configuration" ref="org.dspace.app.sherpa.submit.SHERPASubmitConfigurationService"/>
-    </bean>
-
-</beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml b/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml
index 67946788b5..7438fda852 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml
@@ -140,6 +140,7 @@
          <dc-qualifier>ispartofseries</dc-qualifier>
          <repeatable>true</repeatable>
          <label>Series/Report No.</label>
+         <type-bind>Technical Report</type-bind>
          <input-type>series</input-type>
          <hint>Enter the series and number assigned to this item by your community.</hint>
          <required></required>
@@ -302,6 +303,75 @@ it, please enter the types and the actual numbers or codes.</hint>
      </row>
    </form>
 
+   <form name="typebindtest">
+     <row>
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>title</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Title</label>
+         <input-type>onebox</input-type>
+         <hint>Enter the main title of the item.</hint>
+         <required>You must enter a main title for this item.</required>
+         <!--    <language value-pairs-name="common_iso_languages">true</language> -->
+       </field>
+     </row>
+     <row>
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>date</dc-element>
+         <dc-qualifier>issued</dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Date of Issue</label>
+         <style>col-sm-4</style>
+         <input-type>date</input-type>
+         <hint>Please give the date of previous publication or public distribution.
+           You can leave out the day and/or month if they aren't
+           applicable.</hint>
+         <required>You must enter at least the year.</required>
+       </field>
+     </row>
+     <row>
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>type</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>true</repeatable>
+         <label>Type</label>
+         <input-type value-pairs-name="common_types">dropdown</input-type>
+         <hint>Select the type(s) of content of the item. To select more than one value in the list, you may have to hold down the "CTRL" or "Shift" key.</hint>
+         <required></required>
+       </field>
+     </row>
+     <row>
+       <!-- ISBN bound to type Book and required -->
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>identifier</dc-element>
+         <dc-qualifier>isbn</dc-qualifier>
+         <repeatable>true</repeatable>
+         <label>ISBN</label>
+         <type-bind>Book</type-bind>
+         <input-type>onebox</input-type>
+         <hint>Enter the ISBN of the book.</hint>
+         <required>An ISBN is required.</required>
+       </field>
+       <!-- ISBN bound to type Book chapter and NOT required and NOT repeatable -->
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>identifier</dc-element>
+         <dc-qualifier>isbn</dc-qualifier>
+         <repeatable>true</repeatable>
+         <label>ISBN of Book</label>
+         <type-bind>Book chapter</type-bind>
+         <input-type>onebox</input-type>
+         <hint>Enter the ISBN of the book in which this chapter appears.</hint>
+         <required></required>
+       </field>
+     </row>
+   </form>
+
    <form name="languagetest">
       <row>
         <field>
diff --git a/dspace-api/src/test/java/org/dspace/AbstractDSpaceIntegrationTest.java b/dspace-api/src/test/java/org/dspace/AbstractDSpaceIntegrationTest.java
index 1abc4e017d..5a5ce8bf6d 100644
--- a/dspace-api/src/test/java/org/dspace/AbstractDSpaceIntegrationTest.java
+++ b/dspace-api/src/test/java/org/dspace/AbstractDSpaceIntegrationTest.java
@@ -18,6 +18,7 @@ import java.util.TimeZone;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.builder.AbstractBuilder;
+import org.dspace.discovery.SearchUtils;
 import org.dspace.servicemanager.DSpaceKernelImpl;
 import org.dspace.servicemanager.DSpaceKernelInit;
 import org.junit.AfterClass;
@@ -104,6 +105,7 @@ public class AbstractDSpaceIntegrationTest {
 
         // Unload DSpace services
         AbstractBuilder.destroy();
+        SearchUtils.clearCachedSearchService();
 
         // NOTE: We explicitly do NOT stop/destroy the kernel, as it is cached
         // in the Spring ApplicationContext. By default, to speed up tests,
diff --git a/dspace-api/src/test/java/org/dspace/AbstractIntegrationTestWithDatabase.java b/dspace-api/src/test/java/org/dspace/AbstractIntegrationTestWithDatabase.java
index 402947b966..e27fb19a68 100644
--- a/dspace-api/src/test/java/org/dspace/AbstractIntegrationTestWithDatabase.java
+++ b/dspace-api/src/test/java/org/dspace/AbstractIntegrationTestWithDatabase.java
@@ -15,6 +15,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.launcher.ScriptLauncher;
 import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
+import org.dspace.authority.AuthoritySearchService;
 import org.dspace.authority.MockAuthoritySolrServiceImpl;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.builder.AbstractBuilder;
@@ -31,8 +32,9 @@ import org.dspace.kernel.ServiceManager;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.statistics.MockSolrLoggerServiceImpl;
 import org.dspace.statistics.MockSolrStatisticsCore;
+import org.dspace.statistics.SolrStatisticsCore;
 import org.dspace.storage.rdbms.DatabaseUtils;
-import org.jdom.Document;
+import org.jdom2.Document;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -183,15 +185,15 @@ public class AbstractIntegrationTestWithDatabase extends AbstractDSpaceIntegrati
             searchService.reset();
             // Clear the statistics core.
             serviceManager
-                    .getServiceByName(null, MockSolrStatisticsCore.class)
+                    .getServiceByName(SolrStatisticsCore.class.getName(), MockSolrStatisticsCore.class)
                     .reset();
 
             MockSolrLoggerServiceImpl statisticsService = serviceManager
-                    .getServiceByName(null, MockSolrLoggerServiceImpl.class);
+                    .getServiceByName("solrLoggerService", MockSolrLoggerServiceImpl.class);
             statisticsService.reset();
 
             MockAuthoritySolrServiceImpl authorityService = serviceManager
-                    .getServiceByName(null, MockAuthoritySolrServiceImpl.class);
+                    .getServiceByName(AuthoritySearchService.class.getName(), MockAuthoritySolrServiceImpl.class);
             authorityService.reset();
 
             // Reload our ConfigurationService (to reset configs to defaults again)
diff --git a/dspace-api/src/test/java/org/dspace/access/status/AccessStatusServiceTest.java b/dspace-api/src/test/java/org/dspace/access/status/AccessStatusServiceTest.java
new file mode 100644
index 0000000000..87127f9cf8
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/access/status/AccessStatusServiceTest.java
@@ -0,0 +1,126 @@
+/**
+ * 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/
+ */
+package org.dspace.access.status;
+
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.fail;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.AbstractUnitTest;
+import org.dspace.access.status.factory.AccessStatusServiceFactory;
+import org.dspace.access.status.service.AccessStatusService;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.CommunityService;
+import org.dspace.content.service.InstallItemService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.WorkspaceItemService;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit Tests for access status service
+ */
+public class AccessStatusServiceTest extends AbstractUnitTest {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(AccessStatusServiceTest.class);
+
+    private Collection collection;
+    private Community owningCommunity;
+    private Item item;
+
+    protected CommunityService communityService =
+            ContentServiceFactory.getInstance().getCommunityService();
+    protected CollectionService collectionService =
+            ContentServiceFactory.getInstance().getCollectionService();
+    protected ItemService itemService =
+            ContentServiceFactory.getInstance().getItemService();
+    protected WorkspaceItemService workspaceItemService =
+            ContentServiceFactory.getInstance().getWorkspaceItemService();
+    protected InstallItemService installItemService =
+            ContentServiceFactory.getInstance().getInstallItemService();
+    protected AccessStatusService accessStatusService =
+            AccessStatusServiceFactory.getInstance().getAccessStatusService();
+
+    /**
+     * This method will be run before every test as per @Before. It will
+     * initialize resources required for the tests.
+     *
+     * Other methods can be annotated with @Before here or in subclasses
+     * but no execution order is guaranteed
+     */
+    @Before
+    @Override
+    public void init() {
+        super.init();
+        try {
+            context.turnOffAuthorisationSystem();
+            owningCommunity = communityService.create(null, context);
+            collection = collectionService.create(context, owningCommunity);
+            item = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            context.restoreAuthSystemState();
+        } catch (AuthorizeException ex) {
+            log.error("Authorization Error in init", ex);
+            fail("Authorization Error in init: " + ex.getMessage());
+        } catch (SQLException ex) {
+            log.error("SQL Error in init", ex);
+            fail("SQL Error in init: " + ex.getMessage());
+        }
+    }
+
+    /**
+     * This method will be run after every test as per @After. It will
+     * clean resources initialized by the @Before methods.
+     *
+     * Other methods can be annotated with @After here or in subclasses
+     * but no execution order is guaranteed
+     */
+    @After
+    @Override
+    public void destroy() {
+        context.turnOffAuthorisationSystem();
+        try {
+            itemService.delete(context, item);
+        } catch (Exception e) {
+            // ignore
+        }
+        try {
+            collectionService.delete(context, collection);
+        } catch (Exception e) {
+            // ignore
+        }
+        try {
+            communityService.delete(context, owningCommunity);
+        } catch (Exception e) {
+            // ignore
+        }
+        context.restoreAuthSystemState();
+        item = null;
+        collection = null;
+        owningCommunity = null;
+        try {
+            super.destroy();
+        } catch (Exception e) {
+            // ignore
+        }
+    }
+
+    @Test
+    public void testGetAccessStatus() throws Exception {
+        String status = accessStatusService.getAccessStatus(context, item);
+        assertNotEquals("testGetAccessStatus 0", status, DefaultAccessStatusHelper.UNKNOWN);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/access/status/DefaultAccessStatusHelperTest.java b/dspace-api/src/test/java/org/dspace/access/status/DefaultAccessStatusHelperTest.java
new file mode 100644
index 0000000000..a41e985deb
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/access/status/DefaultAccessStatusHelperTest.java
@@ -0,0 +1,423 @@
+/**
+ * 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/
+ */
+package org.dspace.access.status;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.AbstractUnitTest;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.authorize.factory.AuthorizeServiceFactory;
+import org.dspace.authorize.service.ResourcePolicyService;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.BitstreamService;
+import org.dspace.content.service.BundleService;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.CommunityService;
+import org.dspace.content.service.InstallItemService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.core.Constants;
+import org.dspace.eperson.Group;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.eperson.service.GroupService;
+import org.joda.time.LocalDate;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DefaultAccessStatusHelperTest  extends AbstractUnitTest {
+
+    private static final Logger log = LogManager.getLogger(DefaultAccessStatusHelperTest.class);
+
+    private Collection collection;
+    private Community owningCommunity;
+    private Item itemWithoutBundle;
+    private Item itemWithoutBitstream;
+    private Item itemWithBitstream;
+    private Item itemWithEmbargo;
+    private Item itemWithDateRestriction;
+    private Item itemWithGroupRestriction;
+    private Item itemWithoutPolicy;
+    private Item itemWithoutPrimaryBitstream;
+    private Item itemWithPrimaryAndMultipleBitstreams;
+    private Item itemWithoutPrimaryAndMultipleBitstreams;
+    private DefaultAccessStatusHelper helper;
+    private Date threshold;
+
+    protected CommunityService communityService =
+            ContentServiceFactory.getInstance().getCommunityService();
+    protected CollectionService collectionService =
+            ContentServiceFactory.getInstance().getCollectionService();
+    protected ItemService itemService =
+            ContentServiceFactory.getInstance().getItemService();
+    protected WorkspaceItemService workspaceItemService =
+            ContentServiceFactory.getInstance().getWorkspaceItemService();
+    protected InstallItemService installItemService =
+            ContentServiceFactory.getInstance().getInstallItemService();
+    protected BundleService bundleService =
+            ContentServiceFactory.getInstance().getBundleService();
+    protected BitstreamService bitstreamService =
+            ContentServiceFactory.getInstance().getBitstreamService();
+    protected ResourcePolicyService resourcePolicyService =
+            AuthorizeServiceFactory.getInstance().getResourcePolicyService();
+    protected GroupService groupService =
+            EPersonServiceFactory.getInstance().getGroupService();
+
+    /**
+     * This method will be run before every test as per @Before. It will
+     * initialize resources required for the tests.
+     *
+     * Other methods can be annotated with @Before here or in subclasses
+     * but no execution order is guaranteed
+     */
+    @Before
+    @Override
+    public void init() {
+        super.init();
+        try {
+            context.turnOffAuthorisationSystem();
+            owningCommunity = communityService.create(null, context);
+            collection = collectionService.create(context, owningCommunity);
+            itemWithoutBundle = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithoutBitstream = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithBitstream = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithEmbargo = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithDateRestriction = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithGroupRestriction = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithoutPolicy = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithoutPrimaryBitstream = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithPrimaryAndMultipleBitstreams = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            itemWithoutPrimaryAndMultipleBitstreams = installItemService.installItem(context,
+                    workspaceItemService.create(context, collection, true));
+            context.restoreAuthSystemState();
+        } catch (AuthorizeException ex) {
+            log.error("Authorization Error in init", ex);
+            fail("Authorization Error in init: " + ex.getMessage());
+        } catch (SQLException ex) {
+            log.error("SQL Error in init", ex);
+            fail("SQL Error in init: " + ex.getMessage());
+        }
+        helper = new DefaultAccessStatusHelper();
+        threshold = new LocalDate(10000, 1, 1).toDate();
+    }
+
+    /**
+     * This method will be run after every test as per @After. It will
+     * clean resources initialized by the @Before methods.
+     *
+     * Other methods can be annotated with @After here or in subclasses
+     * but no execution order is guaranteed
+     */
+    @After
+    @Override
+    public void destroy() {
+        context.turnOffAuthorisationSystem();
+        try {
+            itemService.delete(context, itemWithoutBundle);
+            itemService.delete(context, itemWithoutBitstream);
+            itemService.delete(context, itemWithBitstream);
+            itemService.delete(context, itemWithEmbargo);
+            itemService.delete(context, itemWithDateRestriction);
+            itemService.delete(context, itemWithGroupRestriction);
+            itemService.delete(context, itemWithoutPolicy);
+            itemService.delete(context, itemWithoutPrimaryBitstream);
+            itemService.delete(context, itemWithPrimaryAndMultipleBitstreams);
+            itemService.delete(context, itemWithoutPrimaryAndMultipleBitstreams);
+        } catch (Exception e) {
+            // ignore
+        }
+        try {
+            collectionService.delete(context, collection);
+        } catch (Exception e) {
+            // ignore
+        }
+        try {
+            communityService.delete(context, owningCommunity);
+        } catch (Exception e) {
+            // ignore
+        }
+        context.restoreAuthSystemState();
+        itemWithoutBundle = null;
+        itemWithoutBitstream = null;
+        itemWithBitstream = null;
+        itemWithEmbargo = null;
+        itemWithDateRestriction = null;
+        itemWithGroupRestriction = null;
+        itemWithoutPolicy = null;
+        itemWithoutPrimaryBitstream = null;
+        itemWithPrimaryAndMultipleBitstreams = null;
+        itemWithoutPrimaryAndMultipleBitstreams = null;
+        collection = null;
+        owningCommunity = null;
+        helper = null;
+        threshold = null;
+        communityService = null;
+        collectionService = null;
+        itemService = null;
+        workspaceItemService = null;
+        installItemService = null;
+        bundleService = null;
+        bitstreamService = null;
+        resourcePolicyService = null;
+        groupService = null;
+        try {
+            super.destroy();
+        } catch (Exception e) {
+            // ignore
+        }
+    }
+
+    /**
+     * Test for a null item
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithNullItem() throws Exception {
+        String status = helper.getAccessStatusFromItem(context, null, threshold);
+        assertThat("testWithNullItem 0", status, equalTo(DefaultAccessStatusHelper.UNKNOWN));
+    }
+
+    /**
+     * Test for an item with no bundle
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithoutBundle() throws Exception {
+        String status = helper.getAccessStatusFromItem(context, itemWithoutBundle, threshold);
+        assertThat("testWithoutBundle 0", status, equalTo(DefaultAccessStatusHelper.METADATA_ONLY));
+    }
+
+    /**
+     * Test for an item with no bitstream
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithoutBitstream() throws Exception {
+        context.turnOffAuthorisationSystem();
+        bundleService.create(context, itemWithoutBitstream, Constants.CONTENT_BUNDLE_NAME);
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithoutBitstream, threshold);
+        assertThat("testWithoutBitstream 0", status, equalTo(DefaultAccessStatusHelper.METADATA_ONLY));
+    }
+
+    /**
+     * Test for an item with a basic bitstream (open access)
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithBitstream() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = bundleService.create(context, itemWithBitstream, Constants.CONTENT_BUNDLE_NAME);
+        Bitstream bitstream = bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        bitstream.setName(context, "primary");
+        bundle.setPrimaryBitstreamID(bitstream);
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithBitstream, threshold);
+        assertThat("testWithBitstream 0", status, equalTo(DefaultAccessStatusHelper.OPEN_ACCESS));
+    }
+
+    /**
+     * Test for an item with an embargo
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithEmbargo() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = bundleService.create(context, itemWithEmbargo, Constants.CONTENT_BUNDLE_NAME);
+        Bitstream bitstream = bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        bitstream.setName(context, "primary");
+        bundle.setPrimaryBitstreamID(bitstream);
+        List<ResourcePolicy> policies = new ArrayList<>();
+        ResourcePolicy policy = resourcePolicyService.create(context);
+        policy.setRpName("Embargo");
+        Group group = groupService.findByName(context, Group.ANONYMOUS);
+        policy.setGroup(group);
+        policy.setAction(Constants.READ);
+        policy.setStartDate(new LocalDate(9999, 12, 31).toDate());
+        policies.add(policy);
+        authorizeService.removeAllPolicies(context, bitstream);
+        authorizeService.addPolicies(context, policies, bitstream);
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithEmbargo, threshold);
+        assertThat("testWithEmbargo 0", status, equalTo(DefaultAccessStatusHelper.EMBARGO));
+    }
+
+    /**
+     * Test for an item with an anonymous date restriction
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithDateRestriction() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = bundleService.create(context, itemWithDateRestriction, Constants.CONTENT_BUNDLE_NAME);
+        Bitstream bitstream = bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        bitstream.setName(context, "primary");
+        bundle.setPrimaryBitstreamID(bitstream);
+        List<ResourcePolicy> policies = new ArrayList<>();
+        ResourcePolicy policy = resourcePolicyService.create(context);
+        policy.setRpName("Restriction");
+        Group group = groupService.findByName(context, Group.ANONYMOUS);
+        policy.setGroup(group);
+        policy.setAction(Constants.READ);
+        policy.setStartDate(new LocalDate(10000, 1, 1).toDate());
+        policies.add(policy);
+        authorizeService.removeAllPolicies(context, bitstream);
+        authorizeService.addPolicies(context, policies, bitstream);
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithDateRestriction, threshold);
+        assertThat("testWithDateRestriction 0", status, equalTo(DefaultAccessStatusHelper.RESTRICTED));
+    }
+
+    /**
+     * Test for an item with a group restriction
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithGroupRestriction() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = bundleService.create(context, itemWithGroupRestriction, Constants.CONTENT_BUNDLE_NAME);
+        Bitstream bitstream = bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        bitstream.setName(context, "primary");
+        bundle.setPrimaryBitstreamID(bitstream);
+        List<ResourcePolicy> policies = new ArrayList<>();
+        ResourcePolicy policy = resourcePolicyService.create(context);
+        policy.setRpName("Restriction");
+        Group group = groupService.findByName(context, Group.ADMIN);
+        policy.setGroup(group);
+        policy.setAction(Constants.READ);
+        policies.add(policy);
+        authorizeService.removeAllPolicies(context, bitstream);
+        authorizeService.addPolicies(context, policies, bitstream);
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithGroupRestriction, threshold);
+        assertThat("testWithGroupRestriction 0", status, equalTo(DefaultAccessStatusHelper.RESTRICTED));
+    }
+
+    /**
+     * Test for an item with no policy
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithoutPolicy() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = bundleService.create(context, itemWithoutPolicy, Constants.CONTENT_BUNDLE_NAME);
+        Bitstream bitstream = bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        bitstream.setName(context, "primary");
+        bundle.setPrimaryBitstreamID(bitstream);
+        authorizeService.removeAllPolicies(context, bitstream);
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithoutPolicy, threshold);
+        assertThat("testWithoutPolicy 0", status, equalTo(DefaultAccessStatusHelper.RESTRICTED));
+    }
+
+    /**
+     * Test for an item with no primary bitstream
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithoutPrimaryBitstream() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = bundleService.create(context, itemWithoutPrimaryBitstream, Constants.CONTENT_BUNDLE_NAME);
+        Bitstream bitstream = bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        bitstream.setName(context, "first");
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithoutPrimaryBitstream, threshold);
+        assertThat("testWithoutPrimaryBitstream 0", status, equalTo(DefaultAccessStatusHelper.OPEN_ACCESS));
+    }
+
+    /**
+     * Test for an item with an open access bitstream
+     * and another primary bitstream on embargo
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithPrimaryAndMultipleBitstreams() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = bundleService.create(context, itemWithPrimaryAndMultipleBitstreams,
+                Constants.CONTENT_BUNDLE_NAME);
+        bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        Bitstream primaryBitstream = bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        bundle.setPrimaryBitstreamID(primaryBitstream);
+        List<ResourcePolicy> policies = new ArrayList<>();
+        ResourcePolicy policy = resourcePolicyService.create(context);
+        policy.setRpName("Embargo");
+        Group group = groupService.findByName(context, Group.ANONYMOUS);
+        policy.setGroup(group);
+        policy.setAction(Constants.READ);
+        policy.setStartDate(new LocalDate(9999, 12, 31).toDate());
+        policies.add(policy);
+        authorizeService.removeAllPolicies(context, primaryBitstream);
+        authorizeService.addPolicies(context, policies, primaryBitstream);
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithPrimaryAndMultipleBitstreams, threshold);
+        assertThat("testWithPrimaryAndMultipleBitstreams 0", status, equalTo(DefaultAccessStatusHelper.EMBARGO));
+    }
+
+    /**
+     * Test for an item with an open access bitstream
+     * and another bitstream on embargo
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testWithNoPrimaryAndMultipleBitstreams() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = bundleService.create(context, itemWithoutPrimaryAndMultipleBitstreams,
+                Constants.CONTENT_BUNDLE_NAME);
+        bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        Bitstream anotherBitstream = bitstreamService.create(context, bundle,
+                new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
+        List<ResourcePolicy> policies = new ArrayList<>();
+        ResourcePolicy policy = resourcePolicyService.create(context);
+        policy.setRpName("Embargo");
+        Group group = groupService.findByName(context, Group.ANONYMOUS);
+        policy.setGroup(group);
+        policy.setAction(Constants.READ);
+        policy.setStartDate(new LocalDate(9999, 12, 31).toDate());
+        policies.add(policy);
+        authorizeService.removeAllPolicies(context, anotherBitstream);
+        authorizeService.addPolicies(context, policies, anotherBitstream);
+        context.restoreAuthSystemState();
+        String status = helper.getAccessStatusFromItem(context, itemWithoutPrimaryAndMultipleBitstreams, threshold);
+        assertThat("testWithNoPrimaryAndMultipleBitstreams 0", status, equalTo(DefaultAccessStatusHelper.OPEN_ACCESS));
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/administer/ProcessCleanerIT.java b/dspace-api/src/test/java/org/dspace/administer/ProcessCleanerIT.java
new file mode 100644
index 0000000000..4676236cfe
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/administer/ProcessCleanerIT.java
@@ -0,0 +1,380 @@
+/**
+ * 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/
+ */
+package org.dspace.administer;
+
+import static org.apache.commons.lang.time.DateUtils.addDays;
+import static org.dspace.content.ProcessStatus.COMPLETED;
+import static org.dspace.content.ProcessStatus.FAILED;
+import static org.dspace.content.ProcessStatus.RUNNING;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.app.launcher.ScriptLauncher;
+import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
+import org.dspace.builder.ProcessBuilder;
+import org.dspace.content.ProcessStatus;
+import org.dspace.scripts.Process;
+import org.dspace.scripts.factory.ScriptServiceFactory;
+import org.dspace.scripts.service.ProcessService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.Test;
+
+/**
+ * Integration tests for {@link ProcessCleaner}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class ProcessCleanerIT extends AbstractIntegrationTestWithDatabase {
+
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    private ProcessService processService = ScriptServiceFactory.getInstance().getProcessService();
+
+    @Test
+    public void testWithoutProcessToDelete() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        assertThat(testDSpaceRunnableHandler.getErrorMessages(), empty());
+        assertThat(testDSpaceRunnableHandler.getWarningMessages(), empty());
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [COMPLETED]"));
+        assertThat(messages, hasItem("Found 0 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+
+    }
+
+    @Test
+    public void testWithoutSpecifiedStatus() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+        Process process_4 = buildProcess(COMPLETED, addDays(new Date(), -6));
+        Process process_5 = buildProcess(COMPLETED, addDays(new Date(), -8));
+        Process process_6 = buildProcess(RUNNING, addDays(new Date(), -7));
+        Process process_7 = buildProcess(FAILED, addDays(new Date(), -8));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        assertThat(testDSpaceRunnableHandler.getErrorMessages(), empty());
+        assertThat(testDSpaceRunnableHandler.getWarningMessages(), empty());
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [COMPLETED]"));
+        assertThat(messages, hasItem("Found 2 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+        assertThat(processService.find(context, process_4.getID()), nullValue());
+        assertThat(processService.find(context, process_5.getID()), nullValue());
+        assertThat(processService.find(context, process_6.getID()), notNullValue());
+        assertThat(processService.find(context, process_7.getID()), notNullValue());
+
+    }
+
+    @Test
+    public void testWithCompletedStatus() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+        Process process_4 = buildProcess(COMPLETED, addDays(new Date(), -6));
+        Process process_5 = buildProcess(COMPLETED, addDays(new Date(), -8));
+        Process process_6 = buildProcess(RUNNING, addDays(new Date(), -7));
+        Process process_7 = buildProcess(FAILED, addDays(new Date(), -8));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner", "-c" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        assertThat(testDSpaceRunnableHandler.getErrorMessages(), empty());
+        assertThat(testDSpaceRunnableHandler.getWarningMessages(), empty());
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [COMPLETED]"));
+        assertThat(messages, hasItem("Found 2 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+        assertThat(processService.find(context, process_4.getID()), nullValue());
+        assertThat(processService.find(context, process_5.getID()), nullValue());
+        assertThat(processService.find(context, process_6.getID()), notNullValue());
+        assertThat(processService.find(context, process_7.getID()), notNullValue());
+
+    }
+
+    @Test
+    public void testWithRunningStatus() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+        Process process_4 = buildProcess(COMPLETED, addDays(new Date(), -6));
+        Process process_5 = buildProcess(COMPLETED, addDays(new Date(), -8));
+        Process process_6 = buildProcess(RUNNING, addDays(new Date(), -7));
+        Process process_7 = buildProcess(FAILED, addDays(new Date(), -8));
+        Process process_8 = buildProcess(RUNNING, addDays(new Date(), -9));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner", "-r" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        assertThat(testDSpaceRunnableHandler.getErrorMessages(), empty());
+        assertThat(testDSpaceRunnableHandler.getWarningMessages(), empty());
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [RUNNING]"));
+        assertThat(messages, hasItem("Found 2 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+        assertThat(processService.find(context, process_4.getID()), notNullValue());
+        assertThat(processService.find(context, process_5.getID()), notNullValue());
+        assertThat(processService.find(context, process_6.getID()), nullValue());
+        assertThat(processService.find(context, process_7.getID()), notNullValue());
+        assertThat(processService.find(context, process_8.getID()), nullValue());
+
+    }
+
+    @Test
+    public void testWithFailedStatus() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+        Process process_4 = buildProcess(COMPLETED, addDays(new Date(), -6));
+        Process process_5 = buildProcess(COMPLETED, addDays(new Date(), -8));
+        Process process_6 = buildProcess(RUNNING, addDays(new Date(), -7));
+        Process process_7 = buildProcess(FAILED, addDays(new Date(), -8));
+        Process process_8 = buildProcess(FAILED, addDays(new Date(), -9));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner", "-f" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        assertThat(testDSpaceRunnableHandler.getErrorMessages(), empty());
+        assertThat(testDSpaceRunnableHandler.getWarningMessages(), empty());
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [FAILED]"));
+        assertThat(messages, hasItem("Found 2 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+        assertThat(processService.find(context, process_4.getID()), notNullValue());
+        assertThat(processService.find(context, process_5.getID()), notNullValue());
+        assertThat(processService.find(context, process_6.getID()), notNullValue());
+        assertThat(processService.find(context, process_7.getID()), nullValue());
+        assertThat(processService.find(context, process_8.getID()), nullValue());
+
+    }
+
+    @Test
+    public void testWithCompletedAndFailedStatus() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+        Process process_4 = buildProcess(COMPLETED, addDays(new Date(), -6));
+        Process process_5 = buildProcess(COMPLETED, addDays(new Date(), -8));
+        Process process_6 = buildProcess(RUNNING, addDays(new Date(), -7));
+        Process process_7 = buildProcess(FAILED, addDays(new Date(), -8));
+        Process process_8 = buildProcess(FAILED, addDays(new Date(), -9));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner", "-c", "-f" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [COMPLETED, FAILED]"));
+        assertThat(messages, hasItem("Found 4 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+        assertThat(processService.find(context, process_4.getID()), nullValue());
+        assertThat(processService.find(context, process_5.getID()), nullValue());
+        assertThat(processService.find(context, process_6.getID()), notNullValue());
+        assertThat(processService.find(context, process_7.getID()), nullValue());
+        assertThat(processService.find(context, process_8.getID()), nullValue());
+
+    }
+
+    @Test
+    public void testWithCompletedAndRunningStatus() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+        Process process_4 = buildProcess(COMPLETED, addDays(new Date(), -6));
+        Process process_5 = buildProcess(COMPLETED, addDays(new Date(), -8));
+        Process process_6 = buildProcess(RUNNING, addDays(new Date(), -7));
+        Process process_7 = buildProcess(FAILED, addDays(new Date(), -8));
+        Process process_8 = buildProcess(RUNNING, addDays(new Date(), -9));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner", "-c", "-r" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [COMPLETED, RUNNING]"));
+        assertThat(messages, hasItem("Found 4 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+        assertThat(processService.find(context, process_4.getID()), nullValue());
+        assertThat(processService.find(context, process_5.getID()), nullValue());
+        assertThat(processService.find(context, process_6.getID()), nullValue());
+        assertThat(processService.find(context, process_7.getID()), notNullValue());
+        assertThat(processService.find(context, process_8.getID()), nullValue());
+
+    }
+
+    @Test
+    public void testWithFailedAndRunningStatus() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+        Process process_4 = buildProcess(COMPLETED, addDays(new Date(), -6));
+        Process process_5 = buildProcess(COMPLETED, addDays(new Date(), -8));
+        Process process_6 = buildProcess(RUNNING, addDays(new Date(), -7));
+        Process process_7 = buildProcess(FAILED, addDays(new Date(), -8));
+        Process process_8 = buildProcess(RUNNING, addDays(new Date(), -9));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner", "-f", "-r" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [FAILED, RUNNING]"));
+        assertThat(messages, hasItem("Found 3 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+        assertThat(processService.find(context, process_4.getID()), notNullValue());
+        assertThat(processService.find(context, process_5.getID()), notNullValue());
+        assertThat(processService.find(context, process_6.getID()), nullValue());
+        assertThat(processService.find(context, process_7.getID()), nullValue());
+        assertThat(processService.find(context, process_8.getID()), nullValue());
+
+    }
+
+    @Test
+    public void testWithCompletedFailedAndRunningStatus() throws Exception {
+
+        Process process_1 = buildProcess(COMPLETED, addDays(new Date(), -2));
+        Process process_2 = buildProcess(RUNNING, addDays(new Date(), -1));
+        Process process_3 = buildProcess(FAILED, addDays(new Date(), -3));
+        Process process_4 = buildProcess(COMPLETED, addDays(new Date(), -6));
+        Process process_5 = buildProcess(COMPLETED, addDays(new Date(), -8));
+        Process process_6 = buildProcess(RUNNING, addDays(new Date(), -7));
+        Process process_7 = buildProcess(FAILED, addDays(new Date(), -8));
+        Process process_8 = buildProcess(RUNNING, addDays(new Date(), -9));
+
+        configurationService.setProperty("process-cleaner.days", 5);
+
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "process-cleaner", "-f", "-r", "-c" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(3));
+        assertThat(messages, hasItem("Searching for processes with status: [COMPLETED, FAILED, RUNNING]"));
+        assertThat(messages, hasItem("Found 5 processes to be deleted"));
+        assertThat(messages, hasItem("Process cleanup completed"));
+
+        assertThat(processService.find(context, process_1.getID()), notNullValue());
+        assertThat(processService.find(context, process_2.getID()), notNullValue());
+        assertThat(processService.find(context, process_3.getID()), notNullValue());
+        assertThat(processService.find(context, process_4.getID()), nullValue());
+        assertThat(processService.find(context, process_5.getID()), nullValue());
+        assertThat(processService.find(context, process_6.getID()), nullValue());
+        assertThat(processService.find(context, process_7.getID()), nullValue());
+        assertThat(processService.find(context, process_8.getID()), nullValue());
+
+    }
+
+    private Process buildProcess(ProcessStatus processStatus, Date creationTime) throws SQLException {
+        return ProcessBuilder.createProcess(context, admin, "test", List.of())
+            .withProcessStatus(processStatus)
+            .withCreationTime(creationTime)
+            .build();
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/administer/StructBuilderIT.java b/dspace-api/src/test/java/org/dspace/administer/StructBuilderIT.java
index 7abe3618ed..63340698ac 100644
--- a/dspace-api/src/test/java/org/dspace/administer/StructBuilderIT.java
+++ b/dspace-api/src/test/java/org/dspace/administer/StructBuilderIT.java
@@ -8,6 +8,7 @@
 package org.dspace.administer;
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -18,9 +19,10 @@ import java.sql.SQLException;
 import java.util.Iterator;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamSource;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractIntegrationTest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
@@ -29,13 +31,11 @@ import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
-import org.junit.After;
+import org.dspace.handle.Handle;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
@@ -53,7 +53,7 @@ import org.xmlunit.diff.Difference;
  */
 public class StructBuilderIT
         extends AbstractIntegrationTest {
-    private static final Logger log = LoggerFactory.getLogger(StructBuilderIT.class);
+    private static final Logger log = LogManager.getLogger();
 
     private static final CommunityService communityService
             = ContentServiceFactory.getInstance().getCommunityService();
@@ -89,27 +89,28 @@ public class StructBuilderIT
         context.restoreAuthSystemState();
     }
 
-    @After
-    public void tearDown() {
-    }
+    private static final String COMMUNITY_0_HANDLE = "https://hdl.handle.net/1/1";
+    private static final String COMMUNITY_0_0_HANDLE = "https://hdl.handle.net/1/1.1";
+    private static final String COLLECTION_0_0_0_HANDLE = "https://hdl.handle.net/1/1.1.1";
+    private static final String COLLECTION_0_1_HANDLE = "https://hdl.handle.net/1/1.2";
 
     /** Test structure document. */
     private static final String IMPORT_DOCUMENT =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
             "<import_structure>\n" +
-            "  <community>\n" +
+            "  <community identifier='" + COMMUNITY_0_HANDLE + "'>\n" +
             "    <name>Top Community 0</name>\n" +
             "    <description>A top level community</description>\n" +
             "    <intro>Testing 1 2 3</intro>\n" +
             "    <copyright>1969</copyright>\n" +
             "    <sidebar>A sidebar</sidebar>\n" +
-            "    <community>\n" +
+            "    <community identifier='" + COMMUNITY_0_0_HANDLE + "'>\n" +
             "      <name>Sub Community 0.0</name>\n" +
             "      <description>A sub community</description>\n" +
             "      <intro>Live from New York....</intro>\n" +
             "      <copyright>1957</copyright>\n" +
             "      <sidebar>Another sidebar</sidebar>\n" +
-            "      <collection>\n" +
+            "      <collection identifier='" + COLLECTION_0_0_0_HANDLE + "'>\n" +
             "        <name>Collection 0.0.0</name>\n" +
             "        <description>A collection</description>\n" +
             "        <intro>Our next guest needs no introduction</intro>\n" +
@@ -119,7 +120,14 @@ public class StructBuilderIT
             "        <provenance>Testing</provenance>\n" +
             "      </collection>\n" +
             "    </community>\n" +
-            "    <collection>\n" +
+            "    <community>\n" +
+            "      <name>Sub Community 0.1</name>\n" +
+            "      <description>A sub community with no handle</description>\n" +
+            "      <intro>Stop me if you've heard this one</intro>\n" +
+            "      <copyright>2525</copyright>\n" +
+            "      <sidebar>One more sidebar</sidebar>\n" +
+            "    </community>\n" +
+            "    <collection identifier='" + COLLECTION_0_1_HANDLE + "'>\n" +
             "      <name>Collection 0.1</name>\n" +
             "      <description>Another collection</description>\n" +
             "      <intro>Fourscore and seven years ago</intro>\n" +
@@ -150,7 +158,7 @@ public class StructBuilderIT
      * @throws java.lang.Exception passed through.
      */
     @Test
-    public void testImportStructure()
+    public void testImportStructureWithoutHandles()
             throws Exception {
         System.out.println("importStructure");
 
@@ -160,11 +168,7 @@ public class StructBuilderIT
         byte[] inputBytes = IMPORT_DOCUMENT.getBytes(StandardCharsets.UTF_8);
         context.turnOffAuthorisationSystem();
         try (InputStream input = new ByteArrayInputStream(inputBytes);) {
-            StructBuilder.importStructure(context, input, outputDocument);
-        } catch (IOException | SQLException
-                | ParserConfigurationException | TransformerException ex) {
-            System.err.println(ex.getMessage());
-            System.exit(1);
+            StructBuilder.importStructure(context, input, outputDocument, false);
         } finally {
             context.restoreAuthSystemState();
         }
@@ -180,7 +184,81 @@ public class StructBuilderIT
                         IMPORT_DOCUMENT.getBytes(StandardCharsets.UTF_8)));
         Diff myDiff = DiffBuilder.compare(reference).withTest(output)
                 .normalizeWhitespace()
-//                .withNodeFilter(new MyNodeFilter())
+                .withAttributeFilter((Attr attr) ->
+                        !attr.getName().equals("identifier"))
+                .checkForIdentical()
+                .build();
+
+        // Was there a difference?
+        // Always output differences -- one is expected.
+        ComparisonFormatter formatter = new DefaultComparisonFormatter();
+        for (Difference difference : myDiff.getDifferences()) {
+            System.err.println(difference.toString(formatter));
+        }
+        // Test for *significant* differences.
+        assertFalse("Output does not match input.", isDifferent(myDiff));
+
+        // TODO spot-check some objects.
+    }
+
+    /**
+     * Test of importStructure method, with given Handles.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testImportStructureWithHandles()
+            throws Exception {
+        System.out.println("importStructure");
+
+        // Run the method under test and collect its output.
+        ByteArrayOutputStream outputDocument
+                = new ByteArrayOutputStream(IMPORT_DOCUMENT.length() * 2 * 2);
+        byte[] inputBytes = IMPORT_DOCUMENT.getBytes(StandardCharsets.UTF_8);
+        context.turnOffAuthorisationSystem();
+        try (InputStream input = new ByteArrayInputStream(inputBytes);) {
+            StructBuilder.importStructure(context, input, outputDocument, true);
+        } finally {
+            context.restoreAuthSystemState();
+        }
+
+        boolean found;
+
+        // Check a chosen Community for the right Handle.
+        found = false;
+        for (Community community : communityService.findAllTop(context)) {
+            for (Handle handle : community.getHandles()) {
+                if (handle.getHandle().equals(COMMUNITY_0_HANDLE)) {
+                    found = true;
+                    break;
+                }
+            }
+        }
+        assertTrue("A community should have its specified handle", found);
+
+        // Check a chosen Collection for the right Handle.
+        found = false;
+        for (Collection collection : collectionService.findAll(context)) {
+            for (Handle handle : collection.getHandles()) {
+                if (handle.getHandle().equals(COLLECTION_0_1_HANDLE)) {
+                    found = true;
+                    break;
+                }
+            }
+        }
+        assertTrue("A collection should have its specified handle", found);
+
+        // Compare import's output with its input.
+        // N.B. here we rely on StructBuilder to emit communities and
+        // collections in the same order as the input document.  If that changes,
+        // we will need a smarter NodeMatcher, probably based on <name> children.
+        Source output = new StreamSource(
+                new ByteArrayInputStream(outputDocument.toByteArray()));
+        Source reference = new StreamSource(
+                new ByteArrayInputStream(
+                        IMPORT_DOCUMENT.getBytes(StandardCharsets.UTF_8)));
+        Diff myDiff = DiffBuilder.compare(reference).withTest(output)
+                .normalizeWhitespace()
                 .withAttributeFilter((Attr attr) ->
                         !attr.getName().equals("identifier"))
                 .checkForIdentical()
@@ -236,7 +314,6 @@ public class StructBuilderIT
                         EXPORT_DOCUMENT.getBytes(StandardCharsets.UTF_8)));
         Diff myDiff = DiffBuilder.compare(reference).withTest(output)
                 .normalizeWhitespace()
-//                .withNodeFilter(new MyNodeFilter())
                 .withAttributeFilter((Attr attr) ->
                         !attr.getName().equals("identifier"))
                 .checkForIdentical()
@@ -310,23 +387,4 @@ public class StructBuilderIT
         // There must be at most one difference.
         return diffIterator.hasNext();
     }
-
-    /**
-     * Reject uninteresting nodes. (currently commented out of tests above)
-     */
-    /*private static class MyNodeFilter implements Predicate<Node> {
-        private static final List<String> dontCare = Arrays.asList(
-            "description",
-            "intro",
-            "copyright",
-            "sidebar",
-            "license",
-            "provenance");
-
-        @Override
-        public boolean test(Node node) {
-            String type = node.getLocalName();
-            return ! dontCare.contains(type);
-        }
-    }*/
 }
diff --git a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportSearchIT.java b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportSearchIT.java
new file mode 100644
index 0000000000..3a972692ef
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportSearchIT.java
@@ -0,0 +1,253 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.bulkedit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.google.common.io.Files;
+import com.opencsv.CSVReader;
+import com.opencsv.exceptions.CsvException;
+import org.apache.log4j.Logger;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.app.launcher.ScriptLauncher;
+import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.SearchService;
+import org.dspace.discovery.SearchUtils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.Before;
+import org.junit.Test;
+
+public class MetadataExportSearchIT extends AbstractIntegrationTestWithDatabase {
+
+    private String subject1 = "subject1";
+    private String subject2 = "subject2";
+    private int numberItemsSubject1 = 30;
+    private int numberItemsSubject2 = 2;
+    private Item[] itemsSubject1 = new Item[numberItemsSubject1];
+    private Item[] itemsSubject2 = new Item[numberItemsSubject2];
+    private String filename;
+    private Collection collection;
+    private Logger logger = Logger.getLogger(MetadataExportSearchIT.class);
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private SearchService searchService;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        searchService = SearchUtils.getSearchService();
+
+        // dummy search so that the SearchService gets called in a test context first
+        DiscoverQuery query = new DiscoverQuery();
+        query.setMaxResults(0);
+        searchService.search(context, query);
+
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).build();
+        collection = CollectionBuilder.createCollection(context, community).build();
+        filename = configurationService.getProperty("dspace.dir")
+            + testProps.get("test.exportcsv").toString();
+
+
+        for (int i = 0; i < numberItemsSubject1; i++) {
+            itemsSubject1[i] = ItemBuilder.createItem(context, collection)
+                .withTitle(String.format("%s item %d", subject1, i))
+                .withSubject(subject1)
+                .withIssueDate("2020-09-" + i)
+                .build();
+        }
+
+        for (int i = 0; i < numberItemsSubject2; i++) {
+            itemsSubject2[i] = ItemBuilder.createItem(context, collection)
+                .withTitle(String.format("%s item %d", subject2, i))
+                .withSubject(subject2)
+                .withIssueDate("2021-09-" + i)
+                .build();
+        }
+        context.restoreAuthSystemState();
+    }
+
+    private void checkItemsPresentInFile(String filename, Item[] items) throws IOException, CsvException {
+        File file = new File(filename);
+        Reader reader = Files.newReader(file, Charset.defaultCharset());
+        CSVReader csvReader = new CSVReader(reader);
+
+
+        List<String[]> lines = csvReader.readAll();
+        //length + 1 is because of 1 row extra for the headers
+        assertEquals(items.length + 1, lines.size());
+
+        List<String> ids = new ArrayList<>();
+        //ignoring the first row as this only contains headers;
+        logger.debug("checking content of lines");
+        for (int i = 1; i < lines.size(); i++) {
+            logger.debug(String.join(", ", lines.get(i)));
+            ids.add(lines.get(i)[0]);
+        }
+
+        for (Item item : items) {
+            assertTrue(ids.contains(item.getID().toString()));
+        }
+    }
+
+    @Test
+    public void metadateExportSearchQueryTest() throws Exception {
+        int result = runDSpaceScript("metadata-export-search", "-q", "subject:" + subject1, "-n", filename);
+
+        assertEquals(0, result);
+        checkItemsPresentInFile(filename, itemsSubject1);
+
+
+        result = runDSpaceScript("metadata-export-search", "-q", "subject: " + subject2, "-n", filename);
+
+        assertEquals(0, result);
+        checkItemsPresentInFile(filename, itemsSubject2);
+    }
+
+    @Test
+    public void exportMetadataSearchSpecificContainerTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community2 = CommunityBuilder.createCommunity(context).build();
+        Collection collection2 = CollectionBuilder.createCollection(context, community2).build();
+
+        int numberItemsDifferentCollection = 15;
+        Item[] itemsDifferentCollection = new Item[numberItemsDifferentCollection];
+        for (int i = 0; i < numberItemsDifferentCollection; i++) {
+            itemsDifferentCollection[i] = ItemBuilder.createItem(context, collection2)
+                .withTitle("item different collection " + i)
+                .withSubject(subject1)
+                .build();
+        }
+
+        //creating some items with a different subject to make sure the query still works
+        for (int i = 0; i < 5; i++) {
+            ItemBuilder.createItem(context, collection2)
+                .withTitle("item different collection, different subject " + i)
+                .withSubject(subject2)
+                .build();
+        }
+        context.restoreAuthSystemState();
+
+        int result = runDSpaceScript(
+            "metadata-export-search", "-q", "subject: " + subject1, "-s", collection2.getID().toString(), "-n", filename
+        );
+
+        assertEquals(0, result);
+        checkItemsPresentInFile(filename, itemsDifferentCollection);
+    }
+
+    @Test
+    public void exportMetadataSearchFilter() throws Exception {
+        int result = runDSpaceScript("metadata-export-search", "-f", "subject,equals=" + subject1, "-n", filename);
+
+        assertEquals(0, result);
+        checkItemsPresentInFile(filename, itemsSubject1);
+    }
+
+    @Test
+    public void exportMetadataSearchFilterDate() throws Exception {
+        int result = runDSpaceScript(
+            "metadata-export-search", "-f", "dateIssued,equals=[2000 TO 2020]", "-n", filename
+        );
+
+        assertEquals(0, result);
+        checkItemsPresentInFile(filename, itemsSubject1);
+    }
+
+    @Test
+    public void exportMetadataSearchMultipleFilters() throws Exception {
+        int result = runDSpaceScript(
+            "metadata-export-search", "-f", "subject,equals=" + subject1, "-f",
+            "title,equals=" + String.format("%s item %d", subject1, 0), "-n", filename
+        );
+
+        assertEquals(0, result);
+        Item[] expectedResult = Arrays.copyOfRange(itemsSubject1, 0, 1);
+        checkItemsPresentInFile(filename, expectedResult);
+    }
+
+    @Test
+    public void exportMetadataSearchEqualsFilterTest()
+        throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item wellBeingItem = ItemBuilder.createItem(context, collection)
+            .withTitle("test item well-being")
+            .withSubject("well-being")
+            .build();
+
+        ItemBuilder.createItem(context, collection)
+            .withTitle("test item financial well-being")
+            .withSubject("financial well-being")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        int result = runDSpaceScript("metadata-export-search", "-f", "subject,equals=well-being", "-n", filename);
+
+        assertEquals(0, result);
+        Item[] expectedResult = new Item[] {wellBeingItem};
+        checkItemsPresentInFile(filename, expectedResult);
+    }
+
+    @Test
+    public void exportMetadataSearchInvalidDiscoveryQueryTest() throws Exception {
+        int result = runDSpaceScript("metadata-export-search", "-q", "blabla", "-n", filename);
+
+        assertEquals(0, result);
+        Item[] items = {};
+        checkItemsPresentInFile(filename, items);
+    }
+
+    @Test
+    public void exportMetadataSearchNoResultsTest() throws Exception {
+        int result = runDSpaceScript(
+            "metadata-export-search", "-f", "subject,equals=notExistingSubject", "-n", filename
+        );
+
+        assertEquals(0, result);
+        Item[] items = {};
+        checkItemsPresentInFile(filename, items);
+    }
+
+    @Test
+    public void exportMetadataSearchNonExistinFacetsTest() throws Exception {
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] {"metadata-export-search", "-f", "nonExisting,equals=" + subject1, "-f",
+            "title,equals=" + String.format("%s item %d", subject1, 0), "-n", filename};
+        int result = ScriptLauncher.handleScript(
+            args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl
+        );
+
+        assertEquals(0, result);  // exception should be handled, so the script should finish with 0
+
+        Exception exception = testDSpaceRunnableHandler.getException();
+        assertNotNull(exception);
+        assertEquals("nonExisting is not a valid search filter", exception.getMessage());
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java
index 1bd7242df0..ac5e1e6ae6 100644
--- a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java
@@ -19,6 +19,7 @@ import java.util.List;
 
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.app.launcher.ScriptLauncher;
@@ -93,10 +94,10 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
     }
 
     @Test
-    public void metadataImportIntoCollectionWithEntityTypeTest() throws Exception {
+    public void metadataImportIntoCollectionWithEntityTypeWithTemplateEnabledTest() throws Exception {
         String[] csv = {"id,collection,dc.title,dc.contributor.author",
             "+," + publicationCollection.getHandle() + ",\"Test Import 1\"," + "\"Donald, SmithImported\""};
-        performImportScript(csv);
+        performImportScript(csv, true);
         Item importedItem = findItemByName("Test Import 1");
         assertTrue(StringUtils.equals(itemService.getMetadata(importedItem, "dc", "contributor", "author", Item.ANY)
                               .get(0).getValue(), "Donald, SmithImported"));
@@ -110,6 +111,24 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
         context.restoreAuthSystemState();
     }
 
+    @Test
+    public void metadataImportIntoCollectionWithEntityTypeWithTemplateDisabledTest() throws Exception {
+        String[] csv = {"id,collection,dc.title,dc.contributor.author",
+            "+," + publicationCollection.getHandle() + ",\"Test Import 1\"," + "\"Donald, SmithImported\""};
+        performImportScript(csv, false);
+        Item importedItem = findItemByName("Test Import 1");
+        assertTrue(StringUtils.equals(itemService.getMetadata(importedItem, "dc", "contributor", "author", Item.ANY)
+            .get(0).getValue(), "Donald, SmithImported"));
+        assertEquals(0, itemService.getMetadata(importedItem, "dspace", "entity", "type", Item.ANY)
+            .size());
+        eperson = ePersonService.findByEmail(context, eperson.getEmail());
+        assertEquals(importedItem.getSubmitter(), eperson);
+
+        context.turnOffAuthorisationSystem();
+        itemService.delete(context, itemService.find(context, importedItem.getID()));
+        context.restoreAuthSystemState();
+    }
+
     @Test(expected = ParseException.class)
     public void metadataImportWithoutEPersonParameterTest()
         throws IllegalAccessException, InstantiationException, ParseException {
@@ -227,12 +246,16 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
         return importedItem;
     }
 
+    public void performImportScript(String[] csv) throws Exception {
+        performImportScript(csv, false);
+    }
+
     /**
      * Import mocked CSVs to test item creation behavior, deleting temporary file afterward.
      * @param csv content for test file.
      * @throws java.lang.Exception passed through.
      */
-    public void performImportScript(String[] csv) throws Exception {
+    public void performImportScript(String[] csv, boolean useTemplate) throws Exception {
         File csvFile = File.createTempFile("dspace-test-import", "csv");
         BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(csvFile), "UTF-8"));
         for (String csvLine : csv) {
@@ -243,6 +266,9 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
         String fileLocation = csvFile.getAbsolutePath();
         try {
             String[] args = new String[] {"metadata-import", "-f", fileLocation, "-e", eperson.getEmail(), "-s"};
+            if (useTemplate) {
+                args = ArrayUtils.add(args, "-t");
+            }
             TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
             ScriptLauncher
                 .handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
diff --git a/dspace-api/src/test/java/org/dspace/app/itemexport/ItemExportCLIIT.java b/dspace-api/src/test/java/org/dspace/app/itemexport/ItemExportCLIIT.java
new file mode 100644
index 0000000000..6db37bdbcd
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/itemexport/ItemExportCLIIT.java
@@ -0,0 +1,363 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemexport;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Collectors;
+
+import org.apache.commons.codec.CharEncoding;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.file.PathUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.BitstreamBuilder;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.ItemService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Basic integration testing for the SAF Export feature via CLI {@link ItemExportCLI}.
+ * https://wiki.lyrasis.org/display/DSDOC7x/Importing+and+Exporting+Items+via+Simple+Archive+Format
+ *
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemExportCLIIT extends AbstractIntegrationTestWithDatabase {
+
+    private static final String zipFileName = "saf-export.zip";
+    private static final String title = "A Tale of Two Cities";
+    private static final String dateIssued = "1990";
+    private static final String titleAlternative = "J'aime les Printemps";
+
+    private ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+    private CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private Collection collection;
+    private Path tempDir;
+    private Path workDir;
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection")
+                .withEntityType("Publication")
+                .build();
+        context.restoreAuthSystemState();
+
+        tempDir = Files.createTempDirectory("safExportTest");
+        File file = new File(configurationService.getProperty("org.dspace.app.itemexport.work.dir"));
+        if (!file.exists()) {
+            Files.createDirectory(Path.of(file.getAbsolutePath()));
+        }
+        workDir = Path.of(file.getAbsolutePath());
+    }
+
+    @After
+    @Override
+    public void destroy() throws Exception {
+        PathUtils.deleteDirectory(tempDir);
+        for (Path path : Files.list(workDir).collect(Collectors.toList())) {
+            PathUtils.delete(path);
+        }
+        super.destroy();
+    }
+
+    @Test
+    public void exportCollection() throws Exception {
+        // create items
+        context.turnOffAuthorisationSystem();
+        Item item1 = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        Item item2 = ItemBuilder.createItem(context, collection)
+                .withTitle(title + " 2")
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "COLLECTION",
+                "-i", collection.getHandle(), "-d", tempDir.toString(), "-n", "1" };
+        perfomExportScript(args);
+
+        checkDir();
+    }
+
+    @Test
+    public void exportZipCollection() throws Exception {
+        // create items
+        context.turnOffAuthorisationSystem();
+        Item item1 = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        Item item2 = ItemBuilder.createItem(context, collection)
+                .withTitle(title + " 2")
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "COLLECTION",
+                "-i", collection.getHandle(), "-d", tempDir.toString(), "-z", zipFileName, "-n", "1" };
+        perfomExportScript(args);
+
+        checkDir();
+        checkZip(zipFileName);
+    }
+
+    @Test
+    public void exportItemWithMetadataOnly() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "ITEM",
+                "-i", item.getHandle(), "-d", tempDir.toString(), "-n", "1" };
+        perfomExportScript(args);
+
+        checkDir();
+    }
+
+    @Test
+    public void exportItemWithBitstreams() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        // create bitstream
+        String bitstreamContent = "TEST TEST TEST";
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            Bitstream bitstream = BitstreamBuilder.createBitstream(context, item, is)
+                    .withName("Bitstream")
+                    .withMimeType("text/plain")
+                    .build();
+        }
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "ITEM",
+                "-i", item.getHandle(), "-d", tempDir.toString(), "-n", "1" };
+        perfomExportScript(args);
+
+        checkDir();
+    }
+
+    @Test
+    public void exportItemWithAnotherMetadataSchema() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .withMetadata("dcterms", "title", "", title)
+                .build();
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "ITEM",
+                "-i", item.getHandle(), "-d", tempDir.toString(), "-n", "1" };
+        perfomExportScript(args);
+
+        checkDir();
+    }
+
+    @Test
+    public void exportZipItemWithBitstreams() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        // create bitstream
+        String bitstreamContent = "TEST TEST TEST";
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            Bitstream bitstream = BitstreamBuilder.createBitstream(context, item, is)
+                    .withName("Bitstream")
+                    .withMimeType("text/plain")
+                    .build();
+        }
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "ITEM",
+                "-i", item.getHandle(), "-d", tempDir.toString(), "-z", zipFileName, "-n", "1" };
+        perfomExportScript(args);
+
+        checkDir();
+        checkZip(zipFileName);
+    }
+
+    @Test
+    public void migrateCollection() throws Exception {
+        // create items
+        context.turnOffAuthorisationSystem();
+        Item item1 = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        Item item2 = ItemBuilder.createItem(context, collection)
+                .withTitle(title + " 2")
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "COLLECTION",
+                "-i", collection.getHandle(), "-d", tempDir.toString(), "-n", "1", "-m" };
+        perfomExportScript(args);
+
+        checkDir();
+        checkCollectionMigration();
+        checkItemMigration(item1);
+        checkItemMigration(item2);
+    }
+
+    @Test
+    public void migrateItemWithMetadataOnly() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "ITEM",
+                "-i", item.getHandle(), "-d", tempDir.toString(), "-n", "1", "-m" };
+        perfomExportScript(args);
+
+        checkDir();
+        checkItemMigration(item);
+    }
+
+    @Test
+    public void migrateItemWithBitstreams() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        // create bitstream
+        String bitstreamContent = "TEST TEST TEST";
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            Bitstream bitstream = BitstreamBuilder.createBitstream(context, item, is)
+                    .withName("Bitstream")
+                    .withMimeType("text/plain")
+                    .build();
+        }
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "ITEM",
+                "-i", item.getHandle(), "-d", tempDir.toString(), "-n", "1", "-m" };
+        perfomExportScript(args);
+
+        checkDir();
+        checkItemMigration(item);
+    }
+
+    @Test
+    public void migrateItemWithAnotherMetadataSchema() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .withMetadata("dcterms", "title", "", title)
+                .build();
+        context.restoreAuthSystemState();
+
+        String[] args = new String[] { "export", "-t", "ITEM",
+                "-i", item.getHandle(), "-d", tempDir.toString(), "-n", "1", "-m" };
+        perfomExportScript(args);
+
+        checkDir();
+        checkItemMigration(item);
+    }
+
+    /**
+     * Check created export directory
+     * @throws Exception
+     */
+    private void checkDir() throws Exception {
+        assertTrue(Files.list(tempDir).findAny().isPresent());
+    }
+
+    /**
+     * Check created export zip
+     * @param zipFileName
+     * @throws Exception
+     */
+    private void checkZip(String zipFileName) throws Exception {
+        assertEquals(1,
+                Files.list(tempDir)
+                .filter(b -> StringUtils.equals(b.getFileName().toString(), zipFileName))
+                .count());
+    }
+
+    /**
+     * Check migration of collection
+     * @throws Exception
+     */
+    private void checkCollectionMigration() throws Exception {
+        assertNotNull(collectionService.find(context, collection.getID()));
+    }
+
+    /**
+     * Check migration of item
+     * @param item
+     * @throws Exception
+     */
+    private void checkItemMigration(Item item) throws Exception {
+        assertNotNull(itemService.find(context, item.getID()));
+    }
+
+    private void perfomExportScript(String[] args)
+            throws Exception {
+        runDSpaceScript(args);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/itemimport/ItemImportCLIIT.java b/dspace-api/src/test/java/org/dspace/app/itemimport/ItemImportCLIIT.java
new file mode 100644
index 0000000000..411e8de4df
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/itemimport/ItemImportCLIIT.java
@@ -0,0 +1,579 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemimport;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.file.PathUtils;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.RelationshipTypeBuilder;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Collection;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.Relationship;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Basic integration testing for the SAF Import feature via CLI {@link ItemImportCLI}.
+ * https://wiki.lyrasis.org/display/DSDOC7x/Importing+and+Exporting+Items+via+Simple+Archive+Format
+ *
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemImportCLIIT extends AbstractIntegrationTestWithDatabase {
+
+    private static final String ZIP_NAME = "saf.zip";
+    private static final String publicationTitle = "A Tale of Two Cities";
+    private static final String personTitle = "Person Test";
+
+    private ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+    private RelationshipService relationshipService = ContentServiceFactory.getInstance().getRelationshipService();
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private Collection collection;
+    private Path tempDir;
+    private Path workDir;
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection")
+                .withEntityType("Publication")
+                .build();
+
+        EntityType publication = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
+        EntityType person = EntityTypeBuilder.createEntityTypeBuilder(context, "Person").build();
+        RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                        context, publication, person, "isAuthorOfPublication",
+                        "isPublicationOfAuthor", 0, null, 0, null)
+                .withCopyToLeft(false).withCopyToRight(true).build();
+        context.restoreAuthSystemState();
+
+        tempDir = Files.createTempDirectory("safImportTest");
+        File file = new File(configurationService.getProperty("org.dspace.app.batchitemimport.work.dir"));
+        if (!file.exists()) {
+            Files.createDirectory(Path.of(file.getAbsolutePath()));
+        }
+        workDir = Path.of(file.getAbsolutePath());
+    }
+
+    @After
+    @Override
+    public void destroy() throws Exception {
+        PathUtils.deleteDirectory(tempDir);
+        for (Path path : Files.list(workDir).collect(Collectors.toList())) {
+            PathUtils.delete(path);
+        }
+        super.destroy();
+    }
+
+    @Test
+    public void importItemBySafWithMetadataOnly() throws Exception {
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+
+        String[] args = new String[] { "import", "-a", "-e", admin.getEmail(), "-c", collection.getID().toString(),
+                "-s", safDir.toString(), "-m", tempDir.toString() + "/mapfile.out" };
+        perfomImportScript(args);
+
+        checkMetadata();
+    }
+
+    @Test
+    public void importItemBySafWithBitstreams() throws Exception {
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add bitstream
+        Path contentsFile = Files.createFile(Path.of(itemDir.toString() + "/contents"));
+        Files.writeString(contentsFile,
+                "file1.txt");
+        Path bitstreamFile = Files.createFile(Path.of(itemDir.toString() + "/file1.txt"));
+        Files.writeString(bitstreamFile,
+                "TEST TEST TEST");
+
+        String[] args = new String[] { "import", "-a", "-e", admin.getEmail(), "-c", collection.getID().toString(),
+                "-s", safDir.toString(), "-m", tempDir.toString() + "/mapfile.out" };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkBitstream();
+    }
+
+    @Test
+    public void importItemBySafWithAnotherMetadataSchema() throws Exception {
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add metadata with another schema
+        Files.copy(getClass().getResourceAsStream("metadata_dcterms.xml"),
+                Path.of(itemDir.toString() + "/metadata_dcterms.xml"));
+
+        String[] args = new String[] { "import", "-a", "-e", admin.getEmail(), "-c", collection.getID().toString(),
+                "-s", safDir.toString(), "-m", tempDir.toString() + "/mapfile.out" };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkMetadataWithAnotherSchema();
+    }
+
+    @Test
+    public void importItemsBySafWithRelationships() throws Exception {
+        context.turnOffAuthorisationSystem();
+        // create collection that contains person
+        Collection collectionPerson = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection Person")
+                .withEntityType("Person")
+                .build();
+        context.restoreAuthSystemState();
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path publicationDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.writeString(Path.of(publicationDir.toString() + "/collections"),
+                collection.getID().toString());
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(publicationDir.toString() + "/dublin_core.xml"));
+        Files.copy(getClass().getResourceAsStream("relationships"),
+                Path.of(publicationDir.toString() + "/relationships"));
+        Path personDir = Files.createDirectory(Path.of(safDir.toString() + "/item_001"));
+        Files.writeString(Path.of(personDir.toString() + "/collections"),
+                collectionPerson.getID().toString());
+        Files.copy(getClass().getResourceAsStream("dublin_core-person.xml"),
+                Path.of(personDir.toString() + "/dublin_core.xml"));
+
+        String[] args = new String[] { "import", "-a", "-p", "-e", admin.getEmail(),
+                "-s", safDir.toString(), "-m", tempDir.toString() + "/mapfile.out" };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkRelationship();
+    }
+
+    @Test
+    public void importItemsBySafWithRelationshipsByRelationSchema() throws Exception {
+        context.turnOffAuthorisationSystem();
+        // create collection that contains person
+        Collection collectionPerson = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection Person")
+                .withEntityType("Person")
+                .build();
+        Item person = ItemBuilder.createItem(context, collectionPerson)
+                .withTitle(personTitle)
+                .build();
+        context.restoreAuthSystemState();
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        Files.writeString(Path.of(itemDir.toString() + "/metadata_relation.xml"),
+                "<dublin_core schema=\"relation\">\n" +
+                "    <dcvalue element=\"isAuthorOfPublication\">" + person.getID() + "</dcvalue>\n" +
+                "</dublin_core>");
+
+        String[] args = new String[] { "import", "-a", "-p", "-e", admin.getEmail(), "-c",
+                collection.getID().toString(), "-s", safDir.toString(), "-m", tempDir.toString() + "/mapfile.out" };
+        perfomImportScript(args);
+
+        checkRelationship();
+    }
+
+    @Test
+    public void importItemByZipSafWithBitstreams() throws Exception {
+        // use simple SAF in zip format
+        Files.copy(getClass().getResourceAsStream("saf-bitstreams.zip"),
+                Path.of(tempDir.toString() + "/" + ZIP_NAME));
+
+        String[] args = new String[] { "import", "-a", "-e", admin.getEmail(), "-c", collection.getID().toString(),
+                "-s", tempDir.toString(), "-z", ZIP_NAME, "-m", tempDir.toString() + "/mapfile.out" };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkMetadataWithAnotherSchema();
+        checkBitstream();
+    }
+
+    @Test
+    public void importItemByZipSafWithRelationships() throws Exception {
+        context.turnOffAuthorisationSystem();
+        // create collection that contains person
+        Collection collectionPerson = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection Person")
+                .withEntityType("Person")
+                .build();
+        // create person
+        Item person = ItemBuilder.createItem(context, collectionPerson)
+                .withTitle(personTitle)
+                .build();
+        context.restoreAuthSystemState();
+        // use simple SAF in zip format
+        Files.copy(getClass().getResourceAsStream("saf-relationships.zip"),
+                Path.of(tempDir.toString() + "/" + ZIP_NAME));
+
+        String[] args = new String[] { "import", "-a", "-p", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", tempDir.toString(), "-z", ZIP_NAME,
+                "-m", tempDir.toString() + "/mapfile.out" };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkRelationship();
+    }
+
+    @Test
+    public void resumeImportItemBySafWithMetadataOnly() throws Exception {
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+
+        String[] args = new String[] { "import", "-a", "-R", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+    }
+
+    @Test
+    public void resumeImportItemBySafWithBitstreams() throws Exception {
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add bitstream
+        Path contentsFile = Files.createFile(Path.of(itemDir.toString() + "/contents"));
+        Files.writeString(contentsFile,
+                "file1.txt");
+        Path bitstreamFile = Files.createFile(Path.of(itemDir.toString() + "/file1.txt"));
+        Files.writeString(bitstreamFile,
+                "TEST TEST TEST");
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+
+        String[] args = new String[] { "import", "-a", "-R", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkBitstream();
+    }
+
+    @Test
+    public void resumeImportItemBySafWithAnotherMetadataSchema() throws Exception {
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add metadata with another schema
+        Files.copy(getClass().getResourceAsStream("metadata_dcterms.xml"),
+                Path.of(itemDir.toString() + "/metadata_dcterms.xml"));
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+
+        String[] args = new String[] { "import", "-a", "-R", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkMetadataWithAnotherSchema();
+    }
+
+    @Test
+    public void resumeImportItemSkippingTheFirstOneBySafWithMetadataOnly()
+            throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle("Another Title")
+                .build();
+        context.restoreAuthSystemState();
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_001"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+        Files.writeString(mapFile, "item_000 " + item.getHandle());
+
+        String[] args = new String[] { "import", "-a", "-R", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+    }
+
+    @Test
+    public void resumeImportItemSkippingTheFirstOneBySafWithBitstreams()
+            throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle("Another Title")
+                .build();
+        context.restoreAuthSystemState();
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_001"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add bitstream
+        Path contentsFile = Files.createFile(Path.of(itemDir.toString() + "/contents"));
+        Files.writeString(contentsFile,
+                "file1.txt");
+        Path bitstreamFile = Files.createFile(Path.of(itemDir.toString() + "/file1.txt"));
+        Files.writeString(bitstreamFile,
+                "TEST TEST TEST");
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+        Files.writeString(mapFile, "item_000 " + item.getHandle());
+
+        String[] args = new String[] { "import", "-a", "-R", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkBitstream();
+    }
+
+    @Test
+    public void resumeImportItemSkippingTheFirstOneBySafWithAnotherMetadataSchema()
+            throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle("Another Title")
+                .build();
+        context.restoreAuthSystemState();
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_001"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add metadata with another schema
+        Files.copy(getClass().getResourceAsStream("metadata_dcterms.xml"),
+                Path.of(itemDir.toString() + "/metadata_dcterms.xml"));
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+        Files.writeString(mapFile, "item_000 " + item.getHandle());
+
+        String[] args = new String[] { "import", "-a", "-R", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkMetadataWithAnotherSchema();
+    }
+
+    @Test
+    public void replaceItemBySafWithMetadataOnly() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle("Another Title")
+                .build();
+        context.restoreAuthSystemState();
+
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+        Files.writeString(mapFile, "item_000 " + item.getHandle());
+
+        String[] args = new String[] { "import", "-r", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+    }
+
+    @Test
+    public void replaceItemBySafWithBitstreams() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle("Another Title")
+                .build();
+        context.restoreAuthSystemState();
+
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add bitstream
+        Path contentsFile = Files.createFile(Path.of(itemDir.toString() + "/contents"));
+        Files.writeString(contentsFile,
+                "file1.txt");
+        Path bitstreamFile = Files.createFile(Path.of(itemDir.toString() + "/file1.txt"));
+        Files.writeString(bitstreamFile,
+                "TEST TEST TEST");
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+        Files.writeString(mapFile, "item_000 " + item.getHandle());
+
+        String[] args = new String[] { "import", "-r", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkBitstream();
+    }
+
+    @Test
+    public void replaceItemBySafWithAnotherMetadataSchema() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle("Another Title")
+                .build();
+        context.restoreAuthSystemState();
+
+        // create simple SAF
+        Path safDir = Files.createDirectory(Path.of(tempDir.toString() + "/test"));
+        Path itemDir = Files.createDirectory(Path.of(safDir.toString() + "/item_000"));
+        Files.copy(getClass().getResourceAsStream("dublin_core.xml"),
+                Path.of(itemDir.toString() + "/dublin_core.xml"));
+        // add metadata with another schema
+        Files.copy(getClass().getResourceAsStream("metadata_dcterms.xml"),
+                Path.of(itemDir.toString() + "/metadata_dcterms.xml"));
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+        Files.writeString(mapFile, "item_000 " + item.getHandle());
+
+        String[] args = new String[] { "import", "-r", "-e", admin.getEmail(),
+                "-c", collection.getID().toString(), "-s", safDir.toString(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkMetadata();
+        checkMetadataWithAnotherSchema();
+    }
+
+    @Test
+    public void deleteItemByMapFile() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(publicationTitle)
+                .build();
+        context.restoreAuthSystemState();
+        // add mapfile
+        Path mapFile = Files.createFile(Path.of(tempDir.toString() + "/mapfile.out"));
+        Files.writeString(mapFile, "item_000 " + item.getHandle());
+
+        String[] args = new String[] { "import", "-d", "-e", admin.getEmail(),
+                "-m", mapFile.toString() };
+        perfomImportScript(args);
+
+        checkItemDeletion();
+    }
+
+    /**
+     * Check metadata on imported item
+     * @throws Exception
+     */
+    private void checkMetadata() throws Exception {
+        Item item = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle).next();
+        assertEquals(item.getName(), publicationTitle);
+        assertEquals(itemService.getMetadata(item, "dc.date.issued"), "1990");
+        assertEquals(itemService.getMetadata(item, "dc.title.alternative"), "J'aime les Printemps");
+    }
+
+    /**
+     * Check metadata on imported item
+     * @throws Exception
+     */
+    private void checkMetadataWithAnotherSchema() throws Exception {
+        Item item = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle).next();
+        assertEquals(item.getName(), publicationTitle);
+        assertEquals(itemService.getMetadata(item, "dcterms.title"), publicationTitle);
+    }
+
+    /**
+     * Check bitstreams on imported item
+     * @throws Exception
+     */
+    private void checkBitstream() throws Exception {
+        Bitstream bitstream = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle).next()
+                .getBundles("ORIGINAL").get(0).getBitstreams().get(0);
+        assertEquals(bitstream.getName(), "file1.txt");
+    }
+
+    /**
+     * Check deletion of item by mapfile
+     * @throws Exception
+     */
+    private void checkItemDeletion() throws Exception {
+        Iterator<Item> itemIterator = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle);
+        assertEquals(itemIterator.hasNext(), false);
+    }
+
+    /**
+     * Check relationships between imported items
+     * @throws Exception
+     */
+    private void checkRelationship() throws Exception {
+        Item item = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle).next();
+        Item author = itemService.findByMetadataField(context, "dc", "title", null, personTitle).next();
+        List<Relationship> relationships = relationshipService.findByItem(context, item);
+        assertEquals(1, relationships.size());
+        assertEquals(author.getID(), relationships.get(0).getRightItem().getID());
+        assertEquals(item.getID(), relationships.get(0).getLeftItem().getID());
+    }
+
+    private void perfomImportScript(String[] args)
+            throws Exception {
+        runDSpaceScript(args);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/matcher/LambdaMatcher.java b/dspace-api/src/test/java/org/dspace/app/matcher/LambdaMatcher.java
new file mode 100644
index 0000000000..f5c00c340d
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/matcher/LambdaMatcher.java
@@ -0,0 +1,55 @@
+/**
+ * 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/
+ */
+package org.dspace.app.matcher;
+
+import java.util.function.Predicate;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+
+/**
+ * Matcher based on an {@link Predicate}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ * @param  <T> the type of the instance to match
+ */
+public class LambdaMatcher<T> extends BaseMatcher<T> {
+
+    private final Predicate<T> matcher;
+    private final String description;
+
+    public static <T> LambdaMatcher<T> matches(Predicate<T> matcher) {
+        return new LambdaMatcher<T>(matcher, "Matches the given predicate");
+    }
+
+    public static <T> LambdaMatcher<T> matches(Predicate<T> matcher, String description) {
+        return new LambdaMatcher<T>(matcher, description);
+    }
+
+    public static <T> Matcher<java.lang.Iterable<? super T>> has(Predicate<T> matcher) {
+        return Matchers.hasItem(matches(matcher));
+    }
+
+    private LambdaMatcher(Predicate<T> matcher, String description) {
+        this.matcher = matcher;
+        this.description = description;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public boolean matches(Object argument) {
+        return matcher.test((T) argument);
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText(this.description);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/matcher/OrcidQueueMatcher.java b/dspace-api/src/test/java/org/dspace/app/matcher/OrcidQueueMatcher.java
new file mode 100644
index 0000000000..9f83301515
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/matcher/OrcidQueueMatcher.java
@@ -0,0 +1,136 @@
+/**
+ * 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/
+ */
+package org.dspace.app.matcher;
+
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.content.Item;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+/**
+ * Implementation of {@link org.hamcrest.Matcher} to match a OrcidQueue by all
+ * its attributes.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidQueueMatcher extends TypeSafeMatcher<OrcidQueue> {
+
+    private final Matcher<Item> profileItemMatcher;
+
+    private final Matcher<Item> entityMatcher;
+
+    private final Matcher<String> recordTypeMatcher;
+
+    private final Matcher<String> putCodeMatcher;
+
+    private final Matcher<String> descriptionMatcher;
+
+    private final Matcher<String> metadataMatcher;
+
+    private final Matcher<OrcidOperation> operationMatcher;
+
+    private final Matcher<Integer> attemptsMatcher;
+
+    private OrcidQueueMatcher(Matcher<Item> profileItemMatcher, Matcher<Item> entityMatcher,
+        Matcher<String> recordTypeMatcher, Matcher<String> putCodeMatcher, Matcher<String> metadataMatcher,
+        Matcher<String> descriptionMatcher, Matcher<OrcidOperation> operationMatcher,
+        Matcher<Integer> attemptsMatcher) {
+        this.profileItemMatcher = profileItemMatcher;
+        this.entityMatcher = entityMatcher;
+        this.recordTypeMatcher = recordTypeMatcher;
+        this.putCodeMatcher = putCodeMatcher;
+        this.metadataMatcher = metadataMatcher;
+        this.descriptionMatcher = descriptionMatcher;
+        this.operationMatcher = operationMatcher;
+        this.attemptsMatcher = attemptsMatcher;
+    }
+
+    public static OrcidQueueMatcher matches(Item profileItem, Item entity, String recordType,
+        OrcidOperation operation) {
+        return new OrcidQueueMatcher(is(profileItem), is(entity), is(recordType), anything(),
+            anything(), anything(), is(operation), anything());
+    }
+
+    public static OrcidQueueMatcher matches(Item profileItem, Item entity, String recordType,
+        OrcidOperation operation, int attempts) {
+        return new OrcidQueueMatcher(is(profileItem), is(entity), is(recordType), anything(),
+            anything(), anything(), is(operation), is(attempts));
+    }
+
+    public static OrcidQueueMatcher matches(Item profileItem, Item entity, String recordType,
+        String putCode, OrcidOperation operation) {
+        return new OrcidQueueMatcher(is(profileItem), is(entity), is(recordType), is(putCode),
+            anything(), anything(), is(operation), anything());
+    }
+
+    public static OrcidQueueMatcher matches(Item profileItem, Item entity, String recordType,
+        String putCode, String metadata, String description, OrcidOperation operation) {
+        return new OrcidQueueMatcher(is(profileItem), is(entity), is(recordType),
+            is(putCode), is(metadata), is(description), is(operation), anything());
+    }
+
+    public static OrcidQueueMatcher matches(Item item, String recordType,
+        String putCode, String metadata, String description, OrcidOperation operation) {
+        return new OrcidQueueMatcher(is(item), is(item), is(recordType),
+            is(putCode), is(metadata), is(description), is(operation), anything());
+    }
+
+    public static OrcidQueueMatcher matches(Item profileItem, Item entity, String recordType,
+        String putCode, Matcher<String> metadata, String description, OrcidOperation operation) {
+        return new OrcidQueueMatcher(is(profileItem), is(entity), is(recordType),
+            is(putCode), metadata, is(description), is(operation), anything());
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("an orcid queue record that with the following attributes:")
+            .appendText(" item profileItem ").appendDescriptionOf(profileItemMatcher)
+            .appendText(", item entity ").appendDescriptionOf(entityMatcher)
+            .appendText(", record type ").appendDescriptionOf(recordTypeMatcher)
+            .appendText(", metadata ").appendDescriptionOf(metadataMatcher)
+            .appendText(", description ").appendDescriptionOf(descriptionMatcher)
+            .appendText(", operation ").appendDescriptionOf(operationMatcher)
+            .appendText(", attempts ").appendDescriptionOf(attemptsMatcher)
+            .appendText(" and put code ").appendDescriptionOf(putCodeMatcher);
+    }
+
+    @Override
+    protected boolean matchesSafely(OrcidQueue item) {
+        return profileItemMatcher.matches(item.getProfileItem())
+            && entityMatcher.matches(item.getEntity())
+            && recordTypeMatcher.matches(item.getRecordType())
+            && metadataMatcher.matches(item.getMetadata())
+            && putCodeMatcher.matches(item.getPutCode())
+            && descriptionMatcher.matches(item.getDescription())
+            && operationMatcher.matches(item.getOperation())
+            && attemptsMatcher.matches(item.getAttempts());
+    }
+
+    private static <T> Matcher<T> anything() {
+        return new BaseMatcher<T>() {
+
+            @Override
+            public boolean matches(Object item) {
+                return true;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+
+            }
+        };
+
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/mediafilter/PoiWordFilterTest.java b/dspace-api/src/test/java/org/dspace/app/mediafilter/PoiWordFilterTest.java
deleted file mode 100644
index 4d2353a29a..0000000000
--- a/dspace-api/src/test/java/org/dspace/app/mediafilter/PoiWordFilterTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.app.mediafilter;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.dspace.content.Item;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Drive the POI-based MS Word filter.
- *
- * @author mwood
- */
-public class PoiWordFilterTest {
-
-    public PoiWordFilterTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-    /**
-     * Test of getFilteredName method, of class PoiWordFilter.
-     */
-/*
-    @Test
-    public void testGetFilteredName()
-    {
-        System.out.println("getFilteredName");
-        String oldFilename = "";
-        PoiWordFilter instance = new PoiWordFilter();
-        String expResult = "";
-        String result = instance.getFilteredName(oldFilename);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
-    }
-*/
-
-    /**
-     * Test of getBundleName method, of class PoiWordFilter.
-     */
-/*
-    @Test
-    public void testGetBundleName()
-    {
-        System.out.println("getBundleName");
-        PoiWordFilter instance = new PoiWordFilter();
-        String expResult = "";
-        String result = instance.getBundleName();
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
-    }
-*/
-
-    /**
-     * Test of getFormatString method, of class PoiWordFilter.
-     */
-/*
-    @Test
-    public void testGetFormatString()
-    {
-        System.out.println("getFormatString");
-        PoiWordFilter instance = new PoiWordFilter();
-        String expResult = "";
-        String result = instance.getFormatString();
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
-    }
-*/
-
-    /**
-     * Test of getDescription method, of class PoiWordFilter.
-     */
-/*
-    @Test
-    public void testGetDescription()
-    {
-        System.out.println("getDescription");
-        PoiWordFilter instance = new PoiWordFilter();
-        String expResult = "";
-        String result = instance.getDescription();
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
-    }
-*/
-
-    /**
-     * Test of getDestinationStream method, of class PoiWordFilter.
-     * Read a constant .doc document and examine the extracted text.
-     *
-     * @throws java.lang.Exception passed through.
-     */
-    @Test
-    public void testGetDestinationStreamDoc()
-        throws Exception {
-        System.out.println("getDestinationStream");
-        Item currentItem = null;
-        InputStream source;
-        boolean verbose = false;
-        PoiWordFilter instance = new PoiWordFilter();
-        InputStream result;
-
-        source = getClass().getResourceAsStream("wordtest.doc");
-        result = instance.getDestinationStream(currentItem, source, verbose);
-        assertTrue("Known content was not found", readAll(result).contains("quick brown fox"));
-    }
-
-    /**
-     * Test of getDestinationStream method, of class PoiWordFilter.
-     * Read a constant .docx document and examine the extracted text.
-     *
-     * @throws java.lang.Exception passed through.
-     */
-    @Test
-    public void testGetDestinationStreamDocx()
-        throws Exception {
-        System.out.println("getDestinationStream");
-        Item currentItem = null;
-        InputStream source;
-        boolean verbose = false;
-        PoiWordFilter instance = new PoiWordFilter();
-        InputStream result;
-
-        source = getClass().getResourceAsStream("wordtest.docx");
-        result = instance.getDestinationStream(currentItem, source, verbose);
-        assertTrue("Known content was not found", readAll(result).contains("quick brown fox"));
-    }
-
-    /**
-     * Read the entire content of a stream into a String.
-     *
-     * @param stream a stream of UTF-8 characters.
-     * @return complete content of {@link stream}
-     * @throws IOException
-     */
-    private static String readAll(InputStream stream)
-        throws IOException {
-        if (null == stream) {
-            return null;
-        }
-
-        byte[] bytes = new byte[stream.available()];
-        StringBuilder resultSb = new StringBuilder(bytes.length / 2); // Guess:  average 2 bytes per character
-        int howmany;
-        while ((howmany = stream.read(bytes)) > 0) {
-            resultSb.append(new String(bytes, 0, howmany, StandardCharsets.UTF_8));
-        }
-        return resultSb.toString();
-    }
-}
diff --git a/dspace-api/src/test/java/org/dspace/app/mediafilter/TikaTextExtractionFilterTest.java b/dspace-api/src/test/java/org/dspace/app/mediafilter/TikaTextExtractionFilterTest.java
new file mode 100644
index 0000000000..9db1ef7776
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/mediafilter/TikaTextExtractionFilterTest.java
@@ -0,0 +1,323 @@
+/**
+ * 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/
+ */
+package org.dspace.app.mediafilter;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.dspace.AbstractUnitTest;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.Test;
+
+/**
+ * Test the TikaTextExtractionFilter using test files for all major formats.
+ * The test files used below are all located at [dspace-api]/src/test/resources/org/dspace/app/mediafilter/
+ *
+ * @author mwood
+ * @author Tim Donohue
+ */
+public class TikaTextExtractionFilterTest extends AbstractUnitTest {
+
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    /**
+     * Test of getDestinationStream method using temp file for text extraction
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithUseTempFile()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        // Extract text from file with "use-temp-file=true"
+        configurationService.setProperty("textextractor.use-temp-file", "true");
+        InputStream source = getClass().getResourceAsStream("test.pdf");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        String tempFileExtractedText = readAll(result);
+
+        // Verify text extracted successfully
+        assertTrue("Known content was not found in .pdf", tempFileExtractedText.contains("quick brown fox"));
+
+        // Now, extract text from same file using default, in-memory
+        configurationService.setProperty("textextractor.use-temp-file", "false");
+        source = getClass().getResourceAsStream("test.pdf");
+        result = instance.getDestinationStream(null, source, false);
+        String inMemoryExtractedText = readAll(result);
+
+        // Verify the two results are equal
+        assertEquals("Extracted text via temp file is the same as in-memory.",
+                     inMemoryExtractedText, tempFileExtractedText);
+    }
+
+    /**
+     * Test of getDestinationStream method when max characters is less than file size
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithMaxChars()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        // Set "max-chars" to a small value of 100 chars, which is less than the text size of the file.
+        configurationService.setProperty("textextractor.max-chars", "100");
+        InputStream source = getClass().getResourceAsStream("test.pdf");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        String extractedText = readAll(result);
+
+        // Verify we have exactly the first 100 characters
+        assertEquals(100, extractedText.length());
+        // Verify it has some text at the beginning of the file, but NOT text near the end
+        assertTrue("Known beginning content was found", extractedText.contains("This is a text."));
+        assertFalse("Known ending content was not found", extractedText.contains("Emergency Broadcast System"));
+    }
+
+    /**
+     * Test of getDestinationStream method using older Microsoft Word document.
+     * Read a constant .doc document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithDoc()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.doc");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .doc", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using newer Microsoft Word document.
+     * Read a constant .docx document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithDocx()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.docx");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .docx", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an ODT document
+     * Read a constant .odt document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithODT()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.odt");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .odt", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an RTF document
+     * Read a constant .rtf document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithRTF()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.rtf");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .rtf", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using a PDF document
+     * Read a constant .pdf document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithPDF()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.pdf");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .pdf", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an HTML document
+     * Read a constant .html document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithHTML()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.html");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .html", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using a TXT document
+     * Read a constant .txt document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithTxt()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.txt");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .txt", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using a CSV document
+     * Read a constant .csv document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithCsv()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.csv");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .csv", readAll(result).contains("data3,3"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an XLS document
+     * Read a constant .xls document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithXLS()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.xls");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .xls", readAll(result).contains("data3,3"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an XLSX document
+     * Read a constant .xlsx document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithXLSX()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.xlsx");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .xlsx", readAll(result).contains("data3,3"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an ODS document
+     * Read a constant .ods document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithODS()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.ods");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .ods", readAll(result).contains("Data on the second sheet"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an PPT document
+     * Read a constant .ppt document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithPPT()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.ppt");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .ppt", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an PPTX document
+     * Read a constant .pptx document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithPPTX()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.pptx");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .pptx", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Test of getDestinationStream method using an ODP document
+     * Read a constant .odp document and examine the extracted text.
+     *
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetDestinationStreamWithODP()
+        throws Exception {
+        TikaTextExtractionFilter instance = new TikaTextExtractionFilter();
+
+        InputStream source = getClass().getResourceAsStream("test.odp");
+        InputStream result = instance.getDestinationStream(null, source, false);
+        assertTrue("Known content was not found in .odp", readAll(result).contains("quick brown fox"));
+    }
+
+    /**
+     * Read the entire content of a stream into a String.
+     *
+     * @param stream a stream of UTF-8 characters.
+     * @return complete content of stream as a String
+     * @throws IOException
+     */
+    private static String readAll(InputStream stream)
+        throws IOException {
+        return IOUtils.toString(stream, StandardCharsets.UTF_8);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/packager/PackagerIT.java b/dspace-api/src/test/java/org/dspace/app/packager/PackagerIT.java
index c814d2d9f6..7d808ab871 100644
--- a/dspace-api/src/test/java/org/dspace/app/packager/PackagerIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/packager/PackagerIT.java
@@ -38,7 +38,7 @@ import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Element;
+import org.jdom2.Element;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/dspace-api/src/test/java/org/dspace/app/requestitem/CollectionAdministratorsRequestItemStrategyTest.java b/dspace-api/src/test/java/org/dspace/app/requestitem/CollectionAdministratorsRequestItemStrategyTest.java
new file mode 100644
index 0000000000..37292e91c8
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/requestitem/CollectionAdministratorsRequestItemStrategyTest.java
@@ -0,0 +1,62 @@
+/**
+ * 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/
+ */
+package org.dspace.app.requestitem;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+/**
+ *
+ * @author Mark H. Wood <mwood@iupui.edu>
+ */
+public class CollectionAdministratorsRequestItemStrategyTest {
+    private static final String NAME = "John Q. Public";
+    private static final String EMAIL = "jqpublic@example.com";
+
+    /**
+     * Test of getRequestItemAuthor method, of class CollectionAdministratorsRequestItemStrategy.
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetRequestItemAuthor()
+            throws Exception {
+        System.out.println("getRequestItemAuthor");
+
+        Context context = Mockito.mock(Context.class);
+
+        EPerson eperson1 = Mockito.mock(EPerson.class);
+        Mockito.when(eperson1.getEmail()).thenReturn(EMAIL);
+        Mockito.when(eperson1.getFullName()).thenReturn(NAME);
+
+        Group group1 = Mockito.mock(Group.class);
+        Mockito.when(group1.getMembers()).thenReturn(List.of(eperson1));
+
+        Collection collection1 = Mockito.mock(Collection.class);
+        Mockito.when(collection1.getAdministrators()).thenReturn(group1);
+
+        Item item = Mockito.mock(Item.class);
+        Mockito.when(item.getOwningCollection()).thenReturn(collection1);
+        Mockito.when(item.getSubmitter()).thenReturn(eperson1);
+
+        CollectionAdministratorsRequestItemStrategy instance = new CollectionAdministratorsRequestItemStrategy();
+        List<RequestItemAuthor> result = instance.getRequestItemAuthor(context,
+                item);
+        assertEquals("Should be one author", 1, result.size());
+        assertEquals("Name should match " + NAME, NAME, result.get(0).getFullName());
+        assertEquals("Email should match " + EMAIL, EMAIL, result.get(0).getEmail());
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/requestitem/CombiningRequestItemStrategyTest.java b/dspace-api/src/test/java/org/dspace/app/requestitem/CombiningRequestItemStrategyTest.java
new file mode 100644
index 0000000000..c5475612cb
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/requestitem/CombiningRequestItemStrategyTest.java
@@ -0,0 +1,53 @@
+/**
+ * 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/
+ */
+package org.dspace.app.requestitem;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
+
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+/**
+ *
+ * @author Mark H. Wood <mwood@iupui.edu>
+ */
+public class CombiningRequestItemStrategyTest {
+    /**
+     * Test of getRequestItemAuthor method, of class CombiningRequestItemStrategy.
+     * @throws java.lang.Exception passed through.
+     */
+    @Test
+    public void testGetRequestItemAuthor()
+            throws Exception {
+        System.out.println("getRequestItemAuthor");
+        Context context = null;
+
+        Item item = Mockito.mock(Item.class);
+        RequestItemAuthor author1 = new RequestItemAuthor("Pat Paulsen", "ppaulsen@example.com");
+        RequestItemAuthor author2 = new RequestItemAuthor("Alfred E. Neuman", "aeneuman@example.com");
+        RequestItemAuthor author3 = new RequestItemAuthor("Alias Undercover", "aundercover@example.com");
+
+        RequestItemAuthorExtractor strategy1 = Mockito.mock(RequestItemHelpdeskStrategy.class);
+        Mockito.when(strategy1.getRequestItemAuthor(context, item)).thenReturn(List.of(author1));
+
+        RequestItemAuthorExtractor strategy2 = Mockito.mock(RequestItemMetadataStrategy.class);
+        Mockito.when(strategy2.getRequestItemAuthor(context, item)).thenReturn(List.of(author2, author3));
+
+        List<RequestItemAuthorExtractor> strategies = List.of(strategy1, strategy2);
+
+        CombiningRequestItemStrategy instance = new CombiningRequestItemStrategy(strategies);
+        List<RequestItemAuthor> result = instance.getRequestItemAuthor(context,
+                item);
+        assertThat(result, containsInAnyOrder(author1, author2, author3));
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/sherpa/MockSHERPAService.java b/dspace-api/src/test/java/org/dspace/app/sherpa/MockSHERPAService.java
index b218ba82fe..239d2864bf 100644
--- a/dspace-api/src/test/java/org/dspace/app/sherpa/MockSHERPAService.java
+++ b/dspace-api/src/test/java/org/dspace/app/sherpa/MockSHERPAService.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Objects;
 
 import org.dspace.app.sherpa.v2.SHERPAPublisherResponse;
 import org.dspace.app.sherpa.v2.SHERPAResponse;
@@ -25,20 +26,6 @@ import org.dspace.app.sherpa.v2.SHERPAResponse;
  */
 public class MockSHERPAService extends SHERPAService {
 
-    /**
-     * Simple overridden 'searchByJournalISSN' so that we do attempt to build the URI but rather than make
-     * an actual HTTP call, return parsed SHERPAResponse for The Lancet based on known-good JSON stored with our
-     * test resources.
-     * If URI creation, parsing, or IO fails along the way, a SHERPAResponse with an error message set will be
-     * returned.
-     * @param query ISSN string to pass in an "issn equals" API query
-     * @return  SHERPAResponse
-     */
-    @Override
-    public SHERPAResponse searchByJournalISSN(String query) {
-        return performRequest("publication", "issn", "equals", query, 0, 1);
-    }
-
     /**
      * Simple overridden performRequest so that we do attempt to build the URI but rather than make
      * an actual HTTP call, return parsed SHERPAResponse for The Lancet based on known-good JSON stored with our
@@ -67,8 +54,12 @@ public class MockSHERPAService extends SHERPAService {
                     return new SHERPAResponse("Error building URI");
                 }
 
-                // Get mock JSON - in this case, a known good result for The Lancet
-                content = getClass().getResourceAsStream("thelancet.json");
+                // Get mock JSON
+                // if a file with the name contained in the value does not exist, returns thelancet.json
+                content = getContent(value.concat(".json"));
+                if (Objects.isNull(content)) {
+                    content = getContent("thelancet.json");
+                }
 
                 // Parse JSON input stream and return response for later evaluation
                 return new SHERPAResponse(content, SHERPAResponse.SHERPAFormat.JSON);
@@ -88,6 +79,10 @@ public class MockSHERPAService extends SHERPAService {
         }
     }
 
+    private InputStream getContent(String fileName) {
+        return getClass().getResourceAsStream(fileName);
+    }
+
     /**
      * Simple overridden performPublisherRequest so that we do attempt to build the URI but rather than make
      * an actual HTTP call, return parsed SHERPAPublisherResponse for PLOS based on known-good JSON stored with our
@@ -133,4 +128,5 @@ public class MockSHERPAService extends SHERPAService {
             return new SHERPAPublisherResponse(e.getMessage());
         }
     }
+
 }
diff --git a/dspace-api/src/test/java/org/dspace/app/sherpa/submit/SHERPASubmitServiceTest.java b/dspace-api/src/test/java/org/dspace/app/sherpa/submit/SHERPASubmitServiceTest.java
index 1eaa916f56..438d754aa5 100644
--- a/dspace-api/src/test/java/org/dspace/app/sherpa/submit/SHERPASubmitServiceTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/sherpa/submit/SHERPASubmitServiceTest.java
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.SQLException;
-import java.util.List;
 
 import org.dspace.AbstractUnitTest;
 import org.dspace.app.sherpa.v2.SHERPAResponse;
@@ -109,20 +108,18 @@ public class SHERPASubmitServiceTest extends AbstractUnitTest {
 
         // Get responses from SHERPA submit service, which should inspect item ISSNs and perform search
         // on the mock SHERPA service
-        List<SHERPAResponse> responses = sherpaSubmitService.searchRelatedJournals(context, testItem);
+        SHERPAResponse response = sherpaSubmitService.searchRelatedJournals(context, testItem);
 
         // Make sure response is not null or empty
-        assertTrue("Response list should not be null or empty",
-            responses != null && !responses.isEmpty());
+        assertTrue("Response should not be null", response != null);
 
         // For each response (there should be only one based on test data) perform the standard set
         // of thorough parsing tests
-        for (SHERPAResponse response : responses) {
-            // Assert response is not error, or fail with message
-            assertFalse("Response was flagged as 'isError'", response.isError());
 
-            // Skip remainder of parsing tests - these are already done in SHERPAServiceTEst
-        }
+        // Assert response is not error, or fail with message
+        assertFalse("Response was flagged as 'isError'", response.isError());
+
+        // Skip remainder of parsing tests - these are already done in SHERPAServiceTEst
     }
 
 }
diff --git a/dspace-api/src/test/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncIT.java b/dspace-api/src/test/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncIT.java
new file mode 100644
index 0000000000..4fa881257e
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/solrdatabaseresync/SolrDatabaseResyncIT.java
@@ -0,0 +1,154 @@
+/**
+ * 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/
+ */
+package org.dspace.app.solrdatabaseresync;
+
+import static org.dspace.discovery.indexobject.ItemIndexFactoryImpl.STATUS_FIELD;
+import static org.dspace.discovery.indexobject.ItemIndexFactoryImpl.STATUS_FIELD_PREDB;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocumentList;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.app.launcher.ScriptLauncher;
+import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.CollectionService;
+import org.dspace.discovery.MockSolrSearchCore;
+import org.dspace.kernel.ServiceManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SolrDatabaseResyncIT extends AbstractIntegrationTestWithDatabase {
+
+    private final ConfigurationService configurationService =
+            DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    private final CollectionService collectionService =
+            ContentServiceFactory.getInstance().getCollectionService();
+
+    private MockSolrSearchCore searchService;
+
+    private Collection col;
+    private Item item1;
+    private Item item2;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        configurationService.setProperty("solr-database-resync.time-until-reindex", 1);
+
+        ServiceManager serviceManager = DSpaceServicesFactory.getInstance().getServiceManager();
+        searchService = serviceManager.getServiceByName(null, MockSolrSearchCore.class);
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        col = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection").build();
+
+        item1 = ItemBuilder.createItem(context, col)
+                .withTitle("Public item 1")
+                .withIssueDate("2010-10-17")
+                .withAuthor("Smith, Donald")
+                .withSubject("ExtraEntry")
+                .build();
+        item2 = ItemBuilder.createItem(context, col)
+                .withTitle("Public item 2")
+                .withIssueDate("2011-08-13")
+                .withAuthor("Smith, Maria")
+                .withSubject("TestingForMore")
+                .build();
+
+        context.setDispatcher("noindex");
+    }
+
+    @Test
+    public void solrPreDBStatusExistingItemTest() throws Exception {
+        // Items were created, they should contain a predb status in solr
+        assertHasPreDBStatus(item1);
+        assertHasPreDBStatus(item2);
+
+        performSolrDatabaseResyncScript();
+
+        // Database status script was performed, their predb status should be removed
+        assertHasNoPreDBStatus(item1);
+        assertHasNoPreDBStatus(item2);
+
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void solrPreDBStatusRemovedItemTest() throws Exception {
+        // Items were created, they should contain a predb status in solr
+        assertHasPreDBStatus(item1);
+        assertHasPreDBStatus(item2);
+
+        collectionService.delete(context, col);
+
+        // Items were deleted, they should still contain a predb status in solr for now
+        assertHasPreDBStatus(item1);
+        assertHasPreDBStatus(item2);
+
+        performSolrDatabaseResyncScript();
+
+        // Database status script was performed, their solr document should have been removed
+        assertNoSolrDocument(item1);
+        assertNoSolrDocument(item2);
+
+        context.restoreAuthSystemState();
+    }
+
+    public void assertHasNoPreDBStatus(Item item) throws Exception {
+        assertNotEquals(STATUS_FIELD_PREDB, getStatus(item));
+    }
+
+    public void assertHasPreDBStatus(Item item) throws Exception {
+        assertEquals(STATUS_FIELD_PREDB, getStatus(item));
+    }
+
+    public void assertNoSolrDocument(Item item) throws Exception {
+        SolrDocumentList solrDocumentList = getSolrDocumentList(item);
+        assertEquals(0, solrDocumentList.size());
+    }
+
+    public String getStatus(Item item) throws Exception {
+        SolrDocumentList solrDocumentList = getSolrDocumentList(item);
+        List fieldValues = ((List) solrDocumentList.get(0).getFieldValues(STATUS_FIELD));
+        if (CollectionUtils.isNotEmpty(fieldValues)) {
+            return (String) fieldValues.get(0);
+        } else {
+            return null;
+        }
+    }
+
+    public SolrDocumentList getSolrDocumentList(Item item) throws Exception {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setQuery("search.resourceid:" + item.getID());
+        QueryResponse queryResponse = searchService.getSolr().query(solrQuery);
+        return queryResponse.getResults();
+    }
+
+    public void performSolrDatabaseResyncScript() throws Exception {
+        String[] args = new String[] {"solr-database-resync"};
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+        ScriptLauncher
+                .handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/util/ConfigurationIT.java b/dspace-api/src/test/java/org/dspace/app/util/ConfigurationIT.java
new file mode 100644
index 0000000000..388b467e97
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/util/ConfigurationIT.java
@@ -0,0 +1,268 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.util;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.arrayWithSize;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.collection.IsArrayContainingInAnyOrder.arrayContainingInAnyOrder;
+import static org.junit.Assert.assertEquals;
+
+import org.dspace.AbstractDSpaceTest;
+import org.dspace.services.ConfigurationService;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.Assertion;
+import org.junit.contrib.java.lang.system.ExpectedSystemExit;
+import org.junit.contrib.java.lang.system.SystemErrRule;
+import org.junit.contrib.java.lang.system.SystemOutRule;
+
+/**
+ * Tests for configuration utilities.
+ *
+ * Because our command-line tools call System.exit(), we can't expect any code
+ * (such as assertions) following the call to main() to be executed.  Instead we
+ * set up expectations in advance and attach them to an exit() trapper.
+ *
+ * @author mhwood
+ */
+public class ConfigurationIT
+        extends AbstractDSpaceTest {
+
+    private static ConfigurationService cfg;
+
+    private static final String SINGLE_PROPERTY = "test.single";
+    private static final String SINGLE_VALUE = "value";
+
+    private static final String ARRAY_PROPERTY = "test.array";
+    private static final String[] ARRAY_VALUE = { "one", "two" };
+
+    private static final String PLACEHOLDER_PROPERTY = "test.substituted";
+    private static final String PLACEHOLDER_VALUE = "insert ${test.single} here"; // Keep aligned with SINGLE_NAME
+    private static final String SUBSTITUTED_VALUE = "insert value here"; // Keep aligned with SINGLE_VALUE
+
+    private static final String MISSING_PROPERTY = "test.missing";
+
+    /** Capture standard output. */
+    @Rule
+    public final SystemOutRule systemOutRule = new SystemOutRule();
+
+    /** Capture standard error. */
+    @Rule
+    public final SystemErrRule systemErrRule = new SystemErrRule();
+
+    /** Capture System.exit() value. */
+    @Rule
+    public final ExpectedSystemExit expectedSystemExit = ExpectedSystemExit.none();
+
+    /**
+     * Create some expected properties before all tests.
+     */
+    @BeforeClass
+    public static void setupSuite() {
+        cfg = kernelImpl.getConfigurationService();
+
+        cfg.setProperty(SINGLE_PROPERTY, SINGLE_VALUE);
+        cfg.setProperty(ARRAY_PROPERTY, ARRAY_VALUE);
+        cfg.setProperty(PLACEHOLDER_PROPERTY, PLACEHOLDER_VALUE);
+        cfg.setProperty(MISSING_PROPERTY, null); // Ensure that this one is undefined
+    }
+
+    /**
+     * After all tests, remove the properties that were created at entry.
+     */
+    @AfterClass
+    public static void teardownSuite() {
+        if (null != cfg) {
+            cfg.setProperty(SINGLE_PROPERTY, null);
+            cfg.setProperty(ARRAY_PROPERTY, null);
+            cfg.setProperty(PLACEHOLDER_PROPERTY, null);
+        }
+    }
+
+    /**
+     * Test fetching all values of a single-valued property.
+     */
+    @Test
+    public void testMainAllSingle() {
+        String[] argv;
+        argv = new String[] {
+            "--property", SINGLE_PROPERTY
+        };
+        expectedSystemExit.expectSystemExitWithStatus(0);
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String[] output = systemOutRule.getLogWithNormalizedLineSeparator()
+                        .split("\n");
+                assertThat(output, arrayWithSize(1));
+            }
+        });
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String[] output = systemOutRule.getLogWithNormalizedLineSeparator()
+                        .split("\n");
+                assertThat(output[0], equalTo(SINGLE_VALUE));
+            }
+        });
+        systemOutRule.enableLog();
+        Configuration.main(argv);
+    }
+
+    /**
+     * Test fetching all values of an array property.
+     */
+    @Test
+    public void testMainAllArray() {
+        String[] argv;
+        argv = new String[] {
+            "--property", ARRAY_PROPERTY
+        };
+        expectedSystemExit.expectSystemExitWithStatus(0);
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String[] output = systemOutRule.getLogWithNormalizedLineSeparator()
+                        .split("\n");
+                assertThat(output, arrayWithSize(ARRAY_VALUE.length));
+            }
+        });
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String[] output = systemOutRule.getLogWithNormalizedLineSeparator()
+                        .split("\n");
+                assertThat(output, arrayContainingInAnyOrder(ARRAY_VALUE));
+            }
+        });
+        systemOutRule.enableLog();
+        Configuration.main(argv);
+    }
+
+    /**
+     * Test fetching all values of a single-valued property containing property
+     * placeholders.
+     */
+    @Test
+    public void testMainAllSubstitution() {
+        String[] argv;
+        argv = new String[] {
+            "--property", PLACEHOLDER_PROPERTY
+        };
+        expectedSystemExit.expectSystemExitWithStatus(0);
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String[] output = systemOutRule.getLogWithNormalizedLineSeparator()
+                        .split("\n");
+                assertThat(output, arrayWithSize(1));
+            }
+        });
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String[] output = systemOutRule.getLogWithNormalizedLineSeparator()
+                        .split("\n");
+                assertThat(output[0], equalTo(SUBSTITUTED_VALUE));
+            }
+        });
+        systemOutRule.enableLog();
+        Configuration.main(argv);
+    }
+
+    /**
+     * Test fetching all values of a single-valued property containing property
+     * placeholders, suppressing property substitution.
+     */
+    @Test
+    public void testMainAllRaw() {
+        // Can it handle a raw property (with substitution placeholders)?
+        String[] argv;
+        argv = new String[] {
+            "--property", PLACEHOLDER_PROPERTY,
+            "--raw"
+        };
+        expectedSystemExit.expectSystemExitWithStatus(0);
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String[] output = systemOutRule.getLogWithNormalizedLineSeparator()
+                        .split("\n");
+                assertThat(output, arrayWithSize(1));
+            }
+        });
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String[] output = systemOutRule.getLogWithNormalizedLineSeparator()
+                        .split("\n");
+                assertThat(output[0], equalTo(PLACEHOLDER_VALUE));
+            }
+        });
+        systemOutRule.enableLog();
+        Configuration.main(argv);
+    }
+
+    /**
+     * Test fetching all values of an undefined property.
+     */
+    @Test
+    public void testMainAllUndefined() {
+        // Can it handle an undefined property?
+        String[] argv;
+        argv = new String[] {
+            "--property", MISSING_PROPERTY
+        };
+        expectedSystemExit.expectSystemExitWithStatus(0);
+        expectedSystemExit.checkAssertionAfterwards(new Assertion() {
+            @Override public void checkAssertion() {
+                String outputs = systemOutRule.getLogWithNormalizedLineSeparator();
+                String[] output = outputs.split("\n");
+                assertThat(output, arrayWithSize(0)); // Huh?  Shouldn't split() return { "" } ?
+            }
+        });
+        systemOutRule.enableLog();
+        Configuration.main(argv);
+    }
+
+    /**
+     * Test fetching only the first value of an array property.
+     */
+    @Test
+    public void testMainFirstArray() {
+        String[] argv = new String[] {
+            "--property", ARRAY_PROPERTY,
+            "--first"
+        };
+        expectedSystemExit.expectSystemExitWithStatus(0);
+        expectedSystemExit.checkAssertionAfterwards(() -> {
+            String outputs = systemOutRule.getLogWithNormalizedLineSeparator();
+            String[] output = outputs.split("\n");
+            assertThat(output, arrayWithSize(1));
+            assertEquals("--first should return first value", output[0], ARRAY_VALUE[0]);
+        });
+        systemOutRule.enableLog();
+        Configuration.main(argv);
+    }
+
+    /**
+     * Test fetching a single-valued property using {@code --first}
+     */
+    @Test
+    public void testMainFirstSingle() {
+        String[] argv = new String[] {
+            "--property", SINGLE_PROPERTY,
+            "--first"
+        };
+        expectedSystemExit.expectSystemExitWithStatus(0);
+        expectedSystemExit.checkAssertionAfterwards(() -> {
+            String outputs = systemOutRule.getLogWithNormalizedLineSeparator();
+            String[] output = outputs.split("\n");
+            assertThat(output, arrayWithSize(1));
+            assertEquals("--first should return only value", output[0], SINGLE_VALUE);
+        });
+        systemOutRule.enableLog();
+        Configuration.main(argv);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/util/GoogleBitstreamComparatorTest.java b/dspace-api/src/test/java/org/dspace/app/util/GoogleBitstreamComparatorTest.java
index 84e776b983..78142c9258 100644
--- a/dspace-api/src/test/java/org/dspace/app/util/GoogleBitstreamComparatorTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/util/GoogleBitstreamComparatorTest.java
@@ -164,6 +164,12 @@ public class GoogleBitstreamComparatorTest extends AbstractUnitTest {
                      toSort.get(1).getName());
         assertEquals("Bitstreams have same size and type, so order should remain unchanged", "bitstream3",
                      toSort.get(2).getName());
+
+        // Also, verify all bitstreams are considered equal (comparison returns 0)
+        GoogleBitstreamComparator comparator = new GoogleBitstreamComparator(context, settings);
+        assertEquals(0, comparator.compare(bitstream1, bitstream2));
+        assertEquals(0, comparator.compare(bitstream2, bitstream3));
+        assertEquals(0, comparator.compare(bitstream3, bitstream1));
     }
 
     /**
diff --git a/dspace-api/src/test/java/org/dspace/app/util/GoogleMetadataTest.java b/dspace-api/src/test/java/org/dspace/app/util/GoogleMetadataTest.java
index e2b49ab76a..ee6723480e 100644
--- a/dspace-api/src/test/java/org/dspace/app/util/GoogleMetadataTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/util/GoogleMetadataTest.java
@@ -8,18 +8,25 @@
 package org.dspace.app.util;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import com.google.common.base.Splitter;
 import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractUnitTest;
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.authorize.factory.AuthorizeServiceFactory;
+import org.dspace.authorize.service.ResourcePolicyService;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Collection;
@@ -30,6 +37,14 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
+import org.dspace.core.Constants;
+import org.dspace.eperson.Group;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.eperson.service.GroupService;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.MutablePeriod;
+import org.joda.time.format.PeriodFormat;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -52,6 +67,10 @@ public class GoogleMetadataTest extends AbstractUnitTest {
 
     private BitstreamService bitstreamService;
 
+    private ResourcePolicyService resourcePolicyService;
+
+    private GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+
     private Community community;
 
     /**
@@ -80,6 +99,8 @@ public class GoogleMetadataTest extends AbstractUnitTest {
             bundleService = ContentServiceFactory.getInstance().getBundleService();
             bitstreamFormatService = ContentServiceFactory.getInstance().getBitstreamFormatService();
             bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
+            resourcePolicyService = AuthorizeServiceFactory.getInstance().getResourcePolicyService();
+            groupService = EPersonServiceFactory.getInstance().getGroupService();
         } catch (AuthorizeException ex) {
             log.error("Authorization Error in init", ex);
             fail("Authorization Error in init: " + ex.getMessage());
@@ -326,6 +347,45 @@ public class GoogleMetadataTest extends AbstractUnitTest {
         assertEquals("small", urlSplitted.get(urlSplitted.size() - 1));
     }
 
+    /**
+     * Verify there is no mapping for {@link GoogleMetadata#PDF} if there are only embargoed (non-publically accessible
+     * bitstream) files
+     */
+    @Test
+    public void testGetPdfUrlOfEmbargoed() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Bundle bundle = ContentServiceFactory.getInstance().getBundleService().create(context, it, "ORIGINAL");
+
+        Bitstream b = bitstreamService.create(
+            context, new ByteArrayInputStream("Larger file than primary".getBytes(StandardCharsets.UTF_8)));
+        b.setName(context, "first");
+        b.setFormat(context, bitstreamFormatService.create(context));
+        b.getFormat(context).setMIMEType("unknown");
+        bundleService.addBitstream(context, bundle, b);
+        // Set 3 month embargo on pdf
+        MutablePeriod period = PeriodFormat.getDefault().parseMutablePeriod("3 months");
+        Date embargoDate = DateTime.now(DateTimeZone.UTC).plus(period).toDate();
+        Group anonGroup = groupService.findByName(context, Group.ANONYMOUS);
+        authorizeService.removeAllPolicies(context, b);
+        resourcePolicyService.removeAllPolicies(context, b);
+        ResourcePolicy rp = authorizeService.createOrModifyPolicy(null, context, null, anonGroup,
+            null, embargoDate, Constants.READ, "GoogleMetadataTest", b);
+        if (rp != null) {
+            resourcePolicyService.update(context, rp);
+        }
+
+        GoogleMetadata gm = new GoogleMetadata(this.context, it);
+        assertTrue(gm.getPDFURL().isEmpty());
+        // No value for citation_pdf_url because only one embargoed bitstream
+        boolean containsPdfUrl = false;
+        for (Map.Entry<String, String> mapping: gm.getMappings()) {
+            if (mapping.getKey().equalsIgnoreCase(gm.PDF)) {
+                containsPdfUrl = true;
+            }
+        }
+        assertFalse(containsPdfUrl);
+    }
+
     @After
     @Override
     public void destroy() {
diff --git a/dspace-api/src/test/java/org/dspace/app/util/RegexPatternUtilsTest.java b/dspace-api/src/test/java/org/dspace/app/util/RegexPatternUtilsTest.java
new file mode 100644
index 0000000000..30a9100ad4
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/util/RegexPatternUtilsTest.java
@@ -0,0 +1,214 @@
+/**
+ * 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/
+ */
+package org.dspace.app.util;
+
+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.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import org.dspace.AbstractUnitTest;
+import org.junit.Test;
+
+/**
+ * Tests for RegexPatternUtils
+ *
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ *
+ */
+public class RegexPatternUtilsTest extends AbstractUnitTest {
+
+    @Test
+    public void testValidRegexWithFlag() {
+        final String insensitiveWord = "/[a-z]+/i";
+        Pattern computePattern = Pattern.compile(insensitiveWord);
+        assertNotNull(computePattern);
+
+        Matcher matcher = computePattern.matcher("Hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("DSpace");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("Community");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("/wrongpattern/i");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("001");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("?/'`}{][<>.,");
+        assertFalse(matcher.matches());
+        computePattern = RegexPatternUtils.computePattern(insensitiveWord);
+        assertNotNull(computePattern);
+
+        matcher = computePattern.matcher("Hello");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("DSpace");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("Community");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("/wrong-pattern/i");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("001");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("?/'`}{][<>.,");
+        assertFalse(matcher.matches());
+    }
+
+    @Test
+    public void testRegexWithoutFlag() {
+        final String sensitiveWord = "[a-z]+";
+        Pattern computePattern = RegexPatternUtils.computePattern(sensitiveWord);
+        assertNotNull(computePattern);
+
+        Matcher matcher = computePattern.matcher("hello");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("dspace");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("community");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("Hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("DSpace");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("Community");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("/wrongpattern/i");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("001");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("?/'`}{][<>.,");
+        assertFalse(matcher.matches());
+
+        final String sensitiveWordWithDelimiter = "/[a-z]+/";
+        computePattern = RegexPatternUtils.computePattern(sensitiveWordWithDelimiter);
+        assertNotNull(computePattern);
+
+        matcher = computePattern.matcher("hello");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("dspace");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("community");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("Hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("DSpace");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("Community");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("/wrongpattern/i");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("001");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("?/'`}{][<>.,");
+        assertFalse(matcher.matches());
+    }
+
+    @Test
+    public void testWithFuzzyRegex() {
+        String fuzzyRegex = "/[a-z]+";
+        Pattern computePattern = RegexPatternUtils.computePattern(fuzzyRegex);
+        assertNotNull(computePattern);
+
+        Matcher matcher = computePattern.matcher("/hello");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("Hello");
+        assertFalse(matcher.matches());
+
+        fuzzyRegex = "[a-z]+/";
+        computePattern = RegexPatternUtils.computePattern(fuzzyRegex);
+        matcher = computePattern.matcher("hello/");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("/hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("Hello");
+        assertFalse(matcher.matches());
+
+        // equals to pattern \\[a-z]+\\ -> searching for a word delimited by '\'
+        fuzzyRegex = "\\\\[a-z]+\\\\";
+        computePattern = RegexPatternUtils.computePattern(fuzzyRegex);
+        // equals to '\hello\'
+        matcher = computePattern.matcher("\\hello\\");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("/hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("Hello");
+        assertFalse(matcher.matches());
+
+        // equals to pattern /[a-z]+/ -> searching for a string delimited by '/'
+        fuzzyRegex = "\\/[a-z]+\\/";
+        computePattern = RegexPatternUtils.computePattern(fuzzyRegex);
+        matcher = computePattern.matcher("/hello/");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("/hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("hello");
+        assertFalse(matcher.matches());
+        matcher = computePattern.matcher("Hello");
+        assertFalse(matcher.matches());
+    }
+
+    @Test
+    public void testInvalidRegex() {
+        String invalidSensitive = "[a-z+";
+        assertThrows(PatternSyntaxException.class, () -> RegexPatternUtils.computePattern(invalidSensitive));
+
+        String invalidRange = "a{1-";
+        assertThrows(PatternSyntaxException.class, () -> RegexPatternUtils.computePattern(invalidRange));
+
+        String invalidGroupPattern = "(abc";
+        assertThrows(PatternSyntaxException.class, () -> RegexPatternUtils.computePattern(invalidGroupPattern));
+
+        String emptyPattern = "";
+        Pattern computePattern = RegexPatternUtils.computePattern(emptyPattern);
+        assertNull(computePattern);
+
+        String blankPattern = "                      ";
+        computePattern = RegexPatternUtils.computePattern(blankPattern);
+        assertNull(computePattern);
+
+        String nullPattern = null;
+        computePattern = RegexPatternUtils.computePattern(nullPattern);
+        assertNull(computePattern);
+    }
+
+    @Test
+    public void testMultiFlagRegex() {
+        String multilineSensitive = "/[a-z]+/gi";
+        Pattern computePattern = RegexPatternUtils.computePattern(multilineSensitive);
+        assertNotNull(computePattern);
+        Matcher matcher = computePattern.matcher("hello");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("Hello");
+        assertTrue(matcher.matches());
+
+        multilineSensitive = "/[a-z]+/gim";
+        computePattern = RegexPatternUtils.computePattern(multilineSensitive);
+        assertNotNull(computePattern);
+        matcher = computePattern.matcher("Hello" + System.lineSeparator() + "Everyone");
+        assertTrue(matcher.find());
+        assertEquals("Hello", matcher.group());
+        assertTrue(matcher.find());
+        assertEquals("Everyone", matcher.group());
+
+        matcher = computePattern.matcher("hello");
+        assertTrue(matcher.matches());
+        matcher = computePattern.matcher("HELLO");
+        assertTrue(matcher.matches());
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/util/SubmissionConfigTest.java b/dspace-api/src/test/java/org/dspace/app/util/SubmissionConfigTest.java
new file mode 100644
index 0000000000..be4d6a12da
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/util/SubmissionConfigTest.java
@@ -0,0 +1,88 @@
+/**
+ * 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/
+ */
+package org.dspace.app.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dspace.AbstractUnitTest;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Tests for parsing and utilities on submission config forms / readers
+ *
+ * @author Kim Shepherd
+ */
+public class SubmissionConfigTest extends AbstractUnitTest {
+
+    DCInputsReader inputReader;
+
+    @BeforeClass
+    public static void setUpClass() {
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+    }
+
+    @Before
+    public void setUp() throws DCInputsReaderException {
+        inputReader = new DCInputsReader();
+    }
+
+    @After
+    public void tearDown() {
+        inputReader = null;
+    }
+
+    @Test
+    public void testReadAndProcessTypeBindSubmissionConfig()
+            throws SubmissionConfigReaderException, DCInputsReaderException {
+        // Set up test data. This should match the typebind test submission / form config
+        String typeBindHandle = "123456789/typebind-test";
+        String typeBindSubmissionName = "typebindtest";
+        String typeBindSubmissionStepName = "typebindtest";
+
+        // Expected field lists from typebindtest form
+        List<String> allConfiguredFields = new ArrayList<>();
+        allConfiguredFields.add("dc.title");
+        allConfiguredFields.add("dc.date.issued");
+        allConfiguredFields.add("dc.type");
+        allConfiguredFields.add("dc.identifier.isbn");
+        List<String> unboundFields = allConfiguredFields.subList(0, 3);
+
+        // Get submission configuration
+        SubmissionConfig submissionConfig =
+                new SubmissionConfigReader().getSubmissionConfigByCollection(typeBindHandle);
+        // Submission name should match name defined in item-submission.xml
+        assertEquals(typeBindSubmissionName, submissionConfig.getSubmissionName());
+        // Step 0 - our process only has one step. It should not be null and have the ID typebindtest
+        SubmissionStepConfig submissionStepConfig = submissionConfig.getStep(0);
+        assertNotNull(submissionStepConfig);
+        assertEquals(typeBindSubmissionStepName, submissionStepConfig.getId());
+        // Get inputs and allowed fields
+        DCInputSet inputConfig = inputReader.getInputsByFormName(submissionStepConfig.getId());
+        List<String> allowedFieldsForBook = inputConfig.populateAllowedFieldNames("Book");
+        List<String> allowedFieldsForBookChapter = inputConfig.populateAllowedFieldNames("Book chapter");
+        List<String> allowedFieldsForArticle = inputConfig.populateAllowedFieldNames("Article");
+        List<String> allowedFieldsForNoType = inputConfig.populateAllowedFieldNames(null);
+        // Book and book chapter should be allowed all 5 fields (each is bound to dc.identifier.isbn)
+        assertEquals(allConfiguredFields, allowedFieldsForBook);
+        assertEquals(allConfiguredFields, allowedFieldsForBookChapter);
+        // Article and type should match a subset of the fields without ISBN
+        assertEquals(unboundFields, allowedFieldsForArticle);
+        assertEquals(unboundFields, allowedFieldsForNoType);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/authorize/AuthorizeServiceTest.java b/dspace-api/src/test/java/org/dspace/authorize/AuthorizeServiceTest.java
index 46435ec8f1..70eaa2a0b9 100644
--- a/dspace-api/src/test/java/org/dspace/authorize/AuthorizeServiceTest.java
+++ b/dspace-api/src/test/java/org/dspace/authorize/AuthorizeServiceTest.java
@@ -27,7 +27,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * Created by pbecker as he wanted to write a test against DS-3572.
+ * Created by pbecker to write a test against DS-3572.
  * This definitely needs to be extended, but it's at least a start.
  */
 public class AuthorizeServiceTest extends AbstractUnitTest {
@@ -80,7 +80,7 @@ public class AuthorizeServiceTest extends AbstractUnitTest {
         }
 
         try {
-            // eperson1 should be able to write as he is member of a group that has write permissions
+            // eperson1 should be able to write as it is a member of a group that has write permissions
             Assert.assertTrue(authorizeService.authorizeActionBoolean(context, eperson1, dso, Constants.WRITE, true));
             // person2 shouldn't have write access
             Assert.assertFalse(authorizeService.authorizeActionBoolean(context, eperson2, dso, Constants.WRITE, true));
diff --git a/dspace-api/src/test/java/org/dspace/authorize/RegexPasswordValidatorTest.java b/dspace-api/src/test/java/org/dspace/authorize/RegexPasswordValidatorTest.java
new file mode 100644
index 0000000000..df333fa500
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/authorize/RegexPasswordValidatorTest.java
@@ -0,0 +1,84 @@
+/**
+ * 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/
+ */
+package org.dspace.authorize;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.when;
+
+import org.dspace.AbstractIntegrationTest;
+import org.dspace.services.ConfigurationService;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+/**
+ * Unit tests for {@link RegexPasswordValidator}.
+ * 
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class RegexPasswordValidatorTest extends AbstractIntegrationTest {
+
+    @Mock
+    private ConfigurationService configurationService;
+
+    @InjectMocks
+    private RegexPasswordValidator regexPasswordValidator;
+
+    @Before
+    public void setup() {
+        when(configurationService.getProperty("authentication-password.regex-validation.pattern"))
+        .thenReturn("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[^\\da-zA-Z]).{8,15}$");
+    }
+
+    @Test
+    public void testValidPassword() {
+        assertThat(regexPasswordValidator.isPasswordValid("TestPassword01!"), is(true));
+    }
+
+    @Test
+    public void testInvalidPasswordForMissingSpecialCharacter() {
+        assertThat(regexPasswordValidator.isPasswordValid("TestPassword01"), is(false));
+        assertThat(regexPasswordValidator.isPasswordValid("TestPassword01?"), is(true));
+    }
+
+    @Test
+    public void testInvalidPasswordForMissingNumber() {
+        assertThat(regexPasswordValidator.isPasswordValid("TestPassword!"), is(false));
+        assertThat(regexPasswordValidator.isPasswordValid("TestPassword1!"), is(true));
+    }
+
+    @Test
+    public void testInvalidPasswordForMissingUppercaseCharacter() {
+        assertThat(regexPasswordValidator.isPasswordValid("testpassword01!"), is(false));
+        assertThat(regexPasswordValidator.isPasswordValid("testPassword01!"), is(true));
+    }
+
+    @Test
+    public void testInvalidPasswordForMissingLowercaseCharacter() {
+        assertThat(regexPasswordValidator.isPasswordValid("TESTPASSWORD01!"), is(false));
+        assertThat(regexPasswordValidator.isPasswordValid("TESTPASSWORd01!"), is(true));
+    }
+
+    @Test
+    public void testInvalidPasswordForTooShortValue() {
+        assertThat(regexPasswordValidator.isPasswordValid("Test01!"), is(false));
+        assertThat(regexPasswordValidator.isPasswordValid("Test012!"), is(true));
+    }
+
+    @Test
+    public void testInvalidPasswordForTooLongValue() {
+        assertThat(regexPasswordValidator.isPasswordValid("ThisIsAVeryLongPassword01!"), is(false));
+        assertThat(regexPasswordValidator.isPasswordValid("IsAPassword012!"), is(true));
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java b/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
index 06deacaca4..3306ced8f4 100644
--- a/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
@@ -42,6 +42,10 @@ import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.eperson.service.RegistrationDataService;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.scripts.factory.ScriptServiceFactory;
 import org.dspace.scripts.service.ProcessService;
 import org.dspace.services.factory.DSpaceServicesFactory;
@@ -95,6 +99,9 @@ public abstract class AbstractBuilder<T, S> {
     static ProcessService processService;
     static RequestItemService requestItemService;
     static VersioningService versioningService;
+    static OrcidHistoryService orcidHistoryService;
+    static OrcidQueueService orcidQueueService;
+    static OrcidTokenService orcidTokenService;
 
     protected Context context;
 
@@ -151,6 +158,9 @@ public abstract class AbstractBuilder<T, S> {
         inProgressUserService = XmlWorkflowServiceFactory.getInstance().getInProgressUserService();
         poolTaskService = XmlWorkflowServiceFactory.getInstance().getPoolTaskService();
         workflowItemRoleService = XmlWorkflowServiceFactory.getInstance().getWorkflowItemRoleService();
+        orcidHistoryService = OrcidServiceFactory.getInstance().getOrcidHistoryService();
+        orcidQueueService = OrcidServiceFactory.getInstance().getOrcidQueueService();
+        orcidTokenService = OrcidServiceFactory.getInstance().getOrcidTokenService();
     }
 
 
@@ -183,6 +193,7 @@ public abstract class AbstractBuilder<T, S> {
         processService = null;
         requestItemService = null;
         versioningService = null;
+        orcidTokenService = null;
 
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java b/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
index a2a8aa9d42..ff1083d318 100644
--- a/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
@@ -63,7 +63,7 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
                                                                             final String qualifier,
                                                                             final String value) {
         try {
-            getService().addMetadata(context, dso, schema, element, qualifier, Item.ANY, value);
+            getService().addMetadata(context, dso, schema, element, qualifier, null, value);
         } catch (Exception e) {
             return handleException(e);
         }
diff --git a/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java b/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
index f98befe57f..424833e5cc 100644
--- a/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
@@ -18,6 +18,7 @@ import org.dspace.content.BitstreamFormat;
 import org.dspace.content.Bundle;
 import org.dspace.content.Item;
 import org.dspace.content.service.DSpaceObjectService;
+import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.eperson.Group;
 
@@ -26,8 +27,6 @@ import org.dspace.eperson.Group;
  */
 public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
 
-    public static final String ORIGINAL = "ORIGINAL";
-
     private Bitstream bitstream;
     private Item item;
     private Group readerGroup;
@@ -158,12 +157,12 @@ public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
     }
 
     private Bundle getOriginalBundle(Item item) throws SQLException, AuthorizeException {
-        List<Bundle> bundles = itemService.getBundles(item, ORIGINAL);
+        List<Bundle> bundles = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
         Bundle targetBundle = null;
 
         if (bundles.size() < 1) {
             // not found, create a new one
-            targetBundle = bundleService.create(context, item, ORIGINAL);
+            targetBundle = bundleService.create(context, item, Constants.CONTENT_BUNDLE_NAME);
         } else {
             // put bitstreams into first bundle
             targetBundle = bundles.iterator().next();
@@ -206,6 +205,7 @@ public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             bitstream = c.reloadEntity(bitstream);
diff --git a/dspace-api/src/test/java/org/dspace/builder/BitstreamFormatBuilder.java b/dspace-api/src/test/java/org/dspace/builder/BitstreamFormatBuilder.java
index 1051712326..a13783ceef 100644
--- a/dspace-api/src/test/java/org/dspace/builder/BitstreamFormatBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/BitstreamFormatBuilder.java
@@ -34,6 +34,7 @@ public class BitstreamFormatBuilder extends AbstractCRUDBuilder<BitstreamFormat>
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             bitstreamFormat = c.reloadEntity(bitstreamFormat);
diff --git a/dspace-api/src/test/java/org/dspace/builder/BundleBuilder.java b/dspace-api/src/test/java/org/dspace/builder/BundleBuilder.java
index 614cd54c6d..1776921ac6 100644
--- a/dspace-api/src/test/java/org/dspace/builder/BundleBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/BundleBuilder.java
@@ -55,6 +55,7 @@ public class BundleBuilder extends AbstractDSpaceObjectBuilder<Bundle>  {
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             bundle = c.reloadEntity(bundle);
diff --git a/dspace-api/src/test/java/org/dspace/builder/ClaimedTaskBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ClaimedTaskBuilder.java
index 63c03c4a91..aed712f2d2 100644
--- a/dspace-api/src/test/java/org/dspace/builder/ClaimedTaskBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/ClaimedTaskBuilder.java
@@ -124,6 +124,7 @@ public class ClaimedTaskBuilder extends AbstractBuilder<ClaimedTask, ClaimedTask
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             workspaceItem = c.reloadEntity(workspaceItem);
diff --git a/dspace-api/src/test/java/org/dspace/builder/CollectionBuilder.java b/dspace-api/src/test/java/org/dspace/builder/CollectionBuilder.java
index 0db1f6900f..3e8a7dc9f0 100644
--- a/dspace-api/src/test/java/org/dspace/builder/CollectionBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/CollectionBuilder.java
@@ -253,6 +253,7 @@ public class CollectionBuilder extends AbstractDSpaceObjectBuilder<Collection> {
     @Override
     public void cleanup() throws Exception {
        try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             collection = c.reloadEntity(collection);
diff --git a/dspace-api/src/test/java/org/dspace/builder/CommunityBuilder.java b/dspace-api/src/test/java/org/dspace/builder/CommunityBuilder.java
index 5ba36af8f4..a01aef8498 100644
--- a/dspace-api/src/test/java/org/dspace/builder/CommunityBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/CommunityBuilder.java
@@ -116,6 +116,7 @@ public class CommunityBuilder extends AbstractDSpaceObjectBuilder<Community> {
     @Override
     public void cleanup() throws Exception {
        try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             community = c.reloadEntity(community);
diff --git a/dspace-api/src/test/java/org/dspace/builder/EPersonBuilder.java b/dspace-api/src/test/java/org/dspace/builder/EPersonBuilder.java
index 2010aef2c1..a28462eea7 100644
--- a/dspace-api/src/test/java/org/dspace/builder/EPersonBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/EPersonBuilder.java
@@ -32,6 +32,7 @@ public class EPersonBuilder extends AbstractDSpaceObjectBuilder<EPerson> {
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             ePerson = c.reloadEntity(ePerson);
@@ -128,6 +129,16 @@ public class EPersonBuilder extends AbstractDSpaceObjectBuilder<EPerson> {
         return this;
     }
 
+    public EPersonBuilder withOrcid(final String orcid) {
+        setMetadataSingleValue(ePerson, "eperson", "orcid", null, orcid);
+        return this;
+    }
+
+    public EPersonBuilder withOrcidScope(final String scope) {
+        addMetadataValue(ePerson, "eperson", "orcid", "scope", scope);
+        return this;
+    }
+
     public static void deleteEPerson(UUID uuid) throws SQLException, IOException {
         try (Context c = new Context()) {
             c.turnOffAuthorisationSystem();
diff --git a/dspace-api/src/test/java/org/dspace/builder/EntityTypeBuilder.java b/dspace-api/src/test/java/org/dspace/builder/EntityTypeBuilder.java
index ef3c840bc2..36d9654adf 100644
--- a/dspace-api/src/test/java/org/dspace/builder/EntityTypeBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/EntityTypeBuilder.java
@@ -36,6 +36,7 @@ public class EntityTypeBuilder extends AbstractBuilder<EntityType, EntityTypeSer
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             entityType = c.reloadEntity(entityType);
diff --git a/dspace-api/src/test/java/org/dspace/builder/GroupBuilder.java b/dspace-api/src/test/java/org/dspace/builder/GroupBuilder.java
index cbee3e57a1..b3447dd8bd 100644
--- a/dspace-api/src/test/java/org/dspace/builder/GroupBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/GroupBuilder.java
@@ -35,6 +35,7 @@ public class GroupBuilder extends AbstractDSpaceObjectBuilder<Group> {
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             group = c.reloadEntity(group);
diff --git a/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
index f00104014d..70dea309f2 100644
--- a/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
@@ -7,6 +7,10 @@
  */
 package org.dspace.builder;
 
+import static org.dspace.content.LicenseUtils.getLicenseText;
+import static org.dspace.content.MetadataSchemaEnum.DC;
+import static org.dspace.content.authority.Choices.CF_ACCEPTED;
+
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
@@ -15,12 +19,16 @@ import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
 import org.dspace.content.DCDate;
 import org.dspace.content.Item;
+import org.dspace.content.LicenseUtils;
 import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.service.DSpaceObjectService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
 
 /**
  * Builder to construct Item objects
@@ -31,6 +39,7 @@ import org.dspace.eperson.Group;
 public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
 
     private boolean withdrawn = false;
+    private String handle = null;
     private WorkspaceItem workspaceItem;
     private Item item;
     private Group readerGroup = null;
@@ -48,7 +57,7 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
         this.context = context;
 
         try {
-            workspaceItem = workspaceItemService.create(context, col, false);
+            workspaceItem = workspaceItemService.create(context, col, true);
             item = workspaceItem.getItem();
         } catch (Exception e) {
             return handleException(e);
@@ -73,11 +82,48 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
     public ItemBuilder withAuthor(final String authorName) {
         return addMetadataValue(item, MetadataSchemaEnum.DC.getName(), "contributor", "author", authorName);
     }
+
     public ItemBuilder withAuthor(final String authorName, final String authority, final int confidence) {
         return addMetadataValue(item, MetadataSchemaEnum.DC.getName(), "contributor", "author",
                                 null, authorName, authority, confidence);
     }
 
+    public ItemBuilder withEditor(final String editorName) {
+        return addMetadataValue(item, MetadataSchemaEnum.DC.getName(), "contributor", "editor", editorName);
+    }
+
+    public ItemBuilder withDescriptionAbstract(String description) {
+        return addMetadataValue(item, MetadataSchemaEnum.DC.getName(), "description", "abstract", description);
+    }
+
+    public ItemBuilder withLanguage(String language) {
+        return addMetadataValue(item, "dc", "language", "iso", language);
+    }
+
+    public ItemBuilder withIsPartOf(String isPartOf) {
+        return addMetadataValue(item, "dc", "relation", "ispartof", isPartOf);
+    }
+
+    public ItemBuilder withDoiIdentifier(String doi) {
+        return addMetadataValue(item, "dc", "identifier", "doi", doi);
+    }
+
+    public ItemBuilder withScopusIdentifier(String scopus) {
+        return addMetadataValue(item, "dc", "identifier", "scopus", scopus);
+    }
+
+    public ItemBuilder withRelationFunding(String funding) {
+        return addMetadataValue(item, "dc", "relation", "funding", funding);
+    }
+
+    public ItemBuilder withRelationFunding(String funding, String authority) {
+        return addMetadataValue(item, DC.getName(), "relation", "funding", null, funding, authority, 600);
+    }
+
+    public ItemBuilder withRelationGrantno(String grantno) {
+        return addMetadataValue(item, "dc", "relation", "grantno", grantno);
+    }
+
     public ItemBuilder withPersonIdentifierFirstName(final String personIdentifierFirstName) {
         return addMetadataValue(item, "person", "givenName", null, personIdentifierFirstName);
     }
@@ -144,11 +190,96 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
         return addMetadataValue(item, schema, element, qualifier, value);
     }
 
+    public ItemBuilder withDspaceObjectOwner(String value, String authority) {
+        return addMetadataValue(item, "dspace", "object", "owner", null, value, authority, CF_ACCEPTED);
+    }
+
+    public ItemBuilder withOrcidIdentifier(String orcid) {
+        return addMetadataValue(item, "person", "identifier", "orcid", orcid);
+    }
+
+    public ItemBuilder withOrcidAccessToken(String accessToken, EPerson owner) {
+
+        try {
+
+            OrcidTokenBuilder.create(context, owner, accessToken)
+                .withProfileItem(item)
+                .build();
+
+        } catch (SQLException | AuthorizeException e) {
+            throw new RuntimeException(e);
+        }
+
+        return this;
+
+    }
+
+    public ItemBuilder withOrcidAuthenticated(String authenticated) {
+        return addMetadataValue(item, "dspace", "orcid", "authenticated", authenticated);
+    }
+
+    public ItemBuilder withOrcidSynchronizationPublicationsPreference(OrcidEntitySyncPreference value) {
+        return withOrcidSynchronizationPublicationsPreference(value.name());
+    }
+
+    public ItemBuilder withOrcidSynchronizationPublicationsPreference(String value) {
+        return setMetadataSingleValue(item, "dspace", "orcid", "sync-publications", value);
+    }
+
+    public ItemBuilder withOrcidSynchronizationFundingsPreference(OrcidEntitySyncPreference value) {
+        return withOrcidSynchronizationFundingsPreference(value.name());
+    }
+
+    public ItemBuilder withOrcidSynchronizationFundingsPreference(String value) {
+        return setMetadataSingleValue(item, "dspace", "orcid", "sync-fundings", value);
+    }
+
+    public ItemBuilder withOrcidSynchronizationProfilePreference(OrcidProfileSyncPreference value) {
+        return withOrcidSynchronizationProfilePreference(value.name());
+    }
+
+    public ItemBuilder withOrcidSynchronizationProfilePreference(String value) {
+        return addMetadataValue(item, "dspace", "orcid", "sync-profile", value);
+    }
+
+    public ItemBuilder withOrcidSynchronizationMode(OrcidSynchronizationMode mode) {
+        return withOrcidSynchronizationMode(mode.name());
+    }
+
+    private ItemBuilder withOrcidSynchronizationMode(String mode) {
+        return setMetadataSingleValue(item, "dspace", "orcid", "sync-mode", mode);
+    }
+
+    public ItemBuilder withPersonCountry(String country) {
+        return addMetadataValue(item, "person", "country", null, country);
+    }
+
+    public ItemBuilder withScopusAuthorIdentifier(String id) {
+        return addMetadataValue(item, "person", "identifier", "scopus-author-id", id);
+    }
+
+    public ItemBuilder withResearcherIdentifier(String rid) {
+        return addMetadataValue(item, "person", "identifier", "rid", rid);
+    }
+
+    public ItemBuilder withVernacularName(String vernacularName) {
+        return setMetadataSingleValue(item, "person", "name", "translated", vernacularName);
+    }
+
+    public ItemBuilder withVariantName(String variant) {
+        return addMetadataValue(item, "person", "name", "variant", variant);
+    }
+
     public ItemBuilder makeUnDiscoverable() {
         item.setDiscoverable(false);
         return this;
     }
 
+    public ItemBuilder withHandle(String handle) {
+        this.handle = handle;
+        return this;
+    }
+
     /**
      * Withdrawn the item under build. Please note that an user need to be loggedin the context to avoid NPE during the
      * creation of the provenance metadata
@@ -169,10 +300,62 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
         return this;
     }
 
+    public ItemBuilder withOrgUnitLegalName(String name) {
+        return addMetadataValue(item, "organization", "legalName", null, name);
+    }
+
+    public ItemBuilder withOrgUnitCountry(String addressCountry) {
+        return addMetadataValue(item, "organization", "address", "addressCountry", addressCountry);
+    }
+
+    public ItemBuilder withOrgUnitLocality(String addressLocality) {
+        return addMetadataValue(item, "organization", "address", "addressLocality", addressLocality);
+    }
+
+    public ItemBuilder withOrgUnitCrossrefIdentifier(String crossrefid) {
+        return addMetadataValue(item, "organization", "identifier", "crossrefid", crossrefid);
+    }
+
+    public ItemBuilder withProjectStartDate(String startDate) {
+        return addMetadataValue(item, "project", "startDate", null, startDate);
+    }
+
+    public ItemBuilder withProjectEndDate(String endDate) {
+        return addMetadataValue(item, "project", "endDate", null, endDate);
+    }
+
+    public ItemBuilder withProjectInvestigator(String investigator) {
+        return addMetadataValue(item, "project", "investigator", null, investigator);
+    }
+
+    public ItemBuilder withDescription(String description) {
+        return addMetadataValue(item, MetadataSchemaEnum.DC.getName(), "description", null, description);
+    }
+
+    public ItemBuilder withProjectAmount(String amount) {
+        return addMetadataValue(item, "project", "amount", null, amount);
+    }
+
+    public ItemBuilder withProjectAmountCurrency(String currency) {
+        return addMetadataValue(item, "project", "amount", "currency", currency);
+    }
+
+    public ItemBuilder withUriIdentifier(String uri) {
+        return addMetadataValue(item, "dc", "identifier", "uri", uri);
+    }
+
+    public ItemBuilder withIdentifier(String identifier) {
+        return addMetadataValue(item, "dc", "identifier", null, identifier);
+    }
+
+    public ItemBuilder withOtherIdentifier(String identifier) {
+        return addMetadataValue(item, "dc", "identifier", "other", identifier);
+    }
+
     /**
      * Create an admin group for the collection with the specified members
      *
-     * @param members epersons to add to the admin group
+     * @param ePerson epersons to add to the admin group
      * @return this builder
      * @throws SQLException
      * @throws AuthorizeException
@@ -181,11 +364,14 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
         return setAdminPermission(item, ePerson, null);
     }
 
+    public ItemBuilder withPersonEmail(String email) {
+        return addMetadataValue(item, "person", "email", null, email);
+    }
 
     @Override
     public Item build() {
         try {
-            installItemService.installItem(context, workspaceItem);
+            installItemService.installItem(context, workspaceItem, this.handle);
             itemService.update(context, item);
 
             //Check if we need to make this item private. This has to be done after item install.
@@ -209,13 +395,19 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
     @Override
     public void cleanup() throws Exception {
        try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
+            // If the workspaceItem used to create this item still exists, delete it
+            workspaceItem = c.reloadEntity(workspaceItem);
+            if (workspaceItem != null) {
+                workspaceItemService.deleteAll(c, workspaceItem);
+            }
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             item = c.reloadEntity(item);
             if (item != null) {
                  delete(c, item);
-                 c.complete();
             }
+            c.complete();
        }
     }
 
@@ -245,4 +437,17 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
         }
     }
 
+    public ItemBuilder grantLicense() {
+        String license;
+        try {
+            EPerson submitter = workspaceItem.getSubmitter();
+            submitter = context.reloadEntity(submitter);
+            license = getLicenseText(context.getCurrentLocale(), workspaceItem.getCollection(), item, submitter);
+            LicenseUtils.grantLicense(context, item, license, null);
+        } catch (Exception e) {
+            handleException(e);
+        }
+        return this;
+    }
+
 }
diff --git a/dspace-api/src/test/java/org/dspace/builder/MetadataFieldBuilder.java b/dspace-api/src/test/java/org/dspace/builder/MetadataFieldBuilder.java
index dfc9112a3f..52acf9d5ed 100644
--- a/dspace-api/src/test/java/org/dspace/builder/MetadataFieldBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/MetadataFieldBuilder.java
@@ -38,6 +38,7 @@ public class MetadataFieldBuilder extends AbstractBuilder<MetadataField, Metadat
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             metadataField = c.reloadEntity(metadataField);
diff --git a/dspace-api/src/test/java/org/dspace/builder/MetadataSchemaBuilder.java b/dspace-api/src/test/java/org/dspace/builder/MetadataSchemaBuilder.java
index 10e1894ee4..50b07b6455 100644
--- a/dspace-api/src/test/java/org/dspace/builder/MetadataSchemaBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/MetadataSchemaBuilder.java
@@ -37,6 +37,7 @@ public class MetadataSchemaBuilder extends AbstractBuilder<MetadataSchema, Metad
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             metadataSchema = c.reloadEntity(metadataSchema);
diff --git a/dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java b/dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java
new file mode 100644
index 0000000000..199f412f85
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java
@@ -0,0 +1,152 @@
+/**
+ * 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/
+ */
+package org.dspace.builder;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Date;
+
+import org.apache.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.service.OrcidHistoryService;
+/**
+ * Builder to construct OrcidHistory objects
+ *
+ * @author Mykhaylo Boychuk (4science)
+ */
+public class OrcidHistoryBuilder extends  AbstractBuilder<OrcidHistory, OrcidHistoryService> {
+
+    private static final Logger log = Logger.getLogger(OrcidHistoryBuilder.class);
+
+    private OrcidHistory orcidHistory;
+
+    protected OrcidHistoryBuilder(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected OrcidHistoryService getService() {
+        return orcidHistoryService;
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        delete(orcidHistory);
+    }
+
+    public static OrcidHistoryBuilder createOrcidHistory(Context context, Item profileItem, Item entity) {
+        OrcidHistoryBuilder builder = new OrcidHistoryBuilder(context);
+        return builder.create(context, profileItem, entity);
+    }
+
+    private OrcidHistoryBuilder create(Context context, Item profileItem, Item entity) {
+        try {
+            this.context = context;
+            this.orcidHistory = getService().create(context, profileItem, entity);
+        } catch (Exception e) {
+            log.error("Error in OrcidHistoryBuilder.create(..), error: ", e);
+        }
+        return this;
+    }
+
+    @Override
+    public OrcidHistory build() throws SQLException {
+        try {
+            getService().update(context, orcidHistory);
+            context.dispatchEvents();
+
+            indexingService.commit();
+        } catch (Exception e) {
+            log.error("Error in OrcidHistoryBuilder.build(), error: ", e);
+        }
+        return orcidHistory;
+    }
+
+    @Override
+    public void delete(Context c, OrcidHistory orcidHistory) throws Exception {
+        if (orcidHistory != null) {
+            getService().delete(c, orcidHistory);
+        }
+    }
+
+    /**
+     * Delete the Test OrcidHistory referred to by the given ID
+     *
+     * @param id                Integer of Test OrcidHistory to delete
+     * @throws SQLException
+     * @throws IOException
+     */
+    public static void deleteOrcidHistory(Integer id) throws SQLException, IOException {
+        if (id == null) {
+            return;
+        }
+
+        try (Context c = new Context()) {
+            OrcidHistory orcidHistory = orcidHistoryService.find(c, id);
+            if (orcidHistory != null) {
+                orcidHistoryService.delete(c, orcidHistory);
+            }
+            c.complete();
+        }
+    }
+
+    public void delete(OrcidHistory orcidHistory) throws Exception {
+        try (Context c = new Context()) {
+            c.turnOffAuthorisationSystem();
+            OrcidHistory attachedTab = c.reloadEntity(orcidHistory);
+            if (attachedTab != null) {
+                getService().delete(c, attachedTab);
+            }
+            c.complete();
+        }
+        indexingService.commit();
+    }
+
+    public OrcidHistoryBuilder withResponseMessage(String responseMessage) throws SQLException {
+        orcidHistory.setResponseMessage(responseMessage);
+        return this;
+    }
+
+    public OrcidHistoryBuilder withPutCode(String putCode) throws SQLException {
+        orcidHistory.setPutCode(putCode);
+        return this;
+    }
+
+    public OrcidHistoryBuilder withStatus(Integer status) throws SQLException {
+        orcidHistory.setStatus(status);
+        return this;
+    }
+
+    public OrcidHistoryBuilder withMetadata(String metadata) throws SQLException {
+        orcidHistory.setMetadata(metadata);
+        return this;
+    }
+
+    public OrcidHistoryBuilder withRecordType(String recordType) throws SQLException {
+        orcidHistory.setRecordType(recordType);
+        return this;
+    }
+
+    public OrcidHistoryBuilder withOperation(OrcidOperation operation) throws SQLException {
+        orcidHistory.setOperation(operation);
+        return this;
+    }
+
+    public OrcidHistoryBuilder withDescription(String description) throws SQLException {
+        orcidHistory.setDescription(description);
+        return this;
+    }
+
+    public OrcidHistoryBuilder withTimestamp(Date timestamp) {
+        orcidHistory.setTimestamp(timestamp);
+        return this;
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/builder/OrcidQueueBuilder.java b/dspace-api/src/test/java/org/dspace/builder/OrcidQueueBuilder.java
new file mode 100644
index 0000000000..bbc0e0e532
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/OrcidQueueBuilder.java
@@ -0,0 +1,146 @@
+/**
+ * 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/
+ */
+package org.dspace.builder;
+
+import java.sql.SQLException;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidQueueService;
+
+/**
+ * Builder to construct OrcidQueue objects
+ *
+ * @author Mykhaylo Boychuk (4science)
+ */
+public class OrcidQueueBuilder extends  AbstractBuilder<OrcidQueue, OrcidQueueService> {
+
+    private OrcidQueue orcidQueue;
+
+    protected OrcidQueueBuilder(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected OrcidQueueService getService() {
+        return orcidQueueService;
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        delete(orcidQueue);
+    }
+
+    public static OrcidQueueBuilder createOrcidQueue(Context context, Item profileItem, Item entity) {
+        OrcidQueueBuilder builder = new OrcidQueueBuilder(context);
+        return builder.createEntityInsertionRecord(context, profileItem, entity);
+    }
+
+    public static OrcidQueueBuilder createOrcidQueue(Context context, Item profileItem, Item entity, String putCode) {
+        OrcidQueueBuilder builder = new OrcidQueueBuilder(context);
+        return builder.createEntityUpdateRecord(context, profileItem, entity, putCode);
+    }
+
+    public static OrcidQueueBuilder createOrcidQueue(Context context, Item profileItem, String description,
+        String type, String putCode) {
+        OrcidQueueBuilder builder = new OrcidQueueBuilder(context);
+        return builder.createEntityDeletionRecord(context, profileItem, description, type, putCode);
+    }
+
+    private OrcidQueueBuilder createEntityDeletionRecord(Context context, Item profileItem,
+        String description, String type, String putCode) {
+        try {
+            this.context = context;
+            this.orcidQueue = getService().createEntityDeletionRecord(context, profileItem, description, type, putCode);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return this;
+    }
+
+    private OrcidQueueBuilder createEntityUpdateRecord(Context context, Item profileItem, Item entity, String putCode) {
+        try {
+            this.context = context;
+            this.orcidQueue = getService().createEntityUpdateRecord(context, profileItem, entity, putCode);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return this;
+    }
+
+    private OrcidQueueBuilder createEntityInsertionRecord(Context context, Item profileItem, Item entity) {
+        try {
+            this.context = context;
+            this.orcidQueue = getService().createEntityInsertionRecord(context, profileItem, entity);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return this;
+    }
+
+    @Override
+    public OrcidQueue build() throws SQLException, AuthorizeException {
+        try {
+            getService().update(context, orcidQueue);
+            context.dispatchEvents();
+
+            indexingService.commit();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return orcidQueue;
+    }
+
+    public OrcidQueueBuilder withPutCode(String putCode) {
+        orcidQueue.setPutCode(putCode);
+        return this;
+    }
+
+    public OrcidQueueBuilder withMetadata(String metadata) throws SQLException {
+        orcidQueue.setMetadata(metadata);
+        return this;
+    }
+
+    public OrcidQueueBuilder withRecordType(String recordType) throws SQLException {
+        orcidQueue.setRecordType(recordType);
+        return this;
+    }
+
+    public OrcidQueueBuilder withOperation(OrcidOperation operation) throws SQLException {
+        orcidQueue.setOperation(operation);
+        return this;
+    }
+
+    public OrcidQueueBuilder withDescription(String description) throws SQLException {
+        orcidQueue.setDescription(description);
+        return this;
+    }
+
+    @Override
+    public void delete(Context c, OrcidQueue orcidQueue) throws Exception {
+        if (orcidQueue != null) {
+            getService().delete(c, orcidQueue);
+        }
+    }
+
+    public void delete(OrcidQueue orcidQueue) throws Exception {
+        try (Context c = new Context()) {
+            c.turnOffAuthorisationSystem();
+            OrcidQueue attachedTab = c.reloadEntity(orcidQueue);
+            if (attachedTab != null) {
+                getService().delete(c, attachedTab);
+            }
+            c.complete();
+        }
+        indexingService.commit();
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/builder/OrcidTokenBuilder.java b/dspace-api/src/test/java/org/dspace/builder/OrcidTokenBuilder.java
new file mode 100644
index 0000000000..e3e149a9ec
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/OrcidTokenBuilder.java
@@ -0,0 +1,76 @@
+/**
+ * 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/
+ */
+package org.dspace.builder;
+
+import java.sql.SQLException;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.service.OrcidTokenService;
+
+/**
+ * Builder for {@link OrcidToken} entities.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidTokenBuilder extends AbstractBuilder<OrcidToken, OrcidTokenService> {
+
+    private OrcidToken orcidToken;
+
+    protected OrcidTokenBuilder(Context context) {
+        super(context);
+    }
+
+    public static OrcidTokenBuilder create(Context context, EPerson ePerson, String accessToken) {
+        OrcidTokenBuilder builder = new OrcidTokenBuilder(context);
+        builder.create(ePerson, accessToken);
+        return builder;
+    }
+
+    private void create(EPerson ePerson, String accessToken) {
+        orcidToken = orcidTokenService.create(context, ePerson, accessToken);
+    }
+
+    public OrcidTokenBuilder withProfileItem(Item profileItem) {
+        orcidToken.setProfileItem(profileItem);
+        return this;
+    }
+
+    @Override
+    public OrcidToken build() throws SQLException, AuthorizeException {
+        return orcidToken;
+    }
+
+    @Override
+    public void delete(Context c, OrcidToken orcidToken) throws Exception {
+        orcidTokenService.delete(c, orcidToken);
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        try (Context context = new Context()) {
+            context.setDispatcher("noindex");
+            context.turnOffAuthorisationSystem();
+            orcidToken = context.reloadEntity(orcidToken);
+            if (orcidToken != null) {
+                delete(context, orcidToken);
+                context.complete();
+            }
+        }
+    }
+
+    @Override
+    protected OrcidTokenService getService() {
+        return orcidTokenService;
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/builder/PoolTaskBuilder.java b/dspace-api/src/test/java/org/dspace/builder/PoolTaskBuilder.java
index c0de46e1e5..633d025f2e 100644
--- a/dspace-api/src/test/java/org/dspace/builder/PoolTaskBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/PoolTaskBuilder.java
@@ -104,6 +104,7 @@ public class PoolTaskBuilder extends AbstractBuilder<PoolTask, PoolTaskService>
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             workspaceItem = c.reloadEntity(workspaceItem);
diff --git a/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
index 6970cd57c3..86573940e4 100644
--- a/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
@@ -11,12 +11,15 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.ProcessStatus;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
 import org.dspace.scripts.DSpaceCommandLineParameter;
 import org.dspace.scripts.Process;
 import org.dspace.scripts.service.ProcessService;
@@ -33,14 +36,22 @@ public class ProcessBuilder extends AbstractBuilder<Process, ProcessService> {
                                                List<DSpaceCommandLineParameter> parameters)
         throws SQLException {
         ProcessBuilder processBuilder = new ProcessBuilder(context);
-        return processBuilder.create(context, ePerson, scriptName, parameters);
+        return processBuilder.create(context, ePerson, scriptName, parameters, null);
+    }
+
+    public static ProcessBuilder createProcess(Context context, EPerson ePerson, String scriptName,
+                                               List<DSpaceCommandLineParameter> parameters,
+                                               Set<Group> specialGroups)
+        throws SQLException {
+        ProcessBuilder processBuilder = new ProcessBuilder(context);
+        return processBuilder.create(context, ePerson, scriptName, parameters, specialGroups);
     }
 
     private ProcessBuilder create(Context context, EPerson ePerson, String scriptName,
-                                  List<DSpaceCommandLineParameter> parameters)
+                                  List<DSpaceCommandLineParameter> parameters, final Set<Group> specialGroups)
         throws SQLException {
         this.context = context;
-        this.process = processService.create(context, ePerson, scriptName, parameters);
+        this.process = processService.create(context, ePerson, scriptName, parameters, specialGroups);
         this.process.setProcessStatus(ProcessStatus.SCHEDULED);
         return this;
     }
@@ -50,6 +61,11 @@ public class ProcessBuilder extends AbstractBuilder<Process, ProcessService> {
         return this;
     }
 
+    public ProcessBuilder withCreationTime(Date creationTime) {
+        process.setCreationTime(creationTime);
+        return this;
+    }
+
     public ProcessBuilder withStartAndEndTime(String startTime, String endTime) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
         process.setStartTime(simpleDateFormat.parse(startTime));
@@ -60,6 +76,7 @@ public class ProcessBuilder extends AbstractBuilder<Process, ProcessService> {
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             process = c.reloadEntity(process);
diff --git a/dspace-api/src/test/java/org/dspace/builder/RelationshipBuilder.java b/dspace-api/src/test/java/org/dspace/builder/RelationshipBuilder.java
index 8746033419..c8c5cf85bf 100644
--- a/dspace-api/src/test/java/org/dspace/builder/RelationshipBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/RelationshipBuilder.java
@@ -39,6 +39,7 @@ public class RelationshipBuilder extends AbstractBuilder<Relationship, Relations
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             relationship = c.reloadEntity(relationship);
@@ -106,18 +107,26 @@ public class RelationshipBuilder extends AbstractBuilder<Relationship, Relations
     }
 
     public static RelationshipBuilder createRelationshipBuilder(Context context, Item leftItem, Item rightItem,
-                                                                RelationshipType relationshipType) {
+                                                RelationshipType relationshipType, int leftPlace, int rightPlace) {
 
         RelationshipBuilder relationshipBuilder = new RelationshipBuilder(context);
-        return relationshipBuilder.create(context, leftItem, rightItem, relationshipType);
+        return relationshipBuilder.create(context, leftItem, rightItem, relationshipType, leftPlace, rightPlace);
+    }
+
+    public static RelationshipBuilder createRelationshipBuilder(Context context, Item leftItem, Item rightItem,
+                                                                RelationshipType relationshipType) {
+
+        return createRelationshipBuilder(context, leftItem, rightItem, relationshipType, -1, -1);
     }
 
     private RelationshipBuilder create(Context context, Item leftItem, Item rightItem,
-                                       RelationshipType relationshipType) {
+                                       RelationshipType relationshipType, int leftPlace, int rightPlace) {
         this.context = context;
 
         try {
-            relationship = relationshipService.create(context, leftItem, rightItem, relationshipType, 0, 0);
+            //place -1 will add it to the end
+            relationship = relationshipService.create(context, leftItem, rightItem, relationshipType,
+                    leftPlace, rightPlace);
         } catch (SQLException | AuthorizeException e) {
             log.warn("Failed to create relationship", e);
         }
@@ -139,4 +148,10 @@ public class RelationshipBuilder extends AbstractBuilder<Relationship, Relations
         relationship.setLeftPlace(leftPlace);
         return this;
     }
+
+    public RelationshipBuilder withLatestVersionStatus(Relationship.LatestVersionStatus latestVersionStatus) {
+        relationship.setLatestVersionStatus(latestVersionStatus);
+        return this;
+    }
+
 }
diff --git a/dspace-api/src/test/java/org/dspace/builder/RelationshipTypeBuilder.java b/dspace-api/src/test/java/org/dspace/builder/RelationshipTypeBuilder.java
index 2774f87aa8..60ea385b1a 100644
--- a/dspace-api/src/test/java/org/dspace/builder/RelationshipTypeBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/RelationshipTypeBuilder.java
@@ -37,6 +37,7 @@ public class RelationshipTypeBuilder extends AbstractBuilder<RelationshipType, R
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             relationshipType = c.reloadEntity(relationshipType);
diff --git a/dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java b/dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java
index a9e4aed174..66e6245ff6 100644
--- a/dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java
@@ -117,6 +117,7 @@ public class RequestItemBuilder
             throws Exception {
         LOG.debug("cleanup()");
         try ( Context ctx = new Context(); ) {
+            ctx.setDispatcher("noindex");
             ctx.turnOffAuthorisationSystem();
             requestItem = ctx.reloadEntity(requestItem);
             if (null != requestItem) {
diff --git a/dspace-api/src/test/java/org/dspace/builder/ResourcePolicyBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ResourcePolicyBuilder.java
index cdb32270df..70b1f8d73d 100644
--- a/dspace-api/src/test/java/org/dspace/builder/ResourcePolicyBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/ResourcePolicyBuilder.java
@@ -41,6 +41,7 @@ public class ResourcePolicyBuilder extends AbstractBuilder<ResourcePolicy, Resou
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             resourcePolicy = c.reloadEntity(resourcePolicy);
@@ -81,6 +82,7 @@ public class ResourcePolicyBuilder extends AbstractBuilder<ResourcePolicy, Resou
     public void delete(ResourcePolicy rp) throws Exception {
         try (Context c = new Context()) {
             c.turnOffAuthorisationSystem();
+            c.setDispatcher("noindex");
             ResourcePolicy attachedDso = c.reloadEntity(rp);
             if (attachedDso != null) {
                 getService().delete(c, attachedDso);
diff --git a/dspace-api/src/test/java/org/dspace/builder/VersionBuilder.java b/dspace-api/src/test/java/org/dspace/builder/VersionBuilder.java
index 7295f2196f..7a2b718df6 100644
--- a/dspace-api/src/test/java/org/dspace/builder/VersionBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/VersionBuilder.java
@@ -11,7 +11,8 @@ import java.sql.SQLException;
 import java.util.Objects;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
@@ -26,7 +27,7 @@ import org.dspace.versioning.service.VersioningService;
  */
 public class VersionBuilder extends AbstractBuilder<Version, VersioningService> {
 
-    private static final Logger log = Logger.getLogger(VersionBuilder.class);
+    private static final Logger log = LogManager.getLogger(VersionBuilder.class);
 
     private Version version;
 
@@ -85,6 +86,7 @@ public class VersionBuilder extends AbstractBuilder<Version, VersioningService>
     public void delete(Version version) throws Exception {
         try (Context context = new Context()) {
             context.turnOffAuthorisationSystem();
+            context.setDispatcher("noindex");
             Version attachedTab = context.reloadEntity(version);
             if (attachedTab != null) {
                 getService().delete(context, attachedTab);
diff --git a/dspace-api/src/test/java/org/dspace/builder/WorkflowItemBuilder.java b/dspace-api/src/test/java/org/dspace/builder/WorkflowItemBuilder.java
index b4a3b930fb..e06819d0ca 100644
--- a/dspace-api/src/test/java/org/dspace/builder/WorkflowItemBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/WorkflowItemBuilder.java
@@ -116,6 +116,7 @@ public class WorkflowItemBuilder extends AbstractBuilder<XmlWorkflowItem, XmlWor
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             workspaceItem = c.reloadEntity(workspaceItem);
diff --git a/dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java b/dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java
index 416c3e8461..8b7bc2978b 100644
--- a/dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java
@@ -106,6 +106,7 @@ public class WorkspaceItemBuilder extends AbstractBuilder<WorkspaceItem, Workspa
     @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
+            c.setDispatcher("noindex");
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             workspaceItem = c.reloadEntity(workspaceItem);
@@ -176,14 +177,18 @@ public class WorkspaceItemBuilder extends AbstractBuilder<WorkspaceItem, Workspa
         return addMetadataValue(MetadataSchemaEnum.DC.getName(), "subject", null, subject);
     }
 
-    public WorkspaceItemBuilder withAbstract(final String subject) {
-        return addMetadataValue(MetadataSchemaEnum.DC.getName(),"description", "abstract", subject);
+    public WorkspaceItemBuilder withIssn(String issn) {
+        return addMetadataValue(MetadataSchemaEnum.DC.getName(), "identifier", "issn", issn);
     }
 
     public WorkspaceItemBuilder withEntityType(final String entityType) {
         return addMetadataValue("dspace", "entity", "type", entityType);
     }
 
+    public WorkspaceItemBuilder withAbstract(final String subject) {
+        return addMetadataValue(MetadataSchemaEnum.DC.getName(),"description", "abstract", subject);
+    }
+
     public WorkspaceItemBuilder grantLicense() {
         Item item = workspaceItem.getItem();
         String license;
diff --git a/dspace-api/src/test/java/org/dspace/builder/util/AbstractBuilderCleanupUtil.java b/dspace-api/src/test/java/org/dspace/builder/util/AbstractBuilderCleanupUtil.java
index 329beb9dfa..6a8daa432e 100644
--- a/dspace-api/src/test/java/org/dspace/builder/util/AbstractBuilderCleanupUtil.java
+++ b/dspace-api/src/test/java/org/dspace/builder/util/AbstractBuilderCleanupUtil.java
@@ -25,6 +25,9 @@ import org.dspace.builder.GroupBuilder;
 import org.dspace.builder.ItemBuilder;
 import org.dspace.builder.MetadataFieldBuilder;
 import org.dspace.builder.MetadataSchemaBuilder;
+import org.dspace.builder.OrcidHistoryBuilder;
+import org.dspace.builder.OrcidQueueBuilder;
+import org.dspace.builder.OrcidTokenBuilder;
 import org.dspace.builder.PoolTaskBuilder;
 import org.dspace.builder.ProcessBuilder;
 import org.dspace.builder.RelationshipBuilder;
@@ -56,6 +59,9 @@ public class AbstractBuilderCleanupUtil {
     }
 
     private void initMap() {
+        map.put(OrcidQueueBuilder.class.getName(), new ArrayList<>());
+        map.put(OrcidHistoryBuilder.class.getName(), new ArrayList<>());
+        map.put(OrcidTokenBuilder.class.getName(), new ArrayList<>());
         map.put(ResourcePolicyBuilder.class.getName(), new ArrayList<>());
         map.put(RelationshipBuilder.class.getName(), new ArrayList<>());
         map.put(RequestItemBuilder.class.getName(), new ArrayList<>());
diff --git a/dspace-api/src/test/java/org/dspace/content/ItemTest.java b/dspace-api/src/test/java/org/dspace/content/ItemTest.java
index 6af1cd5e02..15e425e23a 100644
--- a/dspace-api/src/test/java/org/dspace/content/ItemTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/ItemTest.java
@@ -19,6 +19,8 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.File;
@@ -41,6 +43,7 @@ import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamFormatService;
+import org.dspace.content.service.ItemService;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.MetadataSchemaService;
 import org.dspace.core.Constants;
@@ -679,7 +682,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
 
         String schema = "dc";
         String element = "contributor";
-        String qualifier = "author";
+        String qualifier = "editor";
         String lang = Item.ANY;
         String values = "value0";
         String authorities = "auth0";
@@ -1410,6 +1413,27 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         assertThat("testMove 1", it.getOwningCollection(), equalTo(to));
     }
 
+    /**
+     * Test of move method, of class Item, where both Collections are the same.
+     */
+    @Test
+    public void testMoveSameCollection() throws Exception {
+        context.turnOffAuthorisationSystem();
+        while (it.getCollections().size() > 1) {
+            it.removeCollection(it.getCollections().get(0));
+        }
+
+        Collection collection = it.getCollections().get(0);
+        it.setOwningCollection(collection);
+        ItemService itemServiceSpy = spy(itemService);
+
+        itemService.move(context, it, collection, collection);
+        context.restoreAuthSystemState();
+        assertThat("testMoveSameCollection 0", it.getOwningCollection(), notNullValue());
+        assertThat("testMoveSameCollection 1", it.getOwningCollection(), equalTo(collection));
+        verify(itemServiceSpy, times(0)).delete(context, it);
+    }
+
     /**
      * Test of hasUploadedFiles method, of class Item.
      */
diff --git a/dspace-api/src/test/java/org/dspace/content/LeftTiltedRelationshipMetadataServiceIT.java b/dspace-api/src/test/java/org/dspace/content/LeftTiltedRelationshipMetadataServiceIT.java
index 4aa0677bc5..1ba2bc73a5 100644
--- a/dspace-api/src/test/java/org/dspace/content/LeftTiltedRelationshipMetadataServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/content/LeftTiltedRelationshipMetadataServiceIT.java
@@ -8,6 +8,7 @@
 package org.dspace.content;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
@@ -71,19 +72,28 @@ public class LeftTiltedRelationshipMetadataServiceIT extends RelationshipMetadat
         //request the virtual metadata of the publication only
         List<RelationshipMetadataValue> leftList = relationshipMetadataService
             .getRelationshipMetadata(leftItem, true);
-        assertThat(leftList.size(), equalTo(2));
-        assertThat(leftList.get(0).getValue(), equalTo("familyName, firstName"));
-        assertThat(leftList.get(0).getMetadataField().getMetadataSchema().getName(), equalTo("dc"));
-        assertThat(leftList.get(0).getMetadataField().getElement(), equalTo("contributor"));
-        assertThat(leftList.get(0).getMetadataField().getQualifier(), equalTo("author"));
+        assertThat(leftList.size(), equalTo(3));
+
+        assertThat(leftList.get(0).getValue(), equalTo(String.valueOf(rightItem.getID())));
+        assertThat(leftList.get(0).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(leftList.get(0).getMetadataField().getElement(), equalTo("isAuthorOfPublication"));
+        assertThat(leftList.get(0).getMetadataField().getQualifier(), equalTo("latestForDiscovery"));
         assertThat(leftList.get(0).getAuthority(), equalTo("virtual::" + relationship.getID()));
 
-        assertThat(leftList.get(1).getValue(), equalTo(String.valueOf(rightItem.getID())));
-        assertThat(leftList.get(1).getMetadataField().getMetadataSchema().getName(),
-            equalTo(MetadataSchemaEnum.RELATION.getName()));
-        assertThat(leftList.get(1).getMetadataField().getElement(), equalTo("isAuthorOfPublication"));
+        assertThat(leftList.get(1).getValue(), equalTo("familyName, firstName"));
+        assertThat(leftList.get(1).getMetadataField().getMetadataSchema().getName(), equalTo("dc"));
+        assertThat(leftList.get(1).getMetadataField().getElement(), equalTo("contributor"));
+        assertThat(leftList.get(1).getMetadataField().getQualifier(), equalTo("author"));
         assertThat(leftList.get(1).getAuthority(), equalTo("virtual::" + relationship.getID()));
 
+        assertThat(leftList.get(2).getValue(), equalTo(String.valueOf(rightItem.getID())));
+        assertThat(leftList.get(2).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(leftList.get(2).getMetadataField().getElement(), equalTo("isAuthorOfPublication"));
+        assertThat(leftList.get(2).getMetadataField().getQualifier(), nullValue());
+        assertThat(leftList.get(2).getAuthority(), equalTo("virtual::" + relationship.getID()));
+
         // rightItem is the author
         List<MetadataValue> rightRelationshipMetadataList = itemService
             .getMetadata(rightItem, MetadataSchemaEnum.RELATION.getName(), "isPublicationOfAuthor", null, Item.ANY);
diff --git a/dspace-api/src/test/java/org/dspace/content/RelationshipMetadataServiceIT.java b/dspace-api/src/test/java/org/dspace/content/RelationshipMetadataServiceIT.java
index a1996a64fc..b0761946fe 100644
--- a/dspace-api/src/test/java/org/dspace/content/RelationshipMetadataServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/content/RelationshipMetadataServiceIT.java
@@ -8,6 +8,7 @@
 package org.dspace.content;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -186,19 +187,28 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
         //request the virtual metadata of the publication only
         List<RelationshipMetadataValue> leftList = relationshipMetadataService
             .getRelationshipMetadata(leftItem, true);
-        assertThat(leftList.size(), equalTo(2));
-        assertThat(leftList.get(0).getValue(), equalTo("familyName, firstName"));
-        assertThat(leftList.get(0).getMetadataField().getMetadataSchema().getName(), equalTo("dc"));
-        assertThat(leftList.get(0).getMetadataField().getElement(), equalTo("contributor"));
-        assertThat(leftList.get(0).getMetadataField().getQualifier(), equalTo("author"));
+        assertThat(leftList.size(), equalTo(3));
+
+        assertThat(leftList.get(0).getValue(), equalTo(String.valueOf(rightItem.getID())));
+        assertThat(leftList.get(0).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(leftList.get(0).getMetadataField().getElement(), equalTo("isAuthorOfPublication"));
+        assertThat(leftList.get(0).getMetadataField().getQualifier(), equalTo("latestForDiscovery"));
         assertThat(leftList.get(0).getAuthority(), equalTo("virtual::" + relationship.getID()));
 
-        assertThat(leftList.get(1).getValue(), equalTo(String.valueOf(rightItem.getID())));
-        assertThat(leftList.get(1).getMetadataField().getMetadataSchema().getName(),
-            equalTo(MetadataSchemaEnum.RELATION.getName()));
-        assertThat(leftList.get(1).getMetadataField().getElement(), equalTo("isAuthorOfPublication"));
+        assertThat(leftList.get(1).getValue(), equalTo("familyName, firstName"));
+        assertThat(leftList.get(1).getMetadataField().getMetadataSchema().getName(), equalTo("dc"));
+        assertThat(leftList.get(1).getMetadataField().getElement(), equalTo("contributor"));
+        assertThat(leftList.get(1).getMetadataField().getQualifier(), equalTo("author"));
         assertThat(leftList.get(1).getAuthority(), equalTo("virtual::" + relationship.getID()));
 
+        assertThat(leftList.get(2).getValue(), equalTo(String.valueOf(rightItem.getID())));
+        assertThat(leftList.get(2).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(leftList.get(2).getMetadataField().getElement(), equalTo("isAuthorOfPublication"));
+        assertThat(leftList.get(2).getMetadataField().getQualifier(), nullValue());
+        assertThat(leftList.get(2).getAuthority(), equalTo("virtual::" + relationship.getID()));
+
         // rightItem is the author
         List<MetadataValue> rightRelationshipMetadataList = itemService
             .getMetadata(rightItem, MetadataSchemaEnum.RELATION.getName(), "isPublicationOfAuthor", null, Item.ANY);
@@ -208,12 +218,21 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
         //request the virtual metadata of the publication
         List<RelationshipMetadataValue> rightList = relationshipMetadataService
             .getRelationshipMetadata(rightItem, true);
-        assertThat(rightList.size(), equalTo(1));
+        assertThat(rightList.size(), equalTo(2));
+
         assertThat(rightList.get(0).getValue(), equalTo(String.valueOf(leftItem.getID())));
         assertThat(rightList.get(0).getMetadataField().getMetadataSchema().getName(),
             equalTo(MetadataSchemaEnum.RELATION.getName()));
         assertThat(rightList.get(0).getMetadataField().getElement(), equalTo("isPublicationOfAuthor"));
+        assertThat(rightList.get(0).getMetadataField().getQualifier(), equalTo("latestForDiscovery"));
         assertThat(rightList.get(0).getAuthority(), equalTo("virtual::" + relationship.getID()));
+
+        assertThat(rightList.get(1).getValue(), equalTo(String.valueOf(leftItem.getID())));
+        assertThat(rightList.get(1).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(rightList.get(1).getMetadataField().getElement(), equalTo("isPublicationOfAuthor"));
+        assertThat(rightList.get(1).getMetadataField().getQualifier(), nullValue());
+        assertThat(rightList.get(1).getAuthority(), equalTo("virtual::" + relationship.getID()));
     }
 
     @Test
@@ -380,34 +399,52 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
         //request the virtual metadata of the journal issue
         List<RelationshipMetadataValue> issueRelList =
             relationshipMetadataService.getRelationshipMetadata(leftItem, true);
-        assertThat(issueRelList.size(), equalTo(2));
-        assertThat(issueRelList.get(0).getValue(), equalTo("30"));
-        assertThat(issueRelList.get(0).getMetadataField().getMetadataSchema().getName(), equalTo("publicationvolume"));
-        assertThat(issueRelList.get(0).getMetadataField().getElement(), equalTo("volumeNumber"));
-        assertThat(issueRelList.get(0).getMetadataField().getQualifier(), equalTo(null));
+        assertThat(issueRelList.size(), equalTo(3));
+
+        assertThat(issueRelList.get(0).getValue(), equalTo(String.valueOf(rightItem.getID())));
+        assertThat(issueRelList.get(0).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(issueRelList.get(0).getMetadataField().getElement(), equalTo("isJournalVolumeOfIssue"));
+        assertThat(issueRelList.get(0).getMetadataField().getQualifier(), equalTo("latestForDiscovery"));
         assertThat(issueRelList.get(0).getAuthority(), equalTo("virtual::" + relationship.getID()));
 
-        assertThat(issueRelList.get(1).getValue(), equalTo(String.valueOf(rightItem.getID())));
-        assertThat(issueRelList.get(1).getMetadataField().getMetadataSchema().getName(),
-            equalTo(MetadataSchemaEnum.RELATION.getName()));
-        assertThat(issueRelList.get(1).getMetadataField().getElement(), equalTo("isJournalVolumeOfIssue"));
+        assertThat(issueRelList.get(1).getValue(), equalTo("30"));
+        assertThat(issueRelList.get(1).getMetadataField().getMetadataSchema().getName(), equalTo("publicationvolume"));
+        assertThat(issueRelList.get(1).getMetadataField().getElement(), equalTo("volumeNumber"));
+        assertThat(issueRelList.get(1).getMetadataField().getQualifier(), equalTo(null));
         assertThat(issueRelList.get(1).getAuthority(), equalTo("virtual::" + relationship.getID()));
 
+        assertThat(issueRelList.get(2).getValue(), equalTo(String.valueOf(rightItem.getID())));
+        assertThat(issueRelList.get(2).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(issueRelList.get(2).getMetadataField().getElement(), equalTo("isJournalVolumeOfIssue"));
+        assertThat(issueRelList.get(2).getMetadataField().getQualifier(), nullValue());
+        assertThat(issueRelList.get(2).getAuthority(), equalTo("virtual::" + relationship.getID()));
+
         //request the virtual metadata of the journal volume
         List<RelationshipMetadataValue> volumeRelList =
             relationshipMetadataService.getRelationshipMetadata(rightItem, true);
-        assertThat(volumeRelList.size(), equalTo(2));
-        assertThat(volumeRelList.get(0).getValue(), equalTo("2"));
-        assertThat(volumeRelList.get(0).getMetadataField().getMetadataSchema().getName(), equalTo("publicationissue"));
-        assertThat(volumeRelList.get(0).getMetadataField().getElement(), equalTo("issueNumber"));
-        assertThat(volumeRelList.get(0).getMetadataField().getQualifier(), equalTo(null));
+        assertThat(volumeRelList.size(), equalTo(3));
+
+        assertThat(volumeRelList.get(0).getValue(), equalTo(String.valueOf(leftItem.getID())));
+        assertThat(volumeRelList.get(0).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(volumeRelList.get(0).getMetadataField().getElement(), equalTo("isIssueOfJournalVolume"));
+        assertThat(volumeRelList.get(0).getMetadataField().getQualifier(), equalTo("latestForDiscovery"));
         assertThat(volumeRelList.get(0).getAuthority(), equalTo("virtual::" + relationship.getID()));
 
-        assertThat(volumeRelList.get(1).getValue(), equalTo(String.valueOf(leftItem.getID())));
-        assertThat(volumeRelList.get(1).getMetadataField().getMetadataSchema().getName(),
-            equalTo(MetadataSchemaEnum.RELATION.getName()));
-        assertThat(volumeRelList.get(1).getMetadataField().getElement(), equalTo("isIssueOfJournalVolume"));
+        assertThat(volumeRelList.get(1).getValue(), equalTo("2"));
+        assertThat(volumeRelList.get(1).getMetadataField().getMetadataSchema().getName(), equalTo("publicationissue"));
+        assertThat(volumeRelList.get(1).getMetadataField().getElement(), equalTo("issueNumber"));
+        assertThat(volumeRelList.get(1).getMetadataField().getQualifier(), equalTo(null));
         assertThat(volumeRelList.get(1).getAuthority(), equalTo("virtual::" + relationship.getID()));
+
+        assertThat(volumeRelList.get(2).getValue(), equalTo(String.valueOf(leftItem.getID())));
+        assertThat(volumeRelList.get(2).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(volumeRelList.get(2).getMetadataField().getElement(), equalTo("isIssueOfJournalVolume"));
+        assertThat(volumeRelList.get(2).getMetadataField().getQualifier(), nullValue());
+        assertThat(volumeRelList.get(2).getAuthority(), equalTo("virtual::" + relationship.getID()));
     }
 
     @Test
@@ -614,45 +651,6 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
                 .size(), equalTo(1));
     }
 
-    @Test
-    public void testGetNextRightPlace() throws Exception {
-        assertThat(relationshipService.findNextRightPlaceByRightItem(context, rightItem), equalTo(0));
-        initPublicationAuthor();
-
-        assertThat(relationshipService.findNextRightPlaceByRightItem(context, rightItem), equalTo(1));
-
-        context.turnOffAuthorisationSystem();
-
-        Item secondItem = ItemBuilder.createItem(context, col).build();
-        RelationshipBuilder.createRelationshipBuilder(context, secondItem, rightItem,
-            isAuthorOfPublicationRelationshipType).build();
-        context.restoreAuthSystemState();
-
-        assertThat(relationshipService.findNextRightPlaceByRightItem(context, rightItem), equalTo(2));
-    }
-
-    @Test
-    public void testGetNextLeftPlace() throws Exception {
-        assertThat(relationshipService.findNextLeftPlaceByLeftItem(context, leftItem), equalTo(0));
-        initPublicationAuthor();
-
-        assertThat(relationshipService.findNextLeftPlaceByLeftItem(context, leftItem), equalTo(1));
-
-        context.turnOffAuthorisationSystem();
-
-        Item secondAuthor = ItemBuilder.createItem(context, col2)
-                                       .withPersonIdentifierFirstName("firstName")
-                                       .withPersonIdentifierLastName("familyName").build();
-
-        RelationshipBuilder.createRelationshipBuilder(context, leftItem, secondAuthor,
-            isAuthorOfPublicationRelationshipType).build();
-        context.restoreAuthSystemState();
-
-        assertThat(relationshipService.findNextLeftPlaceByLeftItem(context, leftItem), equalTo(2));
-
-
-    }
-
     @Test
     public void testGetVirtualMetadata() throws SQLException, AuthorizeException {
         // Journal, JournalVolume, JournalIssue, Publication items, related to each other using the relationship types
diff --git a/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java b/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java
index 305de076a2..3e36f77c68 100644
--- a/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java
@@ -9,11 +9,15 @@ package org.dspace.content;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import java.sql.SQLException;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractUnitTest;
 import org.dspace.authorize.AuthorizeException;
@@ -27,6 +31,7 @@ import org.dspace.content.service.MetadataValueService;
 import org.dspace.content.service.RelationshipService;
 import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.core.Constants;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,6 +44,8 @@ public class RelationshipServiceImplPlaceTest extends AbstractUnitTest {
     protected RelationshipService relationshipService = ContentServiceFactory.getInstance().getRelationshipService();
     protected RelationshipTypeService relationshipTypeService = ContentServiceFactory.getInstance()
                                                                                      .getRelationshipTypeService();
+    protected RelationshipMetadataService relationshipMetadataService =
+        ContentServiceFactory.getInstance().getRelationshipMetadataService();
     protected EntityTypeService entityTypeService = ContentServiceFactory.getInstance().getEntityTypeService();
     protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
     protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
@@ -52,9 +59,33 @@ public class RelationshipServiceImplPlaceTest extends AbstractUnitTest {
 
     Item item;
     Item authorItem;
+
+    Item author1;
+    Item author2;
+    Item author3;
+    Item author4;
+    Item author5;
+    Item author6;
+    Item publication1;
+    Item publication2;
+    Item publication3;
+    Item publication4;
+    Item publication5;
+    Item publication6;
+    Item project1;
+    Item project2;
+    Item project3;
+    Item project4;
+    Item project5;
+    Item project6;
+
     RelationshipType isAuthorOfPublication;
+    RelationshipType isProjectOfPublication;
+    RelationshipType isProjectOfPerson;
+
     EntityType publicationEntityType;
-    EntityType authorEntityType;
+    EntityType projectEntityType;
+    EntityType personEntityType;
 
     String authorQualifier = "author";
     String contributorElement = "contributor";
@@ -84,12 +115,120 @@ public class RelationshipServiceImplPlaceTest extends AbstractUnitTest {
             itemService.addMetadata(context, authorItem, "person", "familyName", null, null, "familyName");
             itemService.addMetadata(context, authorItem, "person", "givenName", null, null, "firstName");
 
+            WorkspaceItem wi;
+
+            wi = workspaceItemService.create(context, col, false);
+            author1 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, author1, "dspace", "entity", "type", null, "Person");
+            itemService.addMetadata(context, author1, "person", "familyName", null, null, "Author");
+            itemService.addMetadata(context, author1, "person", "givenName", null, null, "First");
+
+            wi = workspaceItemService.create(context, col, false);
+            author2 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, author2, "dspace", "entity", "type", null, "Person");
+            itemService.addMetadata(context, author2, "person", "familyName", null, null, "Author");
+            itemService.addMetadata(context, author2, "person", "givenName", null, null, "Second");
+
+            wi = workspaceItemService.create(context, col, false);
+            author3 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, author3, "dspace", "entity", "type", null, "Person");
+            itemService.addMetadata(context, author3, "person", "familyName", null, null, "Author");
+            itemService.addMetadata(context, author3, "person", "givenName", null, null, "Third");
+
+            wi = workspaceItemService.create(context, col, false);
+            author4 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, author4, "dspace", "entity", "type", null, "Person");
+            itemService.addMetadata(context, author4, "person", "familyName", null, null, "Author");
+            itemService.addMetadata(context, author4, "person", "givenName", null, null, "Fourth");
+
+            wi = workspaceItemService.create(context, col, false);
+            author5 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, author5, "dspace", "entity", "type", null, "Person");
+            itemService.addMetadata(context, author5, "person", "familyName", null, null, "Author");
+            itemService.addMetadata(context, author5, "person", "givenName", null, null, "Fifth");
+
+            wi = workspaceItemService.create(context, col, false);
+            author6 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, author6, "dspace", "entity", "type", null, "Person");
+            itemService.addMetadata(context, author6, "person", "familyName", null, null, "Author");
+            itemService.addMetadata(context, author6, "person", "givenName", null, null, "Sixth");
+
+            wi = workspaceItemService.create(context, col, false);
+            publication1 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, publication1, "dspace", "entity", "type", null, "Publication");
+            itemService.addMetadata(context, publication1, "dc", "title", null, null, "Publication 1");
+
+            wi = workspaceItemService.create(context, col, false);
+            publication2 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, publication2, "dspace", "entity", "type", null, "Publication");
+            itemService.addMetadata(context, publication2, "dc", "title", null, null, "Publication 2");
+
+            wi = workspaceItemService.create(context, col, false);
+            publication3 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, publication3, "dspace", "entity", "type", null, "Publication");
+            itemService.addMetadata(context, publication3, "dc", "title", null, null, "Publication 3");
+
+            wi = workspaceItemService.create(context, col, false);
+            publication4 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, publication4, "dspace", "entity", "type", null, "Publication");
+            itemService.addMetadata(context, publication4, "dc", "title", null, null, "Publication 4");
+
+            wi = workspaceItemService.create(context, col, false);
+            publication5 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, publication5, "dspace", "entity", "type", null, "Publication");
+            itemService.addMetadata(context, publication5, "dc", "title", null, null, "Publication 5");
+
+            wi = workspaceItemService.create(context, col, false);
+            publication6 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, publication6, "dspace", "entity", "type", null, "Publication");
+            itemService.addMetadata(context, publication6, "dc", "title", null, null, "Publication 6");
+
+            wi = workspaceItemService.create(context, col, false);
+            project1 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, project1, "dspace", "entity", "type", null, "Project");
+            itemService.addMetadata(context, project1, "dc", "title", null, null, "Project 1");
+
+            wi = workspaceItemService.create(context, col, false);
+            project2 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, project2, "dspace", "entity", "type", null, "Project");
+            itemService.addMetadata(context, project2, "dc", "title", null, null, "Project 2");
+
+            wi = workspaceItemService.create(context, col, false);
+            project3 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, project3, "dspace", "entity", "type", null, "Project");
+            itemService.addMetadata(context, project3, "dc", "title", null, null, "Project 3");
+
+            wi = workspaceItemService.create(context, col, false);
+            project4 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, project4, "dspace", "entity", "type", null, "Project");
+            itemService.addMetadata(context, project4, "dc", "title", null, null, "Project 4");
+
+            wi = workspaceItemService.create(context, col, false);
+            project5 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, project5, "dspace", "entity", "type", null, "Project");
+            itemService.addMetadata(context, project5, "dc", "title", null, null, "Project 5");
+
+            wi = workspaceItemService.create(context, col, false);
+            project6 = installItemService.installItem(context, wi);
+            itemService.addMetadata(context, project6, "dspace", "entity", "type", null, "Project");
+            itemService.addMetadata(context, project6, "dc", "title", null, null, "Project 6");
+
+
             publicationEntityType = entityTypeService.create(context, "Publication");
-            authorEntityType = entityTypeService.create(context, "Person");
+            projectEntityType = entityTypeService.create(context, "Project");
+            personEntityType = entityTypeService.create(context, "Person");
             isAuthorOfPublication = relationshipTypeService
-                .create(context, publicationEntityType, authorEntityType,
+                .create(context, publicationEntityType, personEntityType,
                         "isAuthorOfPublication", "isPublicationOfAuthor",
                         null, null, null, null);
+            isProjectOfPublication = relationshipTypeService
+                .create(context, publicationEntityType, projectEntityType,
+                    "isProjectOfPublication", "isPublicationOfProject",
+                    null, null, null, null);
+            isProjectOfPerson = relationshipTypeService
+                .create(context, personEntityType, projectEntityType,
+                        "isProjectOfPerson", "isPersonOfProject",
+                        null, null, null, null);
 
             context.restoreAuthSystemState();
         } catch (AuthorizeException ex) {
@@ -226,7 +365,7 @@ public class RelationshipServiceImplPlaceTest extends AbstractUnitTest {
         itemService.addMetadata(context, secondAuthorItem, "person", "familyName", null, null, "familyNameTwo");
         itemService.addMetadata(context, secondAuthorItem, "person", "givenName", null, null, "firstNameTwo");
         Relationship relationshipTwo = relationshipService
-            .create(context, item, secondAuthorItem, isAuthorOfPublication, 5, -1);
+            .create(context, item, secondAuthorItem, isAuthorOfPublication, 1, -1);
 
         context.restoreAuthSystemState();
 
@@ -234,16 +373,19 @@ public class RelationshipServiceImplPlaceTest extends AbstractUnitTest {
         list = itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
 
         assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list.get(0));
-        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 1, list.get(1));
-        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "familyName, firstName",
-                            "virtual::" + relationship.getID(), 2, list.get(2));
-        assertThat(relationship.getLeftPlace(), equalTo(2));
 
-        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list.get(3));
-        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 4, list.get(4));
         assertMetadataValue(authorQualifier, contributorElement, dcSchema, "familyNameTwo, firstNameTwo",
-                            "virtual::" + relationshipTwo.getID(), 5, list.get(5));
-        assertThat(relationshipTwo.getLeftPlace(), equalTo(5));
+                            "virtual::" + relationshipTwo.getID(), 1, list.get(1));
+        assertThat(relationshipTwo.getLeftPlace(), equalTo(1));
+
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 2, list.get(2));
+
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "familyName, firstName",
+                            "virtual::" + relationship.getID(), 3, list.get(3));
+        assertThat(relationship.getLeftPlace(), equalTo(3));
+
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 4, list.get(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 5, list.get(5));
 
     }
 
@@ -425,4 +567,2768 @@ public class RelationshipServiceImplPlaceTest extends AbstractUnitTest {
     }
 
 
+    /* RelationshipService#create */
+
+    @Test
+    public void createUseForPlaceRelationshipAppendingLeftNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithLeftPlaceAtTheStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // Add another Author @ leftPlace 0. The existing relationships should get pushed one place forward
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, 0, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r3, 0);
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r3, r1, r2));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithLeftPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // Add another Author @ leftPlace 1. The second relationship should get pushed by one place
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, 1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithLeftPlaceAtTheEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // Add another Author @ leftPlace 2. This should have the same effect as just appending it
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, 2, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipAppendingLeftWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add a dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+
+        // Add two Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // Add another dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+
+        // Add another Author to the same Publication, appending to the end
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r2, 2);
+        assertLeftPlace(r3, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "MDV 1",
+            "Author, First",
+            "Author, Second",
+            "MDV 2",
+            "Author, Third"
+        ));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithLeftPlaceAtTheStartWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add a dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+
+        // Add two Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // Add another dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+
+        // Add another Author @ leftPlace 0. All MDVs & relationships after it should get pushed by one place
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, 0, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r3, 0);
+        assertLeftPlace(r1, 2);
+        assertLeftPlace(r2, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r3, r1, r2));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, Third",
+            "MDV 1",
+            "Author, First",
+            "Author, Second",
+            "MDV 2"
+        ));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithLeftPlaceInTheMiddleWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add a dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+
+        // Add two Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // Add another dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+
+        // Add another Author @ leftPlace 2. All MDVs & relationships after it should get pushed by one place
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, 2, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r3, 2);
+        assertLeftPlace(r2, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3, r2));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "MDV 1",
+            "Author, First",
+            "Author, Third",
+            "Author, Second",
+            "MDV 2"
+        ));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithLeftPlaceInTheMiddleWithMetadataTest_ignoreOtherRels(
+    ) throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add a dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+
+        // Add two Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        // Add another dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, author2, project2, isProjectOfPerson, -1, -1);
+
+        // Add another Author @ leftPlace 2. All MDVs & relationships after it should get pushed by one place
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, 2, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r3, 2);
+        assertLeftPlace(r2, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3, r2));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "MDV 1",
+            "Author, First",
+            "Author, Third",
+            "Author, Second",
+            "MDV 2"
+        ));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 0);
+        assertRightPlace(ur2, 0);
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithLeftPlaceAtTheEndWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add a dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+
+        // Add two Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // Add another dc.contributor.author MDV
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+
+        // Add another Author @ leftPlace 4. This should have the same effect as just appending it
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, 4, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r2, 2);
+        assertLeftPlace(r3, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "MDV 1",
+            "Author, First",
+            "Author, Second",
+            "MDV 2",
+            "Author, Third"
+        ));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipAppendingRightNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithRightPlaceAtTheStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+
+        // Add another Publication @ rightPlace 0. The existing relationships should get pushed one place forward
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, 0);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r3, 0);
+        assertRightPlace(r1, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r3, r1, r2));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithRightPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+
+        // Add another Publication @ rightPlace 1. The second relationship should get pushed by one place
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithRightPlaceInTheMiddleNoMetadataTest_ignoreOtherRels(
+    ) throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+
+        // Add another Publication @ rightPlace 1. The second relationship should get pushed by one place
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r3, r2));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 1);
+        assertRightPlace(ur2, 0);
+    }
+
+    @Test
+    public void createUseForPlaceRelationshipWithRightPlaceAtTheEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+
+        // Add another Publication @ rightPlace 2. This should have the same effect as just appending it
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, 2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipAppendingLeftTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipWithLeftPlaceAtTheStartTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+
+        // Add another Project @ leftPlace 0. The existing relationships should get pushed one place forward
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, 0, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r3, 0);
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r3, r1, r2));
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipWithLeftPlaceInTheMiddleTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+
+        // Add another Project @ leftPlace 1. The second relationship should get pushed by one place
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, 1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipWithLeftPlaceInTheMiddleTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+
+        // Add another Project @ leftPlace 1. The second relationship should get pushed by one place
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, 1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r3, r2));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipWithLeftPlaceAtTheEndTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+
+        // Add another Project @ leftPlace 2. This should have the same effect as just appending it
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, 2, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipAppendingRightTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipWithRightPlaceAtTheStartTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // Add another Author @ rightPlace 0. The existing relationships should get pushed one place forward
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, 0);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r3, 0);
+        assertRightPlace(r1, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r3, r1, r2));
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipWithRightPlaceInTheMiddleTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // Add another Author @ rightPlace 1. The second relationship should get pushed by one place
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipWithRightPlaceInTheMiddleTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // Add another Author @ rightPlace 1. The second relationship should get pushed by one place
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, 1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r3, r2));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+    }
+
+    @Test
+    public void createNonUseForPlaceRelationshipWithRightPlaceAtTheEndTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add two Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // Add another Author @ rightPlace 2. This should have the same effect as just appending it
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, 2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r2, r3));
+    }
+
+    /* RelationshipService#move */
+
+    @Test
+    public void moveUseForPlaceRelationshipToCurrentLeftPlaceNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.move(context, r1, 0, null);
+        relationshipService.move(context, r2, 1, null);
+        relationshipService.move(context, r3, 2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToLeftPlaceAtTheStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.move(context, r3, 0, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r3, 0);
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r3, r1, r2));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipUpToLeftPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to leftPlace=1
+        relationshipService.move(context, r1, 1, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r1, r3));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipDownToLeftPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the last Author to leftPlace=1
+        relationshipService.move(context, r3, 1, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToLeftPlaceAtTheEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, -1, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r1, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r3, r1));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToLeftPlaceAtTheEndOverlapNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, 2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r1, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r3, r1));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToCurrentLeftPlaceWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.move(context, r1, 1, null);
+        relationshipService.move(context, r2, 2, null);
+        relationshipService.move(context, r3, 4, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r2, 2);
+        assertLeftPlace(r3, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "MDV 1",
+            "Author, First",
+            "Author, Second",
+            "MDV 2",
+            "Author, Third"
+        ));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToLeftPlaceAtTheStartWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.move(context, r3, 0, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r3, 0);
+        assertLeftPlace(r1, 2);
+        assertLeftPlace(r2, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r3, r1, r2));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, Third",
+            "MDV 1",
+            "Author, First",
+            "Author, Second",
+            "MDV 2"
+        ));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipUpToLeftPlaceInTheMiddleWithTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to leftPlace=3
+        relationshipService.move(context, r1, 3, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r1, 3);
+        assertLeftPlace(r3, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r1, r3));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipUpToLeftPlaceInTheMiddleWithTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        // Initialize MDVs and Relationships
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, publication1, project2, isProjectOfPublication, -1, -1);
+
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to leftPlace=3
+        relationshipService.move(context, r1, 3, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r1, 3);
+        assertLeftPlace(r3, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r1, r3));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 1);
+        assertRightPlace(ur2, 0);
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipDownToLeftPlaceInTheMiddleWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the last Author to leftPlace=2
+        relationshipService.move(context, r3, 2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r3, 2);
+        assertLeftPlace(r2, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipDownToLeftPlaceInTheMiddleWithMetadataTest_ignoreOtherRels(
+    ) throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, author2, project2, isProjectOfPerson, -1, -1);
+
+        // Move the last Author to leftPlace=2
+        relationshipService.move(context, r3, 2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r3, 2);
+        assertLeftPlace(r2, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3, r2));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 0);
+        assertRightPlace(ur2, 0);
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToLeftPlaceAtTheEndWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, -1, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 3);
+        assertLeftPlace(r1, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r3, r1));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToLeftPlaceAtTheEndOverlapWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, 4, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 3);
+        assertLeftPlace(r1, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r3, r1));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToCurrentRightPlaceNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+
+        relationshipService.move(context, r1, null, 0);
+        relationshipService.move(context, r2, null, 1);
+        relationshipService.move(context, r3, null, 2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToRightPlaceAtTheStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+
+        relationshipService.move(context, r3, null, 0);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r3, 0);
+        assertRightPlace(r1, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r3, r1, r2));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipUpToRightPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to leftPlace=1
+        relationshipService.move(context, r1, null, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r2, 0);
+        assertRightPlace(r1, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r2, r1, r3));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipDownToRightPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Move the last Author to leftPlace=1
+        relationshipService.move(context, r3, null, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToRightPlaceAtTheEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, null, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r2, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r1, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r2, r3, r1));
+    }
+
+    @Test
+    public void moveUseForPlaceRelationshipToRightPlaceAtTheEndOverlapNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, null, 2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r2, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r1, 2);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r2, r3, r1));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipToCurrentLeftPlaceNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Move the last Project to the front
+        relationshipService.move(context, r1, 0, null);
+        relationshipService.move(context, r2, 1, null);
+        relationshipService.move(context, r3, 2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipToLeftPlaceAtTheStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Move the last Project to the front
+        relationshipService.move(context, r3, 0, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r3, 0);
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r3, r1, r2));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipUpToLeftPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Move the first Author to leftPlace=1
+        relationshipService.move(context, r1, 1, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r1, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r2, r1, r3));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipDownToLeftPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Move the last Author to leftPlace=1
+        relationshipService.move(context, r3, 1, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipToLeftPlaceAtTheEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, -1, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r1, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r2, r3, r1));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipToLeftPlaceAtTheEndOverlapNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, 2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r3, 1);
+        assertLeftPlace(r1, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r2, r3, r1));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipToCurrentRightPlaceNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+
+        relationshipService.move(context, r1, null, 0);
+        relationshipService.move(context, r2, null, 1);
+        relationshipService.move(context, r3, null, 2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipToRightPlaceAtTheStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+
+        relationshipService.move(context, r3, null, 0);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r3, 0);
+        assertRightPlace(r1, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r3, r1, r2));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipUpToRightPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Move the first Author to leftPlace=1
+        relationshipService.move(context, r1, null, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r2, 0);
+        assertRightPlace(r1, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r2, r1, r3));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipUpToRightPlaceInTheMiddleNoMetadataTest_ignoreOtherRels(
+    ) throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, publication2, project1, isProjectOfPublication, -1, -1);
+
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur3 = relationshipService.create(context, publication3, project1, isProjectOfPublication, -1, -1);
+
+        // Move the first Author to leftPlace=1
+        relationshipService.move(context, r1, null, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r2, 0);
+        assertRightPlace(r1, 1);
+        assertRightPlace(r3, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r2, r1, r3));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 0);
+        assertRightPlace(ur2, 1);
+        assertLeftPlace(ur3, 0);
+        assertRightPlace(ur3, 2);
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipDownToRightPlaceInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Move the last Author to leftPlace=1
+        relationshipService.move(context, r3, null, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r3, r2));
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipDownToRightPlaceInTheMiddleNoMetadataTest_ignoreOtherRels(
+    ) throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Move the last Author to leftPlace=1
+        relationshipService.move(context, r3, null, 1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r2, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r3, r2));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+    }
+
+    @Test
+    public void moveNonUseForPlaceRelationshipToRightPlaceAtTheEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Move the first Author to the back
+        relationshipService.move(context, r1, null, -1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r2, 0);
+        assertRightPlace(r3, 1);
+        assertRightPlace(r1, 2);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r2, r3, r1));
+    }
+
+    /* RelationshipService#delete */
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Delete the first Author
+        relationshipService.delete(context, r1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r3, 1);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r3));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Delete the second Author
+        relationshipService.delete(context, r2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Publication, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Delete the third Author
+        relationshipService.delete(context, r3);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftStartWithMetadataNoCopyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.delete(context, r1, false, false);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "MDV 1",
+            "Author, Second",
+            "MDV 2",
+            "Author, Third"
+        ));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftStartWithMetadataCopyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.delete(context, r1, true, false);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        // NOTE: since R1 has been removed, but copied to left, this place remains at 2 (instead of 1)
+        assertLeftPlace(r2, 2);
+        // NOTE: since R1 has been removed, but copied to left, this place remains at 4 (instead of 3)
+        assertLeftPlace(r3, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, Arrays.asList(null, r2, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",    // this is not longer a relationship
+            "MDV 1",
+            "Author, Second",
+            "MDV 2",
+            "Author, Third"
+        ));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftMiddleWithMetadataNoCopyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.delete(context, r2, false, false);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, Arrays.asList(r1, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "MDV 2",
+            "Author, Third"
+        ));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftMiddleWithMetadataNoCopyTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.delete(context, r2, false, false);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, Arrays.asList(r1, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "MDV 2",
+            "Author, Third"
+        ));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftMiddleWithMetadataCopyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.delete(context, r2, true, false);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        // NOTE: since R2 has been removed, but copied to left, this place remains at 4 (instead of 3)
+        assertLeftPlace(r3, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, Arrays.asList(r1, null, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "Author, Second",   // this is not longer a relationship
+            "MDV 2",
+            "Author, Third"
+        ));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftMiddleWithMetadataCopyTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, publication1, project2, isProjectOfPublication, -1, -1);
+
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur3 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.delete(context, r2, true, false);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        // NOTE: since R2 has been removed, but copied to left, this place remains at 4 (instead of 3)
+        assertLeftPlace(r3, 4);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, Arrays.asList(r1, null, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "Author, Second",   // this is not longer a relationship
+            "MDV 2",
+            "Author, Third"
+        ));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 1);
+        assertRightPlace(ur2, 0);
+        assertLeftPlace(ur3, 0);
+        assertRightPlace(ur3, 0);
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftEndWithMetadataNoCopyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+
+        relationshipService.delete(context, r3, false, false);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, Arrays.asList(r1, r2));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "Author, Second",
+            "MDV 2"
+        ));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromLeftEndWithMetadataCopyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Initialize MDVs and Relationships
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        relationshipService.delete(context, r3, true, false);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, Arrays.asList(r1, r2, null));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "Author, Second",
+            "MDV 2",
+            "Author, Third"     // this is not longer a relationship
+        ));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromRightStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Delete the first Publication
+        relationshipService.delete(context, r1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r2, 0);
+        assertRightPlace(r3, 1);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r2, r3));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromRightMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Delete the second Publication
+        relationshipService.delete(context, r2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r3));
+    }
+
+    @Test
+    public void deleteUseForPlaceRelationshipFromRightEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Delete the third Publication
+        relationshipService.delete(context, r3);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r2));
+    }
+
+    @Test
+    public void deleteNonUseForPlaceRelationshipFromLeftStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Delete the first Author
+        relationshipService.delete(context, r1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r3, 1);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r2, r3));
+    }
+
+    @Test
+    public void deleteNonUseForPlaceRelationshipFromLeftMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Delete the second Author
+        relationshipService.delete(context, r2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r3));
+    }
+
+    @Test
+    public void deleteNonUseForPlaceRelationshipFromLeftEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to the same Author, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Delete the third Author
+        relationshipService.delete(context, r3);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r2));
+    }
+
+    @Test
+    public void deleteNonUseForPlaceRelationshipFromRightStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Delete the first Publication
+        relationshipService.delete(context, r1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r2, 0);
+        assertRightPlace(r3, 1);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r2, r3));
+    }
+
+    @Test
+    public void deleteNonUseForPlaceRelationshipFromRightMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Delete the second Publication
+        relationshipService.delete(context, r2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r3));
+    }
+
+    @Test
+    public void deleteNonUseForPlaceRelationshipFromRightMiddleNoMetadataTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Delete the second Publication
+        relationshipService.delete(context, r2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r3));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+    }
+
+    @Test
+    public void deleteNonUseForPlaceRelationshipFromRightEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to the same Project, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Delete the third Publication
+        relationshipService.delete(context, r3);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r2));
+    }
+
+    @Test
+    public void changeLeftItemInUseForPlaceRelationshipAtTheStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to publication1, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Add three Authors to publication2, appending to the end
+        Relationship r4 = relationshipService.create(context, publication2, author4, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication2, author5, isAuthorOfPublication, -1, -1);
+        Relationship r6 = relationshipService.create(context, publication2, author6, isAuthorOfPublication, -1, -1);
+
+        // Move r1 to publication 2
+        relationshipService.move(context, r1, publication2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for publication1
+        assertLeftPlace(r2, 0);     // should both move down as the first Relationship was removed
+        assertLeftPlace(r3, 1);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r3));
+
+        // Check relationship order for publication2
+        assertLeftPlace(r4, 0);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 1);
+        assertLeftPlace(r6, 2);
+        assertLeftPlace(r1, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(publication2, isAuthorOfPublication, List.of(r4, r5, r6, r1));
+    }
+
+    @Test
+    public void changeLeftItemInUseForPlaceRelationshipInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to publication1, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Add three Authors to publication2, appending to the end
+        Relationship r4 = relationshipService.create(context, publication2, author4, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication2, author5, isAuthorOfPublication, -1, -1);
+        Relationship r6 = relationshipService.create(context, publication2, author6, isAuthorOfPublication, -1, -1);
+
+        // Move r2 to publication 2
+        relationshipService.move(context, r2, publication2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for publication1
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);     // should move down as the second Relationship was removed
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3));
+
+        // Check relationship order for publication2
+        assertLeftPlace(r4, 0);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 1);
+        assertLeftPlace(r6, 2);
+        assertLeftPlace(r2, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(publication2, isAuthorOfPublication, List.of(r4, r5, r6, r2));
+    }
+
+    @Test
+    public void changeLeftItemInUseForPlaceRelationshipAtTheEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to publication1, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Add three Authors to publication2, appending to the end
+        Relationship r4 = relationshipService.create(context, publication2, author4, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication2, author5, isAuthorOfPublication, -1, -1);
+        Relationship r6 = relationshipService.create(context, publication2, author6, isAuthorOfPublication, -1, -1);
+
+        // Move r3 to publication 2
+        relationshipService.move(context, r3, publication2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for publication1
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2));
+
+        // Check relationship order for publication2
+        assertLeftPlace(r4, 0);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 1);
+        assertLeftPlace(r6, 2);
+        assertLeftPlace(r3, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(publication2, isAuthorOfPublication, List.of(r4, r5, r6, r3));
+    }
+
+    @Test
+    public void changeLeftItemInUseForPlaceRelationshipAtTheStartWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to publication1, with regular MDVs in between
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Add three Authors to publication2, with regular MDVs in between
+        itemService.addMetadata(context, publication2, dcSchema, contributorElement, authorQualifier, null, "MDV 3");
+        Relationship r4 = relationshipService.create(context, publication2, author4, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication2, author5, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication2, dcSchema, contributorElement, authorQualifier, null, "MDV 4");
+        Relationship r6 = relationshipService.create(context, publication2, author6, isAuthorOfPublication, -1, -1);
+
+        // Move r1 to publication 2
+        relationshipService.move(context, r1, publication2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for publication1
+        assertLeftPlace(r2, 1);     // should both move down as the first Relationship was removed
+        assertLeftPlace(r3, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r2, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "MDV 1",
+            "Author, Second",
+            "MDV 2",
+            "Author, Third"
+        ));
+
+        // Check relationship order for publication2
+        assertLeftPlace(r4, 1);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 2);
+        assertLeftPlace(r6, 4);
+        assertLeftPlace(r1, 5);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(publication2, isAuthorOfPublication, List.of(r4, r5, r6, r1));
+        assertMetadataOrder(publication2, "dc.contributor.author", List.of(
+            "MDV 3",
+            "Author, Fourth",
+            "Author, Fifth",
+            "MDV 4",
+            "Author, Sixth",
+            "Author, First"
+        ));
+    }
+
+    @Test
+    public void changeLeftItemInUseForPlaceRelationshipInTheMiddleWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to publication1, with regular MDVs in between
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Add three Authors to publication2, with regular MDVs in between
+        itemService.addMetadata(context, publication2, dcSchema, contributorElement, authorQualifier, null, "MDV 3");
+        Relationship r4 = relationshipService.create(context, publication2, author4, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication2, author5, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication2, dcSchema, contributorElement, authorQualifier, null, "MDV 4");
+        Relationship r6 = relationshipService.create(context, publication2, author6, isAuthorOfPublication, -1, -1);
+
+        // Move r2 to publication 2
+        relationshipService.move(context, r2, publication2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for publication1
+        assertLeftPlace(r1, 0);     // should both move down as the first Relationship was removed
+        assertLeftPlace(r3, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "MDV 2",
+            "Author, Third"
+        ));
+
+        // Check relationship order for publication2
+        assertLeftPlace(r4, 1);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 2);
+        assertLeftPlace(r6, 4);
+        assertLeftPlace(r2, 5);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(publication2, isAuthorOfPublication, List.of(r4, r5, r6, r2));
+        assertMetadataOrder(publication2, "dc.contributor.author", List.of(
+            "MDV 3",
+            "Author, Fourth",
+            "Author, Fifth",
+            "MDV 4",
+            "Author, Sixth",
+            "Author, Second"
+        ));
+    }
+
+    @Test
+    public void changeLeftItemInUseForPlaceRelationshipInTheMiddleWithMetadataTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to publication1, with regular MDVs in between
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, publication1, project3, isProjectOfPublication, -1, -1);
+
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur3 = relationshipService.create(context, publication2, project2, isProjectOfPublication, -1, -1);
+
+        // Add three Authors to publication2, with regular MDVs in between
+        itemService.addMetadata(context, publication2, dcSchema, contributorElement, authorQualifier, null, "MDV 3");
+        Relationship r4 = relationshipService.create(context, publication2, author4, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication2, author5, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur4 = relationshipService.create(context, publication2, project1, isProjectOfPublication, -1, -1);
+
+        itemService.addMetadata(context, publication2, dcSchema, contributorElement, authorQualifier, null, "MDV 4");
+        Relationship r6 = relationshipService.create(context, publication2, author6, isAuthorOfPublication, -1, -1);
+
+        // Move r2 to publication 2
+        relationshipService.move(context, r2, publication2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for publication1
+        assertLeftPlace(r1, 0);     // should both move down as the first Relationship was removed
+        assertLeftPlace(r3, 3);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r3));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "MDV 2",
+            "Author, Third"
+        ));
+
+        // Check relationship order for publication2
+        assertLeftPlace(r4, 1);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 2);
+        assertLeftPlace(r6, 4);
+        assertLeftPlace(r2, 5);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(publication2, isAuthorOfPublication, List.of(r4, r5, r6, r2));
+        assertMetadataOrder(publication2, "dc.contributor.author", List.of(
+            "MDV 3",
+            "Author, Fourth",
+            "Author, Fifth",
+            "MDV 4",
+            "Author, Sixth",
+            "Author, Second"
+        ));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 1);
+        assertRightPlace(ur2, 0);
+        assertLeftPlace(ur3, 0);
+        assertRightPlace(ur3, 0);
+        assertLeftPlace(ur4, 1);
+        assertRightPlace(ur4, 1);
+    }
+
+    @Test
+    public void changeLeftItemInUseForPlaceRelationshipAtTheEndWithMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to publication1, with regular MDVs in between
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 1");
+        Relationship r2 = relationshipService.create(context, publication1, author2, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication1, dcSchema, contributorElement, authorQualifier, null, "MDV 2");
+        Relationship r3 = relationshipService.create(context, publication1, author3, isAuthorOfPublication, -1, -1);
+
+        // Add three Authors to publication2, with regular MDVs in between
+        itemService.addMetadata(context, publication2, dcSchema, contributorElement, authorQualifier, null, "MDV 3");
+        Relationship r4 = relationshipService.create(context, publication2, author4, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication2, author5, isAuthorOfPublication, -1, -1);
+        itemService.addMetadata(context, publication2, dcSchema, contributorElement, authorQualifier, null, "MDV 4");
+        Relationship r6 = relationshipService.create(context, publication2, author6, isAuthorOfPublication, -1, -1);
+
+        // Move r3 to publication 2
+        relationshipService.move(context, r3, publication2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for publication1
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 2);
+        assertRelationMetadataOrder(publication1, isAuthorOfPublication, List.of(r1, r2));
+        assertMetadataOrder(publication1, "dc.contributor.author", List.of(
+            "Author, First",
+            "MDV 1",
+            "Author, Second",
+            "MDV 2"
+        ));
+
+        // Check relationship order for publication2
+        assertLeftPlace(r4, 1);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 2);
+        assertLeftPlace(r6, 4);
+        assertLeftPlace(r3, 5);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(publication2, isAuthorOfPublication, List.of(r4, r5, r6, r3));
+        assertMetadataOrder(publication2, "dc.contributor.author", List.of(
+            "MDV 3",
+            "Author, Fourth",
+            "Author, Fifth",
+            "MDV 4",
+            "Author, Sixth",
+            "Author, Third"
+        ));
+    }
+
+    @Test
+    public void changeRightItemInUseForPlaceRelationshipAtTheStartNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Add three Publications to author2, appending to the end
+        Relationship r4 = relationshipService.create(context, publication4, author2, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication5, author2, isAuthorOfPublication, -1, -1);
+        Relationship r6 = relationshipService.create(context, publication6, author2, isAuthorOfPublication, -1, -1);
+
+        // Move r1 to author2
+        relationshipService.move(context, r1, null, author2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1
+        assertRightPlace(r2, 0);     // should both move down as the first Relationship was removed
+        assertRightPlace(r3, 1);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r2, r3));
+
+        // Check relationship order for author2
+        assertRightPlace(r4, 0);     // previous Relationships should stay where they were
+        assertRightPlace(r5, 1);
+        assertRightPlace(r6, 2);
+        assertRightPlace(r1, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(author2, isAuthorOfPublication, List.of(r4, r5, r6, r1));
+    }
+
+    @Test
+    public void changeRightItemInUseForPlaceRelationshipInTheMiddleNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Add three Publications to author2, appending to the end
+        Relationship r4 = relationshipService.create(context, publication4, author2, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication5, author2, isAuthorOfPublication, -1, -1);
+        Relationship r6 = relationshipService.create(context, publication6, author2, isAuthorOfPublication, -1, -1);
+
+        // Move r2 to author2
+        relationshipService.move(context, r2, null, author2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);    // should move down as the first Relationship was removed
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r3));
+
+        // Check relationship order for author2
+        assertRightPlace(r4, 0);     // previous Relationships should stay where they were
+        assertRightPlace(r5, 1);
+        assertRightPlace(r6, 2);
+        assertRightPlace(r2, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(author2, isAuthorOfPublication, List.of(r4, r5, r6, r2));
+    }
+
+    @Test
+    public void changeRightItemInUseForPlaceRelationshipInTheMiddleNoMetadataTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Add three Publications to author2, appending to the end
+        Relationship r4 = relationshipService.create(context, publication4, author2, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication5, author2, isAuthorOfPublication, -1, -1);
+        Relationship r6 = relationshipService.create(context, publication6, author2, isAuthorOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // Move r2 to author2
+        relationshipService.move(context, r2, null, author2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);    // should move down as the first Relationship was removed
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r3));
+
+        // Check relationship order for author2
+        assertRightPlace(r4, 0);     // previous Relationships should stay where they were
+        assertRightPlace(r5, 1);
+        assertRightPlace(r6, 2);
+        assertRightPlace(r2, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(author2, isAuthorOfPublication, List.of(r4, r5, r6, r2));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 0);
+        assertRightPlace(ur2, 1);
+    }
+
+    @Test
+    public void changeRightItemInUseForPlaceRelationshipAtTheEndNoMetadataTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Publications to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, publication1, author1, isAuthorOfPublication, -1, -1);
+        Relationship r2 = relationshipService.create(context, publication2, author1, isAuthorOfPublication, -1, -1);
+        Relationship r3 = relationshipService.create(context, publication3, author1, isAuthorOfPublication, -1, -1);
+
+        // Add three Publications to author2, appending to the end
+        Relationship r4 = relationshipService.create(context, publication4, author2, isAuthorOfPublication, -1, -1);
+        Relationship r5 = relationshipService.create(context, publication5, author2, isAuthorOfPublication, -1, -1);
+        Relationship r6 = relationshipService.create(context, publication6, author2, isAuthorOfPublication, -1, -1);
+
+        // Move r3 to author2
+        relationshipService.move(context, r3, null, author2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRelationMetadataOrder(author1, isAuthorOfPublication, List.of(r1, r2));
+
+        // Check relationship order for author2
+        assertRightPlace(r4, 0);     // previous Relationships should stay where they were
+        assertRightPlace(r5, 1);
+        assertRightPlace(r6, 2);
+        assertRightPlace(r3, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(author2, isAuthorOfPublication, List.of(r4, r5, r6, r3));
+    }
+
+    @Test
+    public void changeLeftItemInNonUseForPlaceRelationshipAtTheStart() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Add three Projects to author2, appending to the end
+        Relationship r4 = relationshipService.create(context, author2, project4, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author2, project5, isProjectOfPerson, -1, -1);
+        Relationship r6 = relationshipService.create(context, author2, project6, isProjectOfPerson, -1, -1);
+
+        // Move r1 to publication 2
+        relationshipService.move(context, r1, author2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1
+        assertLeftPlace(r2, 0);     // should both move down as the first Relationship was removed
+        assertLeftPlace(r3, 1);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r2, r3));
+
+        // Check relationship order for author2
+        assertLeftPlace(r4, 0);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 1);
+        assertLeftPlace(r6, 2);
+        assertLeftPlace(r1, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(author2, isProjectOfPerson, List.of(r4, r5, r6, r1));
+    }
+
+    @Test
+    public void changeLeftItemInNonUseNonForPlaceRelationshipInTheMiddle() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Add three Projects to author2, appending to the end
+        Relationship r4 = relationshipService.create(context, author2, project4, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author2, project5, isProjectOfPerson, -1, -1);
+        Relationship r6 = relationshipService.create(context, author2, project6, isProjectOfPerson, -1, -1);
+
+        // Move r2 to author2
+        relationshipService.move(context, r2, author2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r3, 1);     // should move down as the second Relationship was removed
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r3));
+
+        // Check relationship order for author2
+        assertLeftPlace(r4, 0);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 1);
+        assertLeftPlace(r6, 2);
+        assertLeftPlace(r2, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(author2, isProjectOfPerson, List.of(r4, r5, r6, r2));
+    }
+
+    @Test
+    public void changeLeftItemInNonUseForPlaceRelationshipAtTheEnd() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Add three Projects to author2, appending to the end
+        Relationship r4 = relationshipService.create(context, author2, project4, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author2, project5, isProjectOfPerson, -1, -1);
+        Relationship r6 = relationshipService.create(context, author2, project6, isProjectOfPerson, -1, -1);
+
+        // Move r3 to author2
+        relationshipService.move(context, r3, author2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for publication1
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r2));
+
+        // Check relationship order for publication2
+        assertLeftPlace(r4, 0);     // previous Relationships should stay where they were
+        assertLeftPlace(r5, 1);
+        assertLeftPlace(r6, 2);
+        assertLeftPlace(r3, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(author2, isProjectOfPerson, List.of(r4, r5, r6, r3));
+    }
+
+    @Test
+    public void changeRightItemInUseNonForPlaceRelationshipAtTheStartTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to project1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Add three Authors to project2, appending to the end
+        Relationship r4 = relationshipService.create(context, author4, project2, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author5, project2, isProjectOfPerson, -1, -1);
+        Relationship r6 = relationshipService.create(context, author6, project2, isProjectOfPerson, -1, -1);
+
+        // Move r1 to project2
+        relationshipService.move(context, r1, null, project2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for project1
+        assertRightPlace(r2, 0);     // should both move down as the first Relationship was removed
+        assertRightPlace(r3, 1);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r2, r3));
+
+        // Check relationship order for project2
+        assertRightPlace(r4, 0);     // previous Relationships should stay where they were
+        assertRightPlace(r5, 1);
+        assertRightPlace(r6, 2);
+        assertRightPlace(r1, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(project2, isProjectOfPerson, List.of(r4, r5, r6, r1));
+    }
+
+    @Test
+    public void changeRightItemInNonUseForPlaceRelationshipInTheMiddleTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to project1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Add three Authors to project2, appending to the end
+        Relationship r4 = relationshipService.create(context, author4, project2, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author5, project2, isProjectOfPerson, -1, -1);
+        Relationship r6 = relationshipService.create(context, author6, project2, isProjectOfPerson, -1, -1);
+
+        // Move r2 to project2
+        relationshipService.move(context, r2, null, project2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for project1
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);    // should move down as the first Relationship was removed
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r3));
+
+        // Check relationship order for project2
+        assertRightPlace(r4, 0);     // previous Relationships should stay where they were
+        assertRightPlace(r5, 1);
+        assertRightPlace(r6, 2);
+        assertRightPlace(r2, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(project2, isProjectOfPerson, List.of(r4, r5, r6, r2));
+    }
+
+    @Test
+    public void changeRightItemInNonUseForPlaceRelationshipInTheMiddleTest_ignoreOtherRels() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to project1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur1 = relationshipService.create(context, publication1, project1, isProjectOfPublication, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur2 = relationshipService.create(context, publication2, project1, isProjectOfPublication, -1, -1);
+
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Add three Authors to project2, appending to the end
+        Relationship r4 = relationshipService.create(context, author4, project2, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author5, project2, isProjectOfPerson, -1, -1);
+
+        // NOTE: unrelated relationship => should not be affected
+        Relationship ur3 = relationshipService.create(context, author5, project3, isProjectOfPerson, -1, -1);
+
+        Relationship r6 = relationshipService.create(context, author6, project2, isProjectOfPerson, -1, -1);
+
+        // Move r2 to project2
+        relationshipService.move(context, r2, null, project2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for project1
+        assertRightPlace(r1, 0);
+        assertRightPlace(r3, 1);    // should move down as the first Relationship was removed
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r3));
+
+        // Check relationship order for project2
+        assertRightPlace(r4, 0);     // previous Relationships should stay where they were
+        assertRightPlace(r5, 1);
+        assertRightPlace(r6, 2);
+        assertRightPlace(r2, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(project2, isProjectOfPerson, List.of(r4, r5, r6, r2));
+
+        // check unaffected relationships
+        assertLeftPlace(ur1, 0);
+        assertRightPlace(ur1, 0);
+        assertLeftPlace(ur2, 0);
+        assertRightPlace(ur2, 1);
+        assertLeftPlace(ur3, 1);
+        assertRightPlace(ur3, 0);
+    }
+
+    @Test
+    public void changeRightItemInNonUseForPlaceRelationshipAtTheEndTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to project1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Add three Authors to project2, appending to the end
+        Relationship r4 = relationshipService.create(context, author4, project2, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author5, project2, isProjectOfPerson, -1, -1);
+        Relationship r6 = relationshipService.create(context, author6, project2, isProjectOfPerson, -1, -1);
+
+        // Move r3 to project2
+        relationshipService.move(context, r3, null, project2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1
+        assertRightPlace(r1, 0);
+        assertRightPlace(r2, 1);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r2));
+
+        // Check relationship order for author2
+        assertRightPlace(r4, 0);     // previous Relationships should stay where they were
+        assertRightPlace(r5, 1);
+        assertRightPlace(r6, 2);
+        assertRightPlace(r3, 3);     // moved Relationship should be appended to the end
+        assertRelationMetadataOrder(project2, isProjectOfPerson, List.of(r4, r5, r6, r3));
+    }
+
+    @Test
+    public void changeLeftItemInNonUseForPlaceRelationshipAtTheStartToSameItemNoChanges() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Move r1 to author1
+        relationshipService.move(context, r1, author1, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1 -> should remain unchanged
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void changeRightItemInNonUseForPlaceRelationshipAtTheStartToSameItemNoChanges() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Move r1 to author1
+        relationshipService.move(context, r1, null, project1);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1 -> should remain unchanged
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r2, 1);
+        assertLeftPlace(r3, 2);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r2, r3));
+    }
+
+    @Test
+    public void changeLeftItemInNonUseForPlaceRelationshipAtTheStartWithSiblingsInOldLeftItem() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Projects to author1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author1, project2, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author1, project3, isProjectOfPerson, -1, -1);
+
+        // Add three Authors to project1, appending to the end
+        Relationship r4 = relationshipService.create(context, author4, project1, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author5, project1, isProjectOfPerson, -1, -1);
+        Relationship r6 = relationshipService.create(context, author6, project1, isProjectOfPerson, -1, -1);
+
+        // Move r1 to author2
+        relationshipService.move(context, r1, author2, null);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for author1 -> should shift down by one
+        assertLeftPlace(r2, 0);
+        assertLeftPlace(r3, 1);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r2, r3));
+
+        // Check relationship order for project 1 -> should remain unchanged
+        assertRightPlace(r1, 0);
+        assertRightPlace(r4, 1);
+        assertRightPlace(r5, 2);
+        assertRightPlace(r6, 3);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r1, r4, r5, r6));
+    }
+
+    @Test
+    public void changeRightItemInNonUseForPlaceRelationshipAtTheStartWithSiblingsInOldRightItem() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Add three Authors to project1, appending to the end
+        Relationship r1 = relationshipService.create(context, author1, project1, isProjectOfPerson, -1, -1);
+        Relationship r2 = relationshipService.create(context, author2, project1, isProjectOfPerson, -1, -1);
+        Relationship r3 = relationshipService.create(context, author3, project1, isProjectOfPerson, -1, -1);
+
+        // Add three Projects to author1, appending to the end
+        Relationship r4 = relationshipService.create(context, author1, project4, isProjectOfPerson, -1, -1);
+        Relationship r5 = relationshipService.create(context, author1, project5, isProjectOfPerson, -1, -1);
+        Relationship r6 = relationshipService.create(context, author1, project6, isProjectOfPerson, -1, -1);
+
+        // Move r1 to project2
+        relationshipService.move(context, r1, null, project2);
+
+        context.restoreAuthSystemState();
+
+        // Check relationship order for project1 -> should remain unchanged
+        assertRightPlace(r2, 0);
+        assertRightPlace(r3, 1);
+        assertRelationMetadataOrder(project1, isProjectOfPerson, List.of(r2, r3));
+
+        // Check relationship order for author1 -> should remain unchanged
+        assertLeftPlace(r1, 0);
+        assertLeftPlace(r4, 1);
+        assertLeftPlace(r5, 2);
+        assertLeftPlace(r6, 3);
+        assertRelationMetadataOrder(author1, isProjectOfPerson, List.of(r1, r4, r5, r6));
+    }
+
+
+    private void assertLeftPlace(Relationship relationship, int leftPlace) {
+        assertEquals(leftPlace, relationship.getLeftPlace());
+    }
+
+    private void assertRightPlace(Relationship relationship, int rightPlace) {
+        assertEquals(rightPlace, relationship.getRightPlace());
+    }
+
+
+    private void assertRelationMetadataOrder(
+        Item item, RelationshipType relationshipType, List<Relationship> relationships
+    ) {
+        String element = getRelationshipTypeStringForEntity(relationshipType, item);
+        List<MetadataValue> mdvs = itemService.getMetadata(
+            item,
+            MetadataSchemaEnum.RELATION.getName(), element, null,
+            Item.ANY
+        );
+
+        assertEquals(
+            "Metadata authorities should match relationship IDs",
+            relationships.stream()
+                         .map(r -> {
+                             if (r != null) {
+                                 return Constants.VIRTUAL_AUTHORITY_PREFIX + r.getID();
+                             } else {
+                                 return null;   // To match relationships that have been deleted and copied to MDVs
+                             }
+                         })
+                         .collect(Collectors.toList()),
+            mdvs.stream()
+                .map(MetadataValue::getAuthority)
+                .collect(Collectors.toList())
+        );
+    }
+
+    private void assertMetadataOrder(
+        Item item, String metadataField, List<String> metadataValues
+    ) {
+        List<MetadataValue> mdvs = itemService.getMetadataByMetadataString(item, metadataField);
+
+        assertEquals(
+            metadataValues,
+            mdvs.stream()
+                .map(MetadataValue::getValue)
+                .collect(Collectors.toList())
+        );
+    }
+
+    private String getRelationshipTypeStringForEntity(RelationshipType relationshipType, Item item) {
+        String entityType = itemService.getEntityTypeLabel(item);
+
+        if (StringUtils.equals(entityType, relationshipType.getLeftType().getLabel())) {
+            return relationshipType.getLeftwardType();
+        } else if (StringUtils.equals(entityType, relationshipType.getRightType().getLabel())) {
+            return relationshipType.getRightwardType();
+        } else {
+            throw new IllegalArgumentException(
+                entityType + "is not a valid entity for " + relationshipType.getLeftwardType() + ", must be either "
+                    + relationshipType.getLeftType().getLabel() + " or " + relationshipType.getRightType().getLabel()
+            );
+        }
+    }
 }
diff --git a/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplTest.java b/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplTest.java
index 5d6197e494..579e05b3de 100644
--- a/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplTest.java
@@ -24,12 +24,14 @@ import org.dspace.content.virtual.VirtualMetadataPopulator;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
+import org.dspace.versioning.utils.RelationshipVersioningUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -71,6 +73,9 @@ public class RelationshipServiceImplTest {
     @Mock
     private ConfigurationService configurationService;
 
+    @Spy
+    private RelationshipVersioningUtils relationshipVersioningUtils;
+
     @Before
     public void init() {
         relationshipsList = new ArrayList<>();
@@ -112,9 +117,6 @@ public class RelationshipServiceImplTest {
         relationshipTest.add(getRelationship(bob, cindy, hasMother,1,0));
         when(relationshipService.findByItem(context, cindy, -1, -1, false)).thenReturn(relationshipTest);
 
-        // Mock the state of objects utilized in findByItem() to meet the success criteria of the invocation
-        when(relationshipDAO.findByItem(context, cindy, -1, -1, false)).thenReturn(relationshipTest);
-
         List<Relationship> results = relationshipService.findByItem(context, cindy);
         assertEquals("TestFindByItem 0", relationshipTest, results);
         for (int i = 0; i < relationshipTest.size(); i++) {
@@ -122,32 +124,6 @@ public class RelationshipServiceImplTest {
         }
     }
 
-    @Test
-    public void testFindLeftPlaceByLeftItem() throws Exception {
-        // Declare objects utilized in unit test
-        Item item = mock(Item.class);
-
-        // Mock DAO to return mocked left place as 0
-        when(relationshipDAO.findNextLeftPlaceByLeftItem(context, item)).thenReturn(0);
-
-        // The left place reported from out mocked item should match the DAO's report of the left place
-        assertEquals("TestFindLeftPlaceByLeftItem 0", relationshipDAO.findNextLeftPlaceByLeftItem(context, item),
-                relationshipService.findNextLeftPlaceByLeftItem(context, item));
-    }
-
-    @Test
-    public void testFindRightPlaceByRightItem() throws Exception {
-        // Declare objects utilized in unit test
-        Item item = mock(Item.class);
-
-        // Mock lower level DAO to return mocked right place as 0
-        when(relationshipDAO.findNextRightPlaceByRightItem(context, item)).thenReturn(0);
-
-        // The right place reported from out mocked item should match the DAO's report of the right place
-        assertEquals("TestFindRightPlaceByRightItem 0", relationshipDAO.findNextRightPlaceByRightItem(context, item),
-                relationshipService.findNextRightPlaceByRightItem(context, item));
-    }
-
     @Test
     public void testFindByItemAndRelationshipType() throws Exception {
         // Declare objects utilized in unit test
diff --git a/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplVersioningTest.java b/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplVersioningTest.java
new file mode 100644
index 0000000000..d42213da2c
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplVersioningTest.java
@@ -0,0 +1,1105 @@
+/**
+ * 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/
+ */
+package org.dspace.content;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.RelationshipBuilder;
+import org.dspace.builder.RelationshipTypeBuilder;
+import org.dspace.content.dao.RelationshipDAO;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.Before;
+import org.junit.Test;
+
+public class RelationshipServiceImplVersioningTest extends AbstractIntegrationTestWithDatabase {
+
+    private RelationshipService relationshipService;
+    private RelationshipDAO relationshipDAO;
+
+    protected Community community;
+    protected Collection collection;
+    protected EntityType publicationEntityType;
+    protected EntityType personEntityType;
+    protected RelationshipType relationshipType;
+    protected Item publication1;
+    protected Item publication2;
+    protected Item publication3;
+    protected Item person1;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        relationshipService = ContentServiceFactory.getInstance().getRelationshipService();
+        relationshipDAO = DSpaceServicesFactory.getInstance().getServiceManager()
+            .getServicesByType(RelationshipDAO.class).get(0);
+
+        context.turnOffAuthorisationSystem();
+
+        community = CommunityBuilder.createCommunity(context)
+            .withName("community")
+            .build();
+
+        collection = CollectionBuilder.createCollection(context, community)
+            .withName("collection")
+            .build();
+
+        publicationEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication")
+            .build();
+
+        personEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person")
+            .build();
+
+        relationshipType = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+            context, publicationEntityType, personEntityType,
+            "isAuthorOfPublication", "isPublicationOfAuthor",
+            null, null, null, null
+        )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        publication1 = ItemBuilder.createItem(context, collection)
+            .withTitle("publication1")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        publication2 = ItemBuilder.createItem(context, collection)
+            .withTitle("publication2")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        publication3 = ItemBuilder.createItem(context, collection)
+            .withTitle("publication3")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        person1 = ItemBuilder.createItem(context, collection)
+            .withTitle("person1")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .build();
+
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testRelationshipLatestVersionStatusDefault() throws Exception {
+        // create method #1
+        context.turnOffAuthorisationSystem();
+        Relationship relationship1 = relationshipService.create(
+            context, publication1, person1, relationshipType, 3, 5, "left", "right"
+        );
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship1.getLatestVersionStatus());
+        Relationship relationship2 = relationshipService.find(context, relationship1.getID());
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship2.getLatestVersionStatus());
+
+        // create method #2
+        context.turnOffAuthorisationSystem();
+        Relationship relationship3 = relationshipService.create(
+            context, publication2, person1, relationshipType, 3, 5
+        );
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship3.getLatestVersionStatus());
+        Relationship relationship4 = relationshipService.find(context, relationship3.getID());
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship4.getLatestVersionStatus());
+
+        // create method #3
+        Relationship inputRelationship = new Relationship();
+        inputRelationship.setLeftItem(publication3);
+        inputRelationship.setRightItem(person1);
+        inputRelationship.setRelationshipType(relationshipType);
+        context.turnOffAuthorisationSystem();
+        Relationship relationship5 = relationshipService.create(context, inputRelationship);
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship5.getLatestVersionStatus());
+        Relationship relationship6 = relationshipService.find(context, relationship5.getID());
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship6.getLatestVersionStatus());
+
+        // clean up
+        context.turnOffAuthorisationSystem();
+        relationshipService.delete(context, relationship1);
+        relationshipService.delete(context, relationship3);
+        relationshipService.delete(context, relationship5);
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testRelationshipLatestVersionStatusBoth() throws Exception {
+        // create method #1
+        context.turnOffAuthorisationSystem();
+        Relationship relationship1 = relationshipService.create(
+            context, publication1, person1, relationshipType, 3, 5, "left", "right",
+            Relationship.LatestVersionStatus.BOTH // set latest version status
+        );
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship1.getLatestVersionStatus());
+        Relationship relationship2 = relationshipService.find(context, relationship1.getID());
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship2.getLatestVersionStatus());
+
+        // create method #2
+        Relationship inputRelationship = new Relationship();
+        inputRelationship.setLeftItem(publication2);
+        inputRelationship.setRightItem(person1);
+        inputRelationship.setRelationshipType(relationshipType);
+        inputRelationship.setLatestVersionStatus(Relationship.LatestVersionStatus.BOTH); // set latest version status
+        context.turnOffAuthorisationSystem();
+        Relationship relationship3 = relationshipService.create(context, inputRelationship);
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship3.getLatestVersionStatus());
+        Relationship relationship4 = relationshipService.find(context, relationship3.getID());
+        assertEquals(Relationship.LatestVersionStatus.BOTH, relationship4.getLatestVersionStatus());
+
+        // clean up
+        context.turnOffAuthorisationSystem();
+        relationshipService.delete(context, relationship1);
+        relationshipService.delete(context, relationship3);
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testRelationshipLatestVersionStatusLeftOnly() throws Exception {
+        // create method #1
+        context.turnOffAuthorisationSystem();
+        Relationship relationship1 = relationshipService.create(
+            context, publication1, person1, relationshipType, 3, 5, "left", "right",
+            Relationship.LatestVersionStatus.LEFT_ONLY // set latest version status
+        );
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.LEFT_ONLY, relationship1.getLatestVersionStatus());
+        Relationship relationship2 = relationshipService.find(context, relationship1.getID());
+        assertEquals(Relationship.LatestVersionStatus.LEFT_ONLY, relationship2.getLatestVersionStatus());
+
+        // create method #2
+        Relationship inputRelationship = new Relationship();
+        inputRelationship.setLeftItem(publication2);
+        inputRelationship.setRightItem(person1);
+        inputRelationship.setRelationshipType(relationshipType);
+        inputRelationship.setLatestVersionStatus(Relationship.LatestVersionStatus.LEFT_ONLY); // set LVS
+        context.turnOffAuthorisationSystem();
+        Relationship relationship3 = relationshipService.create(context, inputRelationship);
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.LEFT_ONLY, relationship3.getLatestVersionStatus());
+        Relationship relationship4 = relationshipService.find(context, relationship3.getID());
+        assertEquals(Relationship.LatestVersionStatus.LEFT_ONLY, relationship4.getLatestVersionStatus());
+
+        // clean up
+        context.turnOffAuthorisationSystem();
+        relationshipService.delete(context, relationship1);
+        relationshipService.delete(context, relationship3);
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testRelationshipLatestVersionStatusRightOnly() throws Exception {
+        // create method #1
+        context.turnOffAuthorisationSystem();
+        Relationship relationship1 = relationshipService.create(
+            context, publication1, person1, relationshipType, 3, 5, "left", "right",
+            Relationship.LatestVersionStatus.RIGHT_ONLY // set latest version status
+        );
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.RIGHT_ONLY, relationship1.getLatestVersionStatus());
+        Relationship relationship2 = relationshipService.find(context, relationship1.getID());
+        assertEquals(Relationship.LatestVersionStatus.RIGHT_ONLY, relationship2.getLatestVersionStatus());
+
+        // create method #2
+        Relationship inputRelationship = new Relationship();
+        inputRelationship.setLeftItem(publication2);
+        inputRelationship.setRightItem(person1);
+        inputRelationship.setRelationshipType(relationshipType);
+        inputRelationship.setLatestVersionStatus(Relationship.LatestVersionStatus.RIGHT_ONLY); // set LVS
+        context.turnOffAuthorisationSystem();
+        Relationship relationship3 = relationshipService.create(context, inputRelationship);
+        context.restoreAuthSystemState();
+        assertEquals(Relationship.LatestVersionStatus.RIGHT_ONLY, relationship3.getLatestVersionStatus());
+        Relationship relationship4 = relationshipService.find(context, relationship3.getID());
+        assertEquals(Relationship.LatestVersionStatus.RIGHT_ONLY, relationship4.getLatestVersionStatus());
+
+        // clean up
+        context.turnOffAuthorisationSystem();
+        relationshipService.delete(context, relationship1);
+        relationshipService.delete(context, relationship3);
+        context.restoreAuthSystemState();
+    }
+
+    protected void assertRelationship(Relationship expectedRelationship, List<Relationship> relationships) {
+        assertNotNull(relationships);
+        assertEquals(1, relationships.size());
+        assertEquals(expectedRelationship, relationships.get(0));
+    }
+
+    protected void assertNoRelationship(List<Relationship> relationships) {
+        assertNotNull(relationships);
+        assertEquals(0, relationships.size());
+    }
+
+    @Test
+    public void testExcludeNonLatestBoth() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Relationship relationship1 = RelationshipBuilder
+            .createRelationshipBuilder(context, publication1, person1, relationshipType)
+            .withLatestVersionStatus(Relationship.LatestVersionStatus.BOTH)
+            .build();
+        context.restoreAuthSystemState();
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, false, true)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, -1, -1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, -1, -1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, -1, -1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, -1, -1, false, true)
+        );
+
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, false, false));
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, false, true));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, false, false));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, false, true));
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, true, false));
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, true, true));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, true, false));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, true, true));
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, true)
+        );
+
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, true)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, true)
+        );
+
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, false, false)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, false, true)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, true, false)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, true, true)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, false, false)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, false, true)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, true, false)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, true, true)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1, -1, -1, false)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1, -1, -1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1, -1, -1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1, -1, -1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1, -1, -1, false, true)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, true)
+        );
+
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1)
+        );
+
+        assertNoRelationship(
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, true)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, true)
+        );
+
+        assertEquals(1, relationshipService.countByItem(context, publication1));
+        assertEquals(1, relationshipService.countByItem(context, person1));
+
+        assertEquals(1, relationshipService.countByItem(context, publication1, false, false));
+        assertEquals(1, relationshipService.countByItem(context, publication1, false, true));
+        assertEquals(1, relationshipService.countByItem(context, person1, false, false));
+        assertEquals(1, relationshipService.countByItem(context, person1, false, true));
+        assertEquals(1, relationshipService.countByItem(context, publication1, true, false));
+        assertEquals(1, relationshipService.countByItem(context, publication1, true, true));
+        assertEquals(1, relationshipService.countByItem(context, person1, true, false));
+        assertEquals(1, relationshipService.countByItem(context, person1, true, true));
+
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true)
+        );
+
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false, true)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true, false)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true, true)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false, false)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false, true)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true, true)
+        );
+    }
+
+    @Test
+    public void testExcludeNonLatestLeftOnly() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Relationship relationship1 = RelationshipBuilder
+            .createRelationshipBuilder(context, publication1, person1, relationshipType)
+            .withLatestVersionStatus(Relationship.LatestVersionStatus.LEFT_ONLY)
+            .build();
+        context.restoreAuthSystemState();
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, false, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItem(context, publication1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, false, true)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, -1, -1, false, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItem(context, publication1, -1, -1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, -1, -1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, -1, -1, false, true)
+        );
+
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, false, false));
+        assertEquals(0, relationshipDAO.countByItem(context, publication1, false, true));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, false, false));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, false, true));
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, true, false));
+        assertEquals(0, relationshipDAO.countByItem(context, publication1, true, true));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, true, false));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, true, true));
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, true)
+        );
+
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, true)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, true)
+        );
+
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, false, false)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, false, true)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, true, false)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, true, true)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, false, false)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, false, true)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, true, false)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, true, true)
+        );
+
+        assertNoRelationship(
+            relationshipService.findByItem(context, publication1)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1)
+        );
+
+        assertNoRelationship(
+            relationshipService.findByItem(context, publication1, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1, -1, -1, false)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1, -1, -1, false, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItem(context, publication1, -1, -1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1, -1, -1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1, -1, -1, false, true)
+        );
+
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType)
+        );
+
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, true)
+        );
+
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1)
+        );
+
+        assertNoRelationship(
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, true)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, true)
+        );
+
+        assertEquals(0, relationshipService.countByItem(context, publication1));
+        assertEquals(1, relationshipService.countByItem(context, person1));
+
+        assertEquals(1, relationshipService.countByItem(context, publication1, false, false));
+        assertEquals(0, relationshipService.countByItem(context, publication1, false, true));
+        assertEquals(1, relationshipService.countByItem(context, person1, false, false));
+        assertEquals(1, relationshipService.countByItem(context, person1, false, true));
+        assertEquals(1, relationshipService.countByItem(context, publication1, true, false));
+        assertEquals(0, relationshipService.countByItem(context, publication1, true, true));
+        assertEquals(1, relationshipService.countByItem(context, person1, true, false));
+        assertEquals(1, relationshipService.countByItem(context, person1, true, true));
+
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true)
+        );
+
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false, true)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true, true)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false, false)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false, true)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true, true)
+        );
+    }
+
+    @Test
+    public void testExcludeNonLatestRightOnly() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Relationship relationship1 = RelationshipBuilder
+            .createRelationshipBuilder(context, publication1, person1, relationshipType)
+            .withLatestVersionStatus(Relationship.LatestVersionStatus.RIGHT_ONLY)
+            .build();
+        context.restoreAuthSystemState();
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, false, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItem(context, person1, false, true)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, -1, -1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, publication1, -1, -1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItem(context, person1, -1, -1, false, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItem(context, person1, -1, -1, false, true)
+        );
+
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, false, false));
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, false, true));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, false, false));
+        assertEquals(0, relationshipDAO.countByItem(context, person1, false, true));
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, true, false));
+        assertEquals(1, relationshipDAO.countByItem(context, publication1, true, true));
+        assertEquals(1, relationshipDAO.countByItem(context, person1, true, false));
+        assertEquals(0, relationshipDAO.countByItem(context, person1, true, true));
+
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, true)
+        );
+
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, true)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipDAO.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, true)
+        );
+
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, false, false)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, false, true)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, true, false)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, publication1, relationshipType, true, true)
+        );
+        assertEquals(
+            1, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, false, false)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, false, true)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, true, false)
+        );
+        assertEquals(
+            0, relationshipDAO.countByItemAndRelationshipType(context, person1, relationshipType, true, true)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1)
+        );
+        assertNoRelationship(
+            relationshipService.findByItem(context, person1)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItem(context, person1, -1, -1, false)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1, -1, -1, false, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, publication1, -1, -1, false, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItem(context, person1, -1, -1, false, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItem(context, person1, -1, -1, false, true)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1)
+        );
+
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, -1, -1, true)
+        );
+
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1)
+        );
+
+        assertNoRelationship(
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, false, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, false)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService
+                .findByItemAndRelationshipType(context, publication1, relationshipType, true, -1, -1, true)
+        );
+        assertRelationship(
+            relationship1,
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, false, -1, -1, true)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, false)
+        );
+        assertNoRelationship(
+            relationshipService.findByItemAndRelationshipType(context, person1, relationshipType, true, -1, -1, true)
+        );
+
+        assertEquals(1, relationshipService.countByItem(context, publication1));
+        assertEquals(0, relationshipService.countByItem(context, person1));
+
+        assertEquals(1, relationshipService.countByItem(context, publication1, false, false));
+        assertEquals(1, relationshipService.countByItem(context, publication1, false, true));
+        assertEquals(1, relationshipService.countByItem(context, person1, false, false));
+        assertEquals(0, relationshipService.countByItem(context, person1, false, true));
+        assertEquals(1, relationshipService.countByItem(context, publication1, true, false));
+        assertEquals(1, relationshipService.countByItem(context, publication1, true, true));
+        assertEquals(1, relationshipService.countByItem(context, person1, true, false));
+        assertEquals(0, relationshipService.countByItem(context, person1, true, true));
+
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true)
+        );
+
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false, true)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true, false)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, true, true)
+        );
+        assertEquals(
+            1, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, false, true)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true, false)
+        );
+        assertEquals(
+            0, relationshipService.countByItemAndRelationshipType(context, person1, relationshipType, true, true)
+        );
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/content/RightTiltedRelationshipMetadataServiceIT.java b/dspace-api/src/test/java/org/dspace/content/RightTiltedRelationshipMetadataServiceIT.java
index fc57f588db..c5359b23f0 100644
--- a/dspace-api/src/test/java/org/dspace/content/RightTiltedRelationshipMetadataServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/content/RightTiltedRelationshipMetadataServiceIT.java
@@ -8,6 +8,7 @@
 package org.dspace.content;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
@@ -88,18 +89,27 @@ public class RightTiltedRelationshipMetadataServiceIT extends RelationshipMetada
         //request the virtual metadata of the journal volume
         List<RelationshipMetadataValue> volumeRelList =
             relationshipMetadataService.getRelationshipMetadata(rightItem, true);
-        assertThat(volumeRelList.size(), equalTo(2));
-        assertThat(volumeRelList.get(0).getValue(), equalTo("2"));
-        assertThat(volumeRelList.get(0).getMetadataField().getMetadataSchema().getName(), equalTo("publicationissue"));
-        assertThat(volumeRelList.get(0).getMetadataField().getElement(), equalTo("issueNumber"));
-        assertThat(volumeRelList.get(0).getMetadataField().getQualifier(), equalTo(null));
+        assertThat(volumeRelList.size(), equalTo(3));
+
+        assertThat(volumeRelList.get(0).getValue(), equalTo(String.valueOf(leftItem.getID())));
+        assertThat(volumeRelList.get(0).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(volumeRelList.get(0).getMetadataField().getElement(), equalTo("isIssueOfJournalVolume"));
+        assertThat(volumeRelList.get(0).getMetadataField().getQualifier(), equalTo("latestForDiscovery"));
         assertThat(volumeRelList.get(0).getAuthority(), equalTo("virtual::" + relationship.getID()));
 
-        assertThat(volumeRelList.get(1).getValue(), equalTo(String.valueOf(leftItem.getID())));
-        assertThat(volumeRelList.get(1).getMetadataField().getMetadataSchema().getName(),
-            equalTo(MetadataSchemaEnum.RELATION.getName()));
-        assertThat(volumeRelList.get(1).getMetadataField().getElement(), equalTo("isIssueOfJournalVolume"));
+        assertThat(volumeRelList.get(1).getValue(), equalTo("2"));
+        assertThat(volumeRelList.get(1).getMetadataField().getMetadataSchema().getName(), equalTo("publicationissue"));
+        assertThat(volumeRelList.get(1).getMetadataField().getElement(), equalTo("issueNumber"));
+        assertThat(volumeRelList.get(1).getMetadataField().getQualifier(), equalTo(null));
         assertThat(volumeRelList.get(1).getAuthority(), equalTo("virtual::" + relationship.getID()));
+
+        assertThat(volumeRelList.get(2).getValue(), equalTo(String.valueOf(leftItem.getID())));
+        assertThat(volumeRelList.get(2).getMetadataField().getMetadataSchema().getName(),
+            equalTo(MetadataSchemaEnum.RELATION.getName()));
+        assertThat(volumeRelList.get(2).getMetadataField().getElement(), equalTo("isIssueOfJournalVolume"));
+        assertThat(volumeRelList.get(2).getMetadataField().getQualifier(), nullValue());
+        assertThat(volumeRelList.get(2).getAuthority(), equalTo("virtual::" + relationship.getID()));
     }
 
 }
diff --git a/dspace-api/src/test/java/org/dspace/content/VersioningWithRelationshipsTest.java b/dspace-api/src/test/java/org/dspace/content/VersioningWithRelationshipsTest.java
new file mode 100644
index 0000000000..528568c4e5
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/content/VersioningWithRelationshipsTest.java
@@ -0,0 +1,4203 @@
+/**
+ * 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/
+ */
+package org.dspace.content;
+
+import static org.dspace.content.Relationship.LatestVersionStatus.BOTH;
+import static org.dspace.content.Relationship.LatestVersionStatus.LEFT_ONLY;
+import static org.dspace.content.Relationship.LatestVersionStatus.RIGHT_ONLY;
+import static org.dspace.util.RelationshipVersioningTestUtils.isRel;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.function.FailableRunnable;
+import org.apache.commons.lang3.function.FailableSupplier;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.RelationshipBuilder;
+import org.dspace.builder.RelationshipTypeBuilder;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.InstallItemService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.content.virtual.Collected;
+import org.dspace.content.virtual.VirtualMetadataConfiguration;
+import org.dspace.content.virtual.VirtualMetadataPopulator;
+import org.dspace.core.Constants;
+import org.dspace.discovery.SolrSearchCore;
+import org.dspace.kernel.ServiceManager;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.versioning.Version;
+import org.dspace.versioning.factory.VersionServiceFactory;
+import org.dspace.versioning.service.VersioningService;
+import org.hamcrest.Matcher;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+
+public class VersioningWithRelationshipsTest extends AbstractIntegrationTestWithDatabase {
+
+    private final RelationshipService relationshipService =
+        ContentServiceFactory.getInstance().getRelationshipService();
+    private final VersioningService versioningService =
+        VersionServiceFactory.getInstance().getVersionService();
+    private final WorkspaceItemService workspaceItemService =
+        ContentServiceFactory.getInstance().getWorkspaceItemService();
+    private final InstallItemService installItemService =
+        ContentServiceFactory.getInstance().getInstallItemService();
+    private final ItemService itemService =
+        ContentServiceFactory.getInstance().getItemService();
+    private final SolrSearchCore solrSearchCore =
+        DSpaceServicesFactory.getInstance().getServiceManager().getServicesByType(SolrSearchCore.class).get(0);
+
+    protected Community community;
+    protected Collection collection;
+    protected EntityType publicationEntityType;
+    protected EntityType personEntityType;
+    protected EntityType projectEntityType;
+    protected EntityType orgUnitEntityType;
+    protected EntityType journalIssueEntityType;
+    protected EntityType journalVolumeEntityType;
+    protected RelationshipType isAuthorOfPublication;
+    protected RelationshipType isProjectOfPublication;
+    protected RelationshipType isOrgUnitOfPublication;
+    protected RelationshipType isMemberOfProject;
+    protected RelationshipType isMemberOfOrgUnit;
+    protected RelationshipType isIssueOfJournalVolume;
+    protected RelationshipType isProjectOfPerson;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        context.turnOffAuthorisationSystem();
+
+        community = CommunityBuilder.createCommunity(context)
+            .withName("community")
+            .build();
+
+        collection = CollectionBuilder.createCollection(context, community)
+            .withName("collection")
+            .build();
+
+        publicationEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication")
+            .build();
+
+        personEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person")
+            .build();
+
+        projectEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project")
+            .build();
+
+        orgUnitEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "OrgUnit")
+            .build();
+
+        journalIssueEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "JournalIssue")
+            .build();
+
+        journalVolumeEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "JournalVolume")
+            .build();
+
+        isAuthorOfPublication = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, publicationEntityType, personEntityType,
+                "isAuthorOfPublication", "isPublicationOfAuthor",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        isProjectOfPublication = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, publicationEntityType, projectEntityType,
+                "isProjectOfPublication", "isPublicationOfProject",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        isOrgUnitOfPublication = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, publicationEntityType, orgUnitEntityType,
+                "isOrgUnitOfPublication", "isPublicationOfOrgUnit",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        isMemberOfProject = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, projectEntityType, personEntityType,
+                "isMemberOfProject", "isProjectOfMember",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        isMemberOfOrgUnit = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, orgUnitEntityType, personEntityType,
+                "isMemberOfOrgUnit", "isOrgUnitOfMember",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        isIssueOfJournalVolume = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+            context, journalVolumeEntityType, journalIssueEntityType,
+            "isIssueOfJournalVolume", "isJournalVolumeOfIssue",
+            null, null, 1, 1
+        )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        isProjectOfPerson = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+            context, personEntityType, projectEntityType,
+            "isProjectOfPerson", "isPersonOfProject",
+            null, null, null, null
+        )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+    }
+
+    protected Relationship getRelationship(
+        Item leftItem, RelationshipType relationshipType, Item rightItem
+    ) throws Exception {
+        List<Relationship> rels = relationshipService.findByRelationshipType(context, relationshipType).stream()
+            .filter(rel -> leftItem.getID().equals(rel.getLeftItem().getID()))
+            .filter(rel -> rightItem.getID().equals(rel.getRightItem().getID()))
+            .collect(Collectors.toList());
+
+        if (rels.size() == 0) {
+            return null;
+        }
+
+        if (rels.size() == 1) {
+            return rels.get(0);
+        }
+
+        // NOTE: this shouldn't be possible because of database constraints
+        throw new IllegalStateException();
+    }
+
+    @Test
+    public void test_createNewVersionOfItemOnLeftSideOfRelationships() throws Exception {
+        ///////////////////////////////////////////////
+        // create a publication with 3 relationships //
+        ///////////////////////////////////////////////
+
+        Item person1 = ItemBuilder.createItem(context, collection)
+            .withTitle("person 1")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .build();
+
+        Item project1 = ItemBuilder.createItem(context, collection)
+            .withTitle("project 1")
+            .withMetadata("dspace", "entity", "type", projectEntityType.getLabel())
+            .build();
+
+        Item orgUnit1 = ItemBuilder.createItem(context, collection)
+            .withTitle("org unit 1")
+            .withMetadata("dspace", "entity", "type", orgUnitEntityType.getLabel())
+            .build();
+
+        Item originalPublication = ItemBuilder.createItem(context, collection)
+            .withTitle("original publication")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, person1, isAuthorOfPublication)
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, project1, isProjectOfPublication)
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, orgUnit1, isOrgUnitOfPublication)
+            .build();
+
+        /////////////////////////////////////////////////////////
+        // verify that the relationships were properly created //
+        /////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        /////////////////////////////////////////////
+        // create a new version of the publication //
+        /////////////////////////////////////////////
+
+        Version newVersion = versioningService.createNewVersion(context, originalPublication);
+        Item newPublication = newVersion.getItem();
+        assertNotSame(originalPublication, newPublication);
+
+        ///////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 5 items (excludeNonLatest = true) //
+        ///////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPublication, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                isRel(newPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 5 items (excludeNonLatest = false) //
+        ////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(newPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(newPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                isRel(newPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////
+        // do item install on new publication //
+        ////////////////////////////////////////
+
+        WorkspaceItem newPublicationWSI = workspaceItemService.findByItem(context, newPublication);
+        installItemService.installItem(context, newPublicationWSI);
+        context.dispatchEvents();
+
+        ///////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 5 items (excludeNonLatest = true) //
+        ///////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isProjectOfPublication, project1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPublication, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(newPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 5 items (excludeNonLatest = false) //
+        ////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                isRel(newPublication, isAuthorOfPublication, person1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0),
+                isRel(newPublication, isProjectOfPublication, project1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(newPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        //////////////
+        // clean up //
+        //////////////
+
+        // need to manually delete all relationships to avoid SQL constraint violation exception
+        List<Relationship> relationships = relationshipService.findAll(context);
+        for (Relationship relationship : relationships) {
+            relationshipService.delete(context, relationship);
+        }
+    }
+
+    @Test
+    public void test_createNewVersionOfItemAndModifyRelationships() throws Exception {
+        ///////////////////////////////////////////////
+        // create a publication with 3 relationships //
+        ///////////////////////////////////////////////
+
+        Item person1 = ItemBuilder.createItem(context, collection)
+            .withTitle("person 1")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .build();
+
+        Item project1 = ItemBuilder.createItem(context, collection)
+            .withTitle("project 1")
+            .withMetadata("dspace", "entity", "type", projectEntityType.getLabel())
+            .build();
+
+        Item orgUnit1 = ItemBuilder.createItem(context, collection)
+            .withTitle("org unit 1")
+            .withMetadata("dspace", "entity", "type", orgUnitEntityType.getLabel())
+            .build();
+
+        Item originalPublication = ItemBuilder.createItem(context, collection)
+            .withTitle("original publication")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, person1, isAuthorOfPublication)
+            .build();
+
+        RelationshipBuilder
+            .createRelationshipBuilder(context, originalPublication, project1, isProjectOfPublication)
+            .build();
+
+        RelationshipBuilder
+            .createRelationshipBuilder(context, originalPublication, orgUnit1, isOrgUnitOfPublication)
+            .build();
+
+        /////////////////////////////////////////////////////////
+        // verify that the relationships were properly created //
+        /////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        /////////////////////////////////////////////
+        // create a new version of the publication //
+        /////////////////////////////////////////////
+
+        Version newVersion = versioningService.createNewVersion(context, originalPublication);
+        Item newPublication = newVersion.getItem();
+        assertNotSame(originalPublication, newPublication);
+
+        /////////////////////////////////////////////
+        // modify relationships on new publication //
+        /////////////////////////////////////////////
+
+        Item person2 = ItemBuilder.createItem(context, collection)
+            .withTitle("person 2")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .build();
+
+        Item orgUnit2 = ItemBuilder.createItem(context, collection)
+            .withTitle("org unit 2")
+            .withMetadata("dspace", "entity", "type", orgUnitEntityType.getLabel())
+            .build();
+
+        // on new item, remove relationship with project 1
+        List<Relationship> newProjectRels = relationshipService
+            .findByItemAndRelationshipType(context, newPublication, isProjectOfPublication);
+        assertEquals(1, newProjectRels.size());
+        relationshipService.delete(context, newProjectRels.get(0));
+
+        // on new item remove relationship with org unit 1
+        List<Relationship> newOrgUnitRels = relationshipService
+            .findByItemAndRelationshipType(context, newPublication, isOrgUnitOfPublication);
+        assertEquals(1, newOrgUnitRels.size());
+        relationshipService.delete(context, newOrgUnitRels.get(0));
+
+        RelationshipBuilder.createRelationshipBuilder(context, newPublication, person2, isAuthorOfPublication)
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, newPublication, orgUnit2, isOrgUnitOfPublication)
+            .build();
+
+        ///////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 7 items (excludeNonLatest = true) //
+        ///////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person2, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                // NOTE: BOTH because new relationship
+                isRel(newPublication, isAuthorOfPublication, person2, BOTH, 1, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit2, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                // NOTE: BOTH because new relationship
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit2, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPublication, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                // NOTE: BOTH because new relationship
+                isRel(newPublication, isAuthorOfPublication, person2, BOTH, 1, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit2, BOTH, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 7 items (excludeNonLatest = false) //
+        ////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(newPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                // NOTE: BOTH because new relationship
+                isRel(newPublication, isAuthorOfPublication, person2, BOTH, 1, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isProjectOfPublication, project1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                // NOTE: BOTH because new relationship
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit2, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                // NOTE: BOTH because new relationship
+                isRel(newPublication, isAuthorOfPublication, person2, BOTH, 1, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit2, BOTH, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////
+        // do item install on new publication //
+        ////////////////////////////////////////
+
+        WorkspaceItem newPublicationWSI = workspaceItemService.findByItem(context, newPublication);
+        installItemService.installItem(context, newPublicationWSI);
+        context.dispatchEvents();
+
+        ///////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 7 items (excludeNonLatest = true) //
+        ///////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person2, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person2, BOTH, 1, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, true),
+            empty()
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, true),
+            empty()
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit2, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit2, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPublication, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(newPublication, isAuthorOfPublication, person2, BOTH, 1, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit2, BOTH, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 7 items (excludeNonLatest = false) //
+        ////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                isRel(originalPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0),
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isAuthorOfPublication, person1, RIGHT_ONLY, 0, 0),
+                isRel(newPublication, isAuthorOfPublication, person1, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, person2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person2, BOTH, 1, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isProjectOfPublication, project1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(originalPublication, isOrgUnitOfPublication, orgUnit1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit2, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPublication, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(newPublication, isAuthorOfPublication, person1, BOTH, 0, 0),
+                isRel(newPublication, isAuthorOfPublication, person2, BOTH, 1, 0),
+                isRel(newPublication, isOrgUnitOfPublication, orgUnit2, BOTH, 0, 0)
+            ))
+        );
+
+        //////////////
+        // clean up //
+        //////////////
+
+        // need to manually delete all relationships to avoid SQL constraint violation exception
+        List<Relationship> relationships = relationshipService.findAll(context);
+        for (Relationship relationship : relationships) {
+            relationshipService.delete(context, relationship);
+        }
+    }
+
+    @Test
+    public void test_createNewVersionOfItemOnRightSideOfRelationships() throws Exception {
+        //////////////////////////////////////////
+        // create a person with 3 relationships //
+        //////////////////////////////////////////
+
+        Item publication1 = ItemBuilder.createItem(context, collection)
+            .withTitle("publication 1")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        Item project1 = ItemBuilder.createItem(context, collection)
+            .withTitle("project 1")
+            .withMetadata("dspace", "entity", "type", projectEntityType.getLabel())
+            .build();
+
+        Item orgUnit1 = ItemBuilder.createItem(context, collection)
+            .withTitle("org unit 1")
+            .withMetadata("dspace", "entity", "type", orgUnitEntityType.getLabel())
+            .build();
+
+        Item originalPerson = ItemBuilder.createItem(context, collection)
+            .withTitle("original person")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, publication1, originalPerson, isAuthorOfPublication)
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, project1, originalPerson, isMemberOfProject)
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, orgUnit1, originalPerson, isMemberOfOrgUnit)
+            .build();
+
+        /////////////////////////////////////////////////////////
+        // verify that the relationships were properly created //
+        /////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPerson, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, BOTH, 0, 0),
+                isRel(project1, isMemberOfProject, originalPerson, BOTH, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, publication1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(project1, isMemberOfProject, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////
+        // create a new version of the person //
+        ////////////////////////////////////////
+
+        Version newVersion = versioningService.createNewVersion(context, originalPerson);
+        Item newPerson = newVersion.getItem();
+        assertNotSame(originalPerson, newPerson);
+
+        ///////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 5 items (excludeNonLatest = true) //
+        ///////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPerson, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, BOTH, 0, 0),
+                isRel(project1, isMemberOfProject, originalPerson, BOTH, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, publication1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(project1, isMemberOfProject, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPerson, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, newPerson, LEFT_ONLY, 0, 0),
+                isRel(project1, isMemberOfProject, newPerson, LEFT_ONLY, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, newPerson, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 5 items (excludeNonLatest = false) //
+        ////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPerson, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, BOTH, 0, 0),
+                isRel(project1, isMemberOfProject, originalPerson, BOTH, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, publication1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, BOTH, 0, 0),
+                isRel(publication1, isAuthorOfPublication, newPerson, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(project1, isMemberOfProject, originalPerson, BOTH, 0, 0),
+                isRel(project1, isMemberOfProject, newPerson, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, BOTH, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, newPerson, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPerson, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, newPerson, LEFT_ONLY, 0, 0),
+                isRel(project1, isMemberOfProject, newPerson, LEFT_ONLY, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, newPerson, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        ///////////////////////////////////
+        // do item install on new person //
+        ///////////////////////////////////
+
+        WorkspaceItem newPersonWSI = workspaceItemService.findByItem(context, newPerson);
+        installItemService.installItem(context, newPersonWSI);
+        context.dispatchEvents();
+
+        ///////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 5 items (excludeNonLatest = true) //
+        ///////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPerson, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, LEFT_ONLY, 0, 0),
+                isRel(project1, isMemberOfProject, originalPerson, LEFT_ONLY, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, publication1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, newPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(project1, isMemberOfProject, newPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(orgUnit1, isMemberOfOrgUnit, newPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPerson, -1, -1, false, true),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, newPerson, BOTH, 0, 0),
+                isRel(project1, isMemberOfProject, newPerson, BOTH, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, newPerson, BOTH, 0, 0)
+            ))
+        );
+
+        ////////////////////////////////////////////////////////////////////////
+        // verify the relationships of all 5 items (excludeNonLatest = false) //
+        ////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, originalPerson, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, LEFT_ONLY, 0, 0),
+                isRel(project1, isMemberOfProject, originalPerson, LEFT_ONLY, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, publication1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, originalPerson, LEFT_ONLY, 0, 0),
+                isRel(publication1, isAuthorOfPublication, newPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, project1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(project1, isMemberOfProject, originalPerson, LEFT_ONLY, 0, 0),
+                isRel(project1, isMemberOfProject, newPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, orgUnit1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(orgUnit1, isMemberOfOrgUnit, originalPerson, LEFT_ONLY, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, newPerson, BOTH, 0, 0)
+            ))
+        );
+
+        assertThat(
+            relationshipService.findByItem(context, newPerson, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1, isAuthorOfPublication, newPerson, BOTH, 0, 0),
+                isRel(project1, isMemberOfProject, newPerson, BOTH, 0, 0),
+                isRel(orgUnit1, isMemberOfOrgUnit, newPerson, BOTH, 0, 0)
+            ))
+        );
+
+        //////////////
+        // clean up //
+        //////////////
+
+        // need to manually delete all relationships to avoid SQL constraint violation exception
+        List<Relationship> relationships = relationshipService.findAll(context);
+        for (Relationship relationship : relationships) {
+            relationshipService.delete(context, relationship);
+        }
+    }
+
+    @Test
+    public void test_createNewVersionOfItemAndVerifyMetadataOrder() throws Exception {
+        /////////////////////////////////////////
+        // create a publication with 6 authors //
+        /////////////////////////////////////////
+
+        Item originalPublication = ItemBuilder.createItem(context, collection)
+            .withTitle("original publication")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        // author 1 (plain metadata)
+        itemService.addMetadata(context, originalPublication, "dc", "contributor", "author", null, "author 1 (plain)");
+
+        // author 2 (virtual)
+        Item author2 = ItemBuilder.createItem(context, collection)
+            .withTitle("author 2 (item)")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .withPersonIdentifierFirstName("2 (item)")
+            .withPersonIdentifierLastName("author")
+            .build();
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, author2, isAuthorOfPublication)
+            .build();
+
+        // author 3 (virtual)
+        Item author3 = ItemBuilder.createItem(context, collection)
+            .withTitle("author 3 (item)")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .withPersonIdentifierFirstName("3 (item)")
+            .withPersonIdentifierLastName("author")
+            .build();
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, author3, isAuthorOfPublication)
+            .build();
+
+        // author 4 (virtual)
+        Item author4 = ItemBuilder.createItem(context, collection)
+            .withTitle("author 4 (item)")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .withPersonIdentifierFirstName("4 (item)")
+            .withPersonIdentifierLastName("author")
+            .build();
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, author4, isAuthorOfPublication)
+            .build();
+
+        // author 5 (virtual)
+        Item author5 = ItemBuilder.createItem(context, collection)
+            .withTitle("author 5 (item)")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .withPersonIdentifierFirstName("5 (item)")
+            .withPersonIdentifierLastName("author")
+            .build();
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, author5, isAuthorOfPublication)
+            .build();
+
+        // author 6 (plain metadata)
+        itemService.addMetadata(context, originalPublication, "dc", "contributor", "author", null, "author 6 (plain)");
+
+        // author 7 (virtual)
+        Item author7 = ItemBuilder.createItem(context, collection)
+            .withTitle("author 7 (item)")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .withPersonIdentifierFirstName("7 (item)")
+            .withPersonIdentifierLastName("author")
+            .build();
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, author7, isAuthorOfPublication)
+            .build();
+
+        // author 8 (plain metadata)
+        itemService.addMetadata(context, originalPublication, "dc", "contributor", "author", null, "author 8 (plain)");
+
+        // author 9 (virtual)
+        Item author9 = ItemBuilder.createItem(context, collection)
+            .withTitle("author 9 (item)")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .withPersonIdentifierFirstName("9 (item)")
+            .withPersonIdentifierLastName("author")
+            .build();
+        RelationshipBuilder.createRelationshipBuilder(context, originalPublication, author9, isAuthorOfPublication)
+            .build();
+
+        ////////////////////////////////
+        // test dc.contributor.author //
+        ////////////////////////////////
+
+        List<MetadataValue> oldMdvs = itemService.getMetadata(
+            originalPublication, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(9, oldMdvs.size());
+
+        assertFalse(oldMdvs.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("author 1 (plain)", oldMdvs.get(0).getValue());
+        assertEquals(0, oldMdvs.get(0).getPlace());
+
+        assertTrue(oldMdvs.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("author, 2 (item)", oldMdvs.get(1).getValue());
+        assertEquals(1, oldMdvs.get(1).getPlace());
+
+        assertTrue(oldMdvs.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("author, 3 (item)", oldMdvs.get(2).getValue());
+        assertEquals(2, oldMdvs.get(2).getPlace());
+
+        assertTrue(oldMdvs.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("author, 4 (item)", oldMdvs.get(3).getValue());
+        assertEquals(3, oldMdvs.get(3).getPlace());
+
+        assertTrue(oldMdvs.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("author, 5 (item)", oldMdvs.get(4).getValue());
+        assertEquals(4, oldMdvs.get(4).getPlace());
+
+        assertFalse(oldMdvs.get(5) instanceof RelationshipMetadataValue);
+        assertEquals("author 6 (plain)", oldMdvs.get(5).getValue());
+        assertEquals(5, oldMdvs.get(5).getPlace());
+
+        assertTrue(oldMdvs.get(6) instanceof RelationshipMetadataValue);
+        assertEquals("author, 7 (item)", oldMdvs.get(6).getValue());
+        assertEquals(6, oldMdvs.get(6).getPlace());
+
+        assertFalse(oldMdvs.get(7) instanceof RelationshipMetadataValue);
+        assertEquals("author 8 (plain)", oldMdvs.get(7).getValue());
+        assertEquals(7, oldMdvs.get(7).getPlace());
+
+        assertTrue(oldMdvs.get(8) instanceof RelationshipMetadataValue);
+        assertEquals("author, 9 (item)", oldMdvs.get(8).getValue());
+        assertEquals(8, oldMdvs.get(8).getPlace());
+
+        /////////////////////////////////////////////
+        // test relationship isAuthorOfPublication //
+        /////////////////////////////////////////////
+
+        List<Relationship> oldRelationships = relationshipService.findByItem(context, originalPublication);
+        assertEquals(6, oldRelationships.size());
+
+        assertEquals(originalPublication, oldRelationships.get(0).getLeftItem());
+        assertEquals(isAuthorOfPublication, oldRelationships.get(0).getRelationshipType());
+        assertEquals(author2, oldRelationships.get(0).getRightItem());
+        assertEquals(1, oldRelationships.get(0).getLeftPlace());
+        assertEquals(0, oldRelationships.get(0).getRightPlace());
+
+        assertEquals(originalPublication, oldRelationships.get(1).getLeftItem());
+        assertEquals(isAuthorOfPublication, oldRelationships.get(1).getRelationshipType());
+        assertEquals(author3, oldRelationships.get(1).getRightItem());
+        assertEquals(2, oldRelationships.get(1).getLeftPlace());
+        assertEquals(0, oldRelationships.get(1).getRightPlace());
+
+        assertEquals(originalPublication, oldRelationships.get(2).getLeftItem());
+        assertEquals(isAuthorOfPublication, oldRelationships.get(2).getRelationshipType());
+        assertEquals(author4, oldRelationships.get(2).getRightItem());
+        assertEquals(3, oldRelationships.get(2).getLeftPlace());
+        assertEquals(0, oldRelationships.get(2).getRightPlace());
+
+        assertEquals(originalPublication, oldRelationships.get(3).getLeftItem());
+        assertEquals(isAuthorOfPublication, oldRelationships.get(3).getRelationshipType());
+        assertEquals(author5, oldRelationships.get(3).getRightItem());
+        assertEquals(4, oldRelationships.get(3).getLeftPlace());
+        assertEquals(0, oldRelationships.get(3).getRightPlace());
+
+        assertEquals(originalPublication, oldRelationships.get(4).getLeftItem());
+        assertEquals(isAuthorOfPublication, oldRelationships.get(4).getRelationshipType());
+        assertEquals(author7, oldRelationships.get(4).getRightItem());
+        assertEquals(6, oldRelationships.get(4).getLeftPlace());
+        assertEquals(0, oldRelationships.get(4).getRightPlace());
+
+        assertEquals(originalPublication, oldRelationships.get(5).getLeftItem());
+        assertEquals(isAuthorOfPublication, oldRelationships.get(5).getRelationshipType());
+        assertEquals(author9, oldRelationships.get(5).getRightItem());
+        assertEquals(8, oldRelationships.get(5).getLeftPlace());
+        assertEquals(0, oldRelationships.get(5).getRightPlace());
+
+        ///////////////////////////////////////
+        // create new version of publication //
+        ///////////////////////////////////////
+
+        Version newVersion = versioningService.createNewVersion(context, originalPublication);
+        Item newPublication = newVersion.getItem();
+        assertNotSame(originalPublication, newPublication);
+
+        ////////////////////////////////
+        // test dc.contributor.author //
+        ////////////////////////////////
+
+        List<MetadataValue> newMdvs = itemService.getMetadata(
+            newPublication, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(9, newMdvs.size());
+
+        assertFalse(newMdvs.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("author 1 (plain)", newMdvs.get(0).getValue());
+        assertEquals(0, newMdvs.get(0).getPlace());
+
+        assertTrue(newMdvs.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("author, 2 (item)", newMdvs.get(1).getValue());
+        assertEquals(1, newMdvs.get(1).getPlace());
+
+        assertTrue(newMdvs.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("author, 3 (item)", newMdvs.get(2).getValue());
+        assertEquals(2, newMdvs.get(2).getPlace());
+
+        assertTrue(newMdvs.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("author, 4 (item)", newMdvs.get(3).getValue());
+        assertEquals(3, newMdvs.get(3).getPlace());
+
+        assertTrue(newMdvs.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("author, 5 (item)", newMdvs.get(4).getValue());
+        assertEquals(4, newMdvs.get(4).getPlace());
+
+        assertFalse(newMdvs.get(5) instanceof RelationshipMetadataValue);
+        assertEquals("author 6 (plain)", newMdvs.get(5).getValue());
+        assertEquals(5, newMdvs.get(5).getPlace());
+
+        assertTrue(newMdvs.get(6) instanceof RelationshipMetadataValue);
+        assertEquals("author, 7 (item)", newMdvs.get(6).getValue());
+        assertEquals(6, newMdvs.get(6).getPlace());
+
+        assertFalse(newMdvs.get(7) instanceof RelationshipMetadataValue);
+        assertEquals("author 8 (plain)", newMdvs.get(7).getValue());
+        assertEquals(7, newMdvs.get(7).getPlace());
+
+        assertTrue(newMdvs.get(8) instanceof RelationshipMetadataValue);
+        assertEquals("author, 9 (item)", newMdvs.get(8).getValue());
+        assertEquals(8, newMdvs.get(8).getPlace());
+
+        /////////////////////////////////////////////
+        // test relationship isAuthorOfPublication //
+        /////////////////////////////////////////////
+
+        List<Relationship> newRelationships = relationshipService.findByItem(context, newPublication);
+        assertEquals(6, newRelationships.size());
+
+        assertEquals(newPublication, newRelationships.get(0).getLeftItem());
+        assertEquals(isAuthorOfPublication, newRelationships.get(0).getRelationshipType());
+        assertEquals(author2, newRelationships.get(0).getRightItem());
+        assertEquals(1, newRelationships.get(0).getLeftPlace());
+        assertEquals(0, newRelationships.get(0).getRightPlace());
+
+        assertEquals(newPublication, newRelationships.get(1).getLeftItem());
+        assertEquals(isAuthorOfPublication, newRelationships.get(1).getRelationshipType());
+        assertEquals(author3, newRelationships.get(1).getRightItem());
+        assertEquals(2, newRelationships.get(1).getLeftPlace());
+        assertEquals(0, newRelationships.get(1).getRightPlace());
+
+        assertEquals(newPublication, newRelationships.get(2).getLeftItem());
+        assertEquals(isAuthorOfPublication, newRelationships.get(2).getRelationshipType());
+        assertEquals(author4, newRelationships.get(2).getRightItem());
+        assertEquals(3, newRelationships.get(2).getLeftPlace());
+        assertEquals(0, newRelationships.get(2).getRightPlace());
+
+        assertEquals(newPublication, newRelationships.get(3).getLeftItem());
+        assertEquals(isAuthorOfPublication, newRelationships.get(3).getRelationshipType());
+        assertEquals(author5, newRelationships.get(3).getRightItem());
+        assertEquals(4, newRelationships.get(3).getLeftPlace());
+        assertEquals(0, newRelationships.get(3).getRightPlace());
+
+        assertEquals(newPublication, newRelationships.get(4).getLeftItem());
+        assertEquals(isAuthorOfPublication, newRelationships.get(4).getRelationshipType());
+        assertEquals(author7, newRelationships.get(4).getRightItem());
+        assertEquals(6, newRelationships.get(4).getLeftPlace());
+        assertEquals(0, newRelationships.get(4).getRightPlace());
+
+        assertEquals(newPublication, newRelationships.get(5).getLeftItem());
+        assertEquals(isAuthorOfPublication, newRelationships.get(5).getRelationshipType());
+        assertEquals(author9, newRelationships.get(5).getRightItem());
+        assertEquals(8, newRelationships.get(5).getLeftPlace());
+        assertEquals(0, newRelationships.get(5).getRightPlace());
+
+        //////////////
+        // clean up //
+        //////////////
+
+        // need to manually delete all relationships to avoid SQL constraint violation exception
+        List<Relationship> relationships = relationshipService.findAll(context);
+        for (Relationship relationship : relationships) {
+            relationshipService.delete(context, relationship);
+        }
+    }
+
+    /**
+     * This test will
+     * - create a publication with 10 projects
+     * - Remove, move, add projects
+     * - Verify the order remains correct
+     * @throws Exception
+     */
+    @Test
+    public void test_createNewVersionOfItemWithAddRemoveMove() throws Exception {
+        ///////////////////////////////////////////
+        // create a publication with 10 projects //
+        ///////////////////////////////////////////
+
+        Item originalPublication = ItemBuilder.createItem(context, collection)
+            .withTitle("original publication")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        List<Item> projects = new ArrayList<>();
+
+        for (int i = 0; i < 10; i++) {
+            Item project = ItemBuilder.createItem(context, collection)
+                    .withTitle("project " + i)
+                    .withMetadata("dspace", "entity", "type", projectEntityType.getLabel())
+                    .build();
+            projects.add(project);
+
+            RelationshipBuilder
+                    .createRelationshipBuilder(context, originalPublication, project, isProjectOfPublication)
+                    .build();
+        }
+
+        AtomicInteger counterOriginalPublication = new AtomicInteger();
+        List<Matcher<Object>> listOriginalPublication = projects.stream().map(
+                project -> isRel(originalPublication, isProjectOfPublication, project, BOTH,
+                        counterOriginalPublication.getAndIncrement(), 0)
+        ).collect(Collectors.toCollection(ArrayList::new));
+
+        /////////////////////////////////////////////////////////////////////
+        // verify the relationships of all items (excludeNonLatest = true) //
+        /////////////////////////////////////////////////////////////////////
+
+        assertThat(
+                relationshipService.findByItem(context, originalPublication, -1, -1, false, true),
+                containsInAnyOrder(listOriginalPublication)
+        );
+
+        //////////////////////////////////////////////////////////////////////
+        // verify the relationships of all items (excludeNonLatest = false) //
+        //////////////////////////////////////////////////////////////////////
+
+        assertThat(
+                relationshipService.findByItem(context, originalPublication, -1, -1, false, false),
+                containsInAnyOrder(listOriginalPublication)
+        );
+
+        /////////////////////////////////////////////
+        // create a new version of the publication //
+        /////////////////////////////////////////////
+
+        Version newVersion = versioningService.createNewVersion(context, originalPublication);
+        Item newPublication = newVersion.getItem();
+        assertNotSame(originalPublication, newPublication);
+
+        verifyProjectsMatch(originalPublication, projects, newPublication, projects, false);//
+
+        /////////////////////////////////////////////
+        // modify relationships on new publication //
+        /////////////////////////////////////////////
+
+        List<Item> newProjects = new ArrayList<>(projects);
+        assertEquals(newProjects.size(), 10);
+
+        removeProject(newPublication, 5, newProjects);
+
+        assertEquals(projects.size(), 10);
+        assertEquals(newProjects.size(), 9);
+        verifyProjectsMatch(originalPublication, projects, newPublication, newProjects, false);
+
+        Item project6 = newProjects.get(6);
+        moveProject(newPublication, 6, 2, newProjects);
+        assertEquals(newProjects.size(), 9);
+        assertEquals(newProjects.get(2), project6);
+        assertNotEquals(projects.get(2), project6);
+        verifyProjectsMatch(originalPublication, projects, newPublication, newProjects, false);
+
+        Item project1 = newProjects.get(1);
+        moveProject(newPublication, 1, 5, newProjects);
+        assertEquals(newProjects.size(), 9);
+        assertEquals(newProjects.get(5), project1);
+        assertNotEquals(projects.get(5), project1);
+        verifyProjectsMatch(originalPublication, projects, newPublication, newProjects, false);
+
+        Item project = ItemBuilder.createItem(context, collection)
+                .withTitle("project 10")
+                .withMetadata("dspace", "entity", "type", projectEntityType.getLabel())
+                .build();
+        newProjects.add(4, project);
+
+        RelationshipBuilder
+                .createRelationshipBuilder(context, newPublication, project, isProjectOfPublication, 4, -1)
+                .build();
+
+        verifyProjectsMatch(originalPublication, projects, newPublication, newProjects, false);
+
+        ////////////////////////////////////////
+        // do item install on new publication //
+        ////////////////////////////////////////
+
+        WorkspaceItem newPublicationWSI = workspaceItemService.findByItem(context, newPublication);
+        installItemService.installItem(context, newPublicationWSI);
+        context.dispatchEvents();
+
+        verifyProjectsMatch(originalPublication, projects, newPublication, newProjects, true);
+
+        //////////////
+        // clean up //
+        //////////////
+
+        // need to manually delete all relationships to avoid SQL constraint violation exception
+        List<Relationship> relationships = relationshipService.findAll(context);
+        for (Relationship relationship : relationships) {
+            relationshipService.delete(context, relationship);
+        }
+    }
+
+    protected void removeProject(Item newPublication, int place, List<Item> newProjects)
+            throws SQLException, AuthorizeException {
+        List<Relationship> projectRels = relationshipService
+                .findByItemAndRelationshipType(context, newProjects.get(place), isProjectOfPublication, -1, -1, false)
+                .stream()
+                .filter(
+                        relationship -> relationship.getLeftItem().equals(newPublication)
+                )
+                .collect(Collectors.toCollection(ArrayList::new));
+        assertEquals(1, projectRels.size());
+        relationshipService.delete(context, projectRels.get(0));
+        newProjects.remove(newProjects.get(place));
+    }
+
+    protected void moveProject(Item newPublication, int oldPlace, int newPlace, List<Item> newProjects)
+            throws SQLException, AuthorizeException {
+        Item project = newProjects.get(oldPlace);
+        List<Relationship> projectRels = relationshipService
+                .findByItemAndRelationshipType(context, project, isProjectOfPublication, -1, -1, false)
+                .stream()
+                .filter(
+                        relationship -> relationship.getLeftItem().equals(newPublication)
+                )
+                .collect(Collectors.toCollection(ArrayList::new));
+        assertEquals(1, projectRels.size());
+        relationshipService.move(context, projectRels.get(0), newPlace, null);
+        newProjects.remove(project);
+        newProjects.add(newPlace, project);
+    }
+
+    protected void verifyProjectsMatch(Item originalPublication, List<Item> originalProjects,
+                                     Item newPublication, List<Item> newProjects, boolean newPublicationArchived)
+            throws SQLException {
+
+        /////////////////////////////////////////////////////////
+        // verify that the relationships were properly created //
+        /////////////////////////////////////////////////////////
+
+        AtomicInteger counterOriginalPublication = new AtomicInteger();
+        List<Matcher<Object>> listOriginalPublication = originalProjects.stream().map(
+                project -> isRel(originalPublication, isProjectOfPublication, project,
+                        newPublicationArchived ? RIGHT_ONLY : BOTH,
+                        counterOriginalPublication.getAndIncrement(), 0)
+        ).collect(Collectors.toCollection(ArrayList::new));
+
+        AtomicInteger counterNewPublication = new AtomicInteger();
+        List<Matcher<Object>> listNewPublication = newProjects.stream().map(
+                project -> isRel(newPublication, isProjectOfPublication, project,
+                        newPublicationArchived || !originalProjects.contains(project) ?
+                                BOTH : RIGHT_ONLY,
+                        counterNewPublication.getAndIncrement(), 0)
+        ).collect(Collectors.toCollection(ArrayList::new));
+
+        /////////////////////////////////////////////////////////////////////
+        // verify the relationships of all items (excludeNonLatest = true) //
+        /////////////////////////////////////////////////////////////////////
+
+        assertEquals(
+                relationshipService.countByItem(context, originalPublication, false, true),
+                originalProjects.size()
+        );
+
+        assertThat(
+                relationshipService.findByItem(context, originalPublication, -1, -1, false, true),
+                containsInAnyOrder(listOriginalPublication)
+        );
+
+        assertEquals(
+                relationshipService.countByItem(context, newPublication, false, true),
+                newProjects.size()
+        );
+
+        assertThat(
+                relationshipService.findByItem(context, newPublication, -1, -1, false, true),
+                containsInAnyOrder(listNewPublication)
+        );
+
+        //////////////////////////////////////////////////////////////////////
+        // verify the relationships of all items (excludeNonLatest = false) //
+        //////////////////////////////////////////////////////////////////////
+
+        assertThat(
+                relationshipService.findByItem(context, originalPublication, -1, -1, false, false),
+                containsInAnyOrder(listOriginalPublication)
+        );
+
+        assertThat(
+                relationshipService.findByItem(context, newPublication, -1, -1, false, false),
+                containsInAnyOrder(listNewPublication)
+        );
+    }
+
+    /**
+     * NOTE: If Spring bean classes would be created with the new keyword, nothing would be autowired.
+     */
+    protected <T> T createBean(Class<T> beanClass) throws Exception {
+        AutowireCapableBeanFactory factory = DSpaceServicesFactory.getInstance().getServiceManager()
+            .getApplicationContext().getAutowireCapableBeanFactory();
+
+        T bean = beanClass.getDeclaredConstructor().newInstance();
+
+        factory.autowireBean(bean);
+
+        return bean;
+    }
+
+    /**
+     * Run the given callback with a virtual metadata config that's different from virtual-metadata.xml,
+     * and clean up after the callback has terminated.
+     * @param configModifier lambda that generates the temporary virtual metadata config.
+     * @param callback the callback that will be executed with the temporary virtual metadata config.
+     */
+    protected void runWithVirtualMetadataConfig(
+        FailableSupplier<Map<String, HashMap<String, VirtualMetadataConfiguration>>, Exception> configModifier,
+        FailableRunnable<Exception> callback
+    ) throws Exception {
+        VirtualMetadataPopulator virtualMetadataPopulator = DSpaceServicesFactory.getInstance()
+            .getServiceManager().getServicesByType(VirtualMetadataPopulator.class).get(0);
+
+        // keep reference to old config
+        Map<String, HashMap<String, VirtualMetadataConfiguration>> oldConfig = virtualMetadataPopulator.getMap();
+
+        try {
+            // set new config
+            Map<String, HashMap<String, VirtualMetadataConfiguration>> newConfig = configModifier.get();
+            virtualMetadataPopulator.setMap(newConfig);
+
+            // run the callback
+            callback.run();
+        } finally {
+            // reset handlers
+            virtualMetadataPopulator.setMap(oldConfig);
+        }
+    }
+
+    @Test
+    public void test_placeRecalculationAfterDelete() throws Exception {
+        // NOTE: this test uses relationship isIssueOfJournalVolume, because it adds virtual metadata
+        //       on both sides of the relationship
+
+        /////////////////////////////////////////
+        // properly configure virtual metadata //
+        /////////////////////////////////////////
+
+        ServiceManager serviceManager = DSpaceServicesFactory.getInstance().getServiceManager();
+
+        // virtual metadata field publicationissue.issueNumber needs to be used in place calculations
+        Collected issueVmd = serviceManager.getServiceByName("journalIssue_number", Collected.class);
+        assertNotNull(issueVmd);
+        boolean ogIssueVmdUseForPlace = issueVmd.getUseForPlace();
+        issueVmd.setUseForPlace(true);
+
+        //////////////////
+        // create items //
+        //////////////////
+
+        // journal volume 1.1
+        Item v1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal volume 1")
+            .withMetadata("dspace", "entity", "type", journalVolumeEntityType.getLabel())
+            .withMetadata("publicationvolume", "volumeNumber", null, "volume nr 3 (rel)")
+            .build();
+
+        // journal issue 1.1
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal issue 1")
+            .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+            .withMetadata("publicationissue", "issueNumber", null, "issue nr 1 (rel)")
+            .build();
+
+        // journal issue 3.1
+        Item i3_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal issue 3")
+            .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+            .withMetadata("publicationissue", "issueNumber", null, "issue nr 3 (rel)")
+            .build();
+
+        // journal issue 5.1
+        Item i5_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal issue 5")
+            .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+            .withMetadata("publicationissue", "issueNumber", null, "issue nr 5 (rel)")
+            .build();
+
+        //////////////////////////////////////////////
+        // create relationships and metadata values //
+        //////////////////////////////////////////////
+
+        // relationship - volume 1 & issue 1
+        RelationshipBuilder.createRelationshipBuilder(context, v1_1, i1_1, isIssueOfJournalVolume).build();
+
+        // metadata - volume 1 & issue 2
+        itemService.addMetadata(context, v1_1, "publicationissue", "issueNumber", null, null, "issue nr 2 (plain)");
+
+        // relationship - volume 1 & issue 3
+        RelationshipBuilder.createRelationshipBuilder(context, v1_1, i3_1, isIssueOfJournalVolume).build();
+
+        // metadata - volume 1 & issue 4
+        itemService.addMetadata(context, v1_1, "publicationissue", "issueNumber", null, null, "issue nr 4 (plain)");
+
+        // relationship - volume 1 & issue 5
+        RelationshipBuilder.createRelationshipBuilder(context, v1_1, i5_1, isIssueOfJournalVolume).build();
+
+        // metadata - volume 1 & issue 6
+        itemService.addMetadata(context, v1_1, "publicationissue", "issueNumber", null, null, "issue nr 6 (plain)");
+
+        // SUMMARY
+        //
+        // volume 3
+        // - pos 0: issue 1 (rel)
+        // - pos 1: issue 2 (plain)
+        // - pos 2: issue 3 (rel)
+        // - pos 3: issue 4 (plain)
+        // - pos 4: issue 5 (rel)
+        // - pos 5: issue 6 (plain)
+
+        /////////////////////////////////
+        // initial - verify volume 3.1 //
+        /////////////////////////////////
+
+        List<MetadataValue> mdvs1 = itemService.getMetadata(
+            v1_1, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(6, mdvs1.size());
+
+        assertTrue(mdvs1.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs1.get(0).getValue());
+        assertEquals(0, mdvs1.get(0).getPlace());
+
+        assertFalse(mdvs1.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (plain)", mdvs1.get(1).getValue());
+        assertEquals(1, mdvs1.get(1).getPlace());
+
+        assertTrue(mdvs1.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs1.get(2).getValue());
+        assertEquals(2, mdvs1.get(2).getPlace());
+
+        assertFalse(mdvs1.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (plain)", mdvs1.get(3).getValue());
+        assertEquals(3, mdvs1.get(3).getPlace());
+
+        assertTrue(mdvs1.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs1.get(4).getValue());
+        assertEquals(4, mdvs1.get(4).getPlace());
+
+        assertFalse(mdvs1.get(5) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 6 (plain)", mdvs1.get(5).getValue());
+        assertEquals(5, mdvs1.get(5).getPlace());
+
+        /////////////////////////////////////
+        // create new version - volume 1.2 //
+        /////////////////////////////////////
+
+        Item v1_2 = versioningService.createNewVersion(context, v1_1).getItem();
+        installItemService.installItem(context, workspaceItemService.findByItem(context, v1_2));
+        context.commit();
+
+        ////////////////////////////////////
+        // create new version - issue 3.2 //
+        ////////////////////////////////////
+
+        Item i3_2 = versioningService.createNewVersion(context, i3_1).getItem();
+        installItemService.installItem(context, workspaceItemService.findByItem(context, i3_2));
+        context.commit();
+
+        ////////////////////////////////////////////////
+        // after version creation - verify volume 1.1 //
+        ////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_1, -1, -1, false, false),
+                containsInAnyOrder(List.of(
+                    isRel(v1_1, isIssueOfJournalVolume, i1_1, RIGHT_ONLY, 0, 0),
+                    isRel(v1_1, isIssueOfJournalVolume, i3_1, RIGHT_ONLY, 2, 0),
+                    isRel(v1_1, isIssueOfJournalVolume, i5_1, RIGHT_ONLY, 4, 0)
+                ))
+        );
+
+        List<MetadataValue> mdvs4 = itemService.getMetadata(
+            v1_1, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(6, mdvs4.size());
+
+        assertTrue(mdvs4.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs4.get(0).getValue());
+        assertEquals(0, mdvs4.get(0).getPlace());
+
+        assertFalse(mdvs4.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (plain)", mdvs4.get(1).getValue());
+        assertEquals(1, mdvs4.get(1).getPlace());
+
+        assertTrue(mdvs4.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs4.get(2).getValue());
+        assertEquals(2, mdvs4.get(2).getPlace());
+
+        assertFalse(mdvs4.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (plain)", mdvs4.get(3).getValue());
+        assertEquals(3, mdvs4.get(3).getPlace());
+
+        assertTrue(mdvs4.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs4.get(4).getValue());
+        assertEquals(4, mdvs4.get(4).getPlace());
+
+        assertFalse(mdvs4.get(5) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 6 (plain)", mdvs4.get(5).getValue());
+        assertEquals(5, mdvs4.get(5).getPlace());
+
+        ////////////////////////////////////////////////
+        // after version creation - verify volume 1.2 //
+        ////////////////////////////////////////////////
+
+        assertThat(
+                relationshipService.findByItem(context, v1_2, -1, -1, false, false),
+                containsInAnyOrder(List.of(
+                    isRel(v1_2, isIssueOfJournalVolume, i1_1, BOTH, 0, 0),
+                    isRel(v1_2, isIssueOfJournalVolume, i3_1, LEFT_ONLY, 2, 0),
+                    isRel(v1_2, isIssueOfJournalVolume, i5_1, BOTH, 4, 0),
+                    isRel(v1_2, isIssueOfJournalVolume, i3_2, BOTH, 2, 0)
+                ))
+        );
+
+        List<MetadataValue> mdvs7 = itemService.getMetadata(
+            v1_2, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(6, mdvs7.size());
+
+        assertTrue(mdvs7.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs7.get(0).getValue());
+        assertEquals(0, mdvs7.get(0).getPlace());
+
+        assertFalse(mdvs7.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (plain)", mdvs7.get(1).getValue());
+        assertEquals(1, mdvs7.get(1).getPlace());
+
+        assertTrue(mdvs7.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs7.get(2).getValue());
+        assertEquals(2, mdvs7.get(2).getPlace());
+
+        assertFalse(mdvs7.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (plain)", mdvs7.get(3).getValue());
+        assertEquals(3, mdvs7.get(3).getPlace());
+
+        assertTrue(mdvs7.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs7.get(4).getValue());
+        assertEquals(4, mdvs7.get(4).getPlace());
+
+        assertFalse(mdvs7.get(5) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 6 (plain)", mdvs7.get(5).getValue());
+        assertEquals(5, mdvs7.get(5).getPlace());
+
+        ///////////////////////////////////////////////////////////
+        // remove relationship - volume 1.2 & issue 3.2          //
+        // since an issue needs a relationship, delete the issue //
+        ///////////////////////////////////////////////////////////
+
+        Relationship rel1 = getRelationship(v1_2, isIssueOfJournalVolume, i3_2);
+        assertNotNull(rel1);
+
+        itemService.delete(context, context.reloadEntity(i3_2));
+
+        context.commit();
+
+        ////////////////////////////////////
+        // after remove 1 - cache busting //
+        ////////////////////////////////////
+
+        v1_2.setMetadataModified();
+        v1_2 = context.reloadEntity(v1_2);
+
+        ////////////////////////////////////////
+        // after remove 1 - verify volume 3.1 //
+        ////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_1, -1, -1, false, false),
+                containsInAnyOrder(List.of(
+                    isRel(v1_1, isIssueOfJournalVolume, i1_1, RIGHT_ONLY, 0, 0),
+                    isRel(v1_1, isIssueOfJournalVolume, i3_1, RIGHT_ONLY, 2, 0),
+                    isRel(v1_1, isIssueOfJournalVolume, i5_1, RIGHT_ONLY, 4, 0)
+                ))
+        );
+
+        List<MetadataValue> mdvs9 = itemService.getMetadata(
+            v1_1, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(6, mdvs9.size());
+
+        assertTrue(mdvs9.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs9.get(0).getValue());
+        assertEquals(0, mdvs9.get(0).getPlace());
+
+        assertFalse(mdvs9.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (plain)", mdvs9.get(1).getValue());
+        assertEquals(1, mdvs9.get(1).getPlace());
+
+        assertTrue(mdvs9.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs9.get(2).getValue());
+        assertEquals(2, mdvs9.get(2).getPlace());
+
+        assertFalse(mdvs9.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (plain)", mdvs9.get(3).getValue());
+        assertEquals(3, mdvs9.get(3).getPlace());
+
+        assertTrue(mdvs9.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs9.get(4).getValue());
+        assertEquals(4, mdvs9.get(4).getPlace());
+
+        assertFalse(mdvs9.get(5) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 6 (plain)", mdvs9.get(5).getValue());
+        assertEquals(5, mdvs9.get(5).getPlace());
+
+        ////////////////////////////////////////
+        // after remove 1 - verify volume 1.2 //
+        ////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_2, -1, -1, false, false),
+                containsInAnyOrder(List.of(
+                    isRel(v1_2, isIssueOfJournalVolume, i1_1, BOTH, 0, 0),
+                    isRel(v1_2, isIssueOfJournalVolume, i3_1, LEFT_ONLY, 2, 0),
+                    // NOTE: left place was reduced by one
+                    isRel(v1_2, isIssueOfJournalVolume, i5_1, BOTH, 3, 0)
+                ))
+        );
+
+        List<MetadataValue> mdvs12 = itemService.getMetadata(
+            v1_2, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(5, mdvs12.size());
+
+        assertTrue(mdvs12.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs12.get(0).getValue());
+        assertEquals(0, mdvs12.get(0).getPlace());
+
+        assertFalse(mdvs12.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (plain)", mdvs12.get(1).getValue());
+        assertEquals(1, mdvs12.get(1).getPlace());
+
+        assertFalse(mdvs12.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (plain)", mdvs12.get(2).getValue());
+        assertEquals(2, mdvs12.get(2).getPlace());
+
+        assertTrue(mdvs12.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs12.get(3).getValue());
+        assertEquals(3, mdvs12.get(3).getPlace());
+
+        assertFalse(mdvs12.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 6 (plain)", mdvs12.get(4).getValue());
+        assertEquals(4, mdvs12.get(4).getPlace());
+
+        ////////////////////////////////////////
+        // remove metadata value - volume 1.2 //
+        ////////////////////////////////////////
+
+        MetadataValue removeMdv1 = mdvs12.get(2);
+
+        // let's make sure we have the metadata value that we intended to remove
+        assertFalse(removeMdv1 instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (plain)", removeMdv1.getValue());
+        assertEquals(2, removeMdv1.getPlace());
+        assertEquals(v1_2, removeMdv1.getDSpaceObject());
+
+        itemService.removeMetadataValues(context, v1_2, List.of(removeMdv1));
+        // NOTE: after removal, update is required to do place recalculation, among other things
+        itemService.update(context, v1_2);
+        context.commit();
+
+        ////////////////////////////////////////
+        // after remove 2 - verify volume 1.1 //
+        ////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_1, -1, -1, false, false),
+                containsInAnyOrder(List.of(
+                    isRel(v1_1, isIssueOfJournalVolume, i1_1, RIGHT_ONLY, 0, 0),
+                    isRel(v1_1, isIssueOfJournalVolume, i3_1, RIGHT_ONLY, 2, 0),
+                    isRel(v1_1, isIssueOfJournalVolume, i5_1, RIGHT_ONLY, 4, 0)
+                ))
+        );
+
+        List<MetadataValue> mdvs14 = itemService.getMetadata(
+            v1_1, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(6, mdvs14.size());
+
+        assertTrue(mdvs14.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs14.get(0).getValue());
+        assertEquals(0, mdvs14.get(0).getPlace());
+
+        assertFalse(mdvs14.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (plain)", mdvs14.get(1).getValue());
+        assertEquals(1, mdvs14.get(1).getPlace());
+
+        assertTrue(mdvs14.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs14.get(2).getValue());
+        assertEquals(2, mdvs14.get(2).getPlace());
+
+        assertFalse(mdvs14.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (plain)", mdvs14.get(3).getValue());
+        assertEquals(3, mdvs14.get(3).getPlace());
+
+        assertTrue(mdvs14.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs14.get(4).getValue());
+        assertEquals(4, mdvs14.get(4).getPlace());
+
+        assertFalse(mdvs14.get(5) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 6 (plain)", mdvs14.get(5).getValue());
+        assertEquals(5, mdvs14.get(5).getPlace());
+
+        ////////////////////////////////////////
+        // after remove 2 - verify volume 1.2 //
+        ////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_2, -1, -1, false, false),
+                containsInAnyOrder(List.of(
+                    isRel(v1_2, isIssueOfJournalVolume, i1_1, BOTH, 0, 0),
+                    isRel(v1_2, isIssueOfJournalVolume, i3_1, LEFT_ONLY, 2, 0),
+                    // NOTE: left place was reduced by one (from 3 to 2)
+                    isRel(v1_2, isIssueOfJournalVolume, i5_1, BOTH, 2, 0)
+                ))
+        );
+
+        List<MetadataValue> mdvs17 = itemService.getMetadata(
+            v1_2, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(4, mdvs17.size());
+
+        assertTrue(mdvs17.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs17.get(0).getValue());
+        assertEquals(0, mdvs17.get(0).getPlace());
+
+        assertFalse(mdvs17.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (plain)", mdvs17.get(1).getValue());
+        assertEquals(1, mdvs17.get(1).getPlace());
+
+        assertTrue(mdvs17.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs17.get(2).getValue());
+        assertEquals(2, mdvs17.get(2).getPlace());
+
+        assertFalse(mdvs17.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 6 (plain)", mdvs17.get(3).getValue());
+        assertEquals(3, mdvs17.get(3).getPlace());
+
+        /////////////////////////////////////////////
+        // delete volume first for min cardinality //
+        /////////////////////////////////////////////
+
+        itemService.delete(context, context.reloadEntity(v1_1));
+        itemService.delete(context, context.reloadEntity(v1_2));
+
+        /////////////////////////////
+        // clean up config changes //
+        /////////////////////////////
+
+        issueVmd.setUseForPlace(ogIssueVmdUseForPlace);
+    }
+
+    @Test
+    public void test_placeRecalculationAfterDelete_complex() throws Exception {
+        runWithVirtualMetadataConfig(
+            () -> {
+                // config summary:
+                // on the Project items, metadata field dc.contributor.author will appear with the Authors' titles
+                // on the Person items, metadata field dc.relation will appear with the Projects' titles
+
+                Collected dcRelation = createBean(Collected.class);
+                dcRelation.setFields(List.of("dc.title"));
+                dcRelation.setUseForPlace(true);
+
+                Collected dcContributorAuthor = createBean(Collected.class);
+                dcContributorAuthor.setFields(List.of("dc.title"));
+                dcContributorAuthor.setUseForPlace(true);
+
+                return Map.of(
+                    "isProjectOfPerson", new HashMap<>(Map.of(
+                        "dc.relation", dcRelation
+                    )),
+                    "isPersonOfProject", new HashMap<>(Map.of(
+                        "dc.contributor.author", dcContributorAuthor
+                    ))
+                );
+            },
+            () -> {
+                //////////////////
+                // create items //
+                //////////////////
+
+                // person 1.1
+                Item pe1_1 = ItemBuilder.createItem(context, collection)
+                    .withTitle("person 1 (item)")
+                    .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+                    .build();
+
+                // person 3.1
+                Item pe3_1 = ItemBuilder.createItem(context, collection)
+                    .withTitle("person 3 (item)")
+                    .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+                    .build();
+
+                // person 5.1
+                Item pe5_1 = ItemBuilder.createItem(context, collection)
+                    .withTitle("person 5 (item)")
+                    .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+                    .build();
+
+                // project 1.1
+                Item pr1_1 = ItemBuilder.createItem(context, collection)
+                    .withTitle("project 1 (item)")
+                    .withMetadata("dspace", "entity", "type", projectEntityType.getLabel())
+                    .build();
+
+                // project 3.1
+                Item pr3_1 = ItemBuilder.createItem(context, collection)
+                    .withTitle("project 3 (item)")
+                    .withMetadata("dspace", "entity", "type", projectEntityType.getLabel())
+                    .build();
+
+                // project 5.1
+                Item pr5_1 = ItemBuilder.createItem(context, collection)
+                    .withTitle("project 5 (item)")
+                    .withMetadata("dspace", "entity", "type", projectEntityType.getLabel())
+                    .build();
+
+                //////////////////////////////////////////////
+                // create relationships and metadata values //
+                //////////////////////////////////////////////
+
+                // relationship - person 3 & project 1
+                RelationshipBuilder.createRelationshipBuilder(context, pe3_1, pr1_1, isProjectOfPerson)
+                    .build();
+
+                // metadata - person 3 & project 2
+                itemService.addMetadata(context, pe3_1, "dc", "relation", null, null, "project 2 (mdv)");
+
+                // relationship - person 1 & project 3
+                RelationshipBuilder.createRelationshipBuilder(context, pe1_1, pr3_1, isProjectOfPerson)
+                    .build();
+
+                // metadata - person 2 & project 3
+                itemService.addMetadata(context, pr3_1, "dc", "contributor", "author", null, "person 2 (mdv)");
+
+                // relationship - person 3 & project 3
+                RelationshipBuilder.createRelationshipBuilder(context, pe3_1, pr3_1, isProjectOfPerson)
+                    .build();
+
+                // metadata - person 4 & project 3
+                itemService.addMetadata(context, pr3_1, "dc", "contributor", "author", null, "person 4 (mdv)");
+
+                // relationship - person 5 & project 3
+                RelationshipBuilder.createRelationshipBuilder(context, pe5_1, pr3_1, isProjectOfPerson)
+                    .build();
+
+                // metadata - person 6 & project 3
+                itemService.addMetadata(context, pr3_1, "dc", "contributor", "author", null, "person 6 (mdv)");
+
+                // metadata - person 7 & project 5
+                itemService.addMetadata(context, pr5_1, "dc", "contributor", "author", null, "person 7 (mdv)");
+
+                // relationship - person 5 & project 5
+                RelationshipBuilder.createRelationshipBuilder(context, pe5_1, pr5_1, isProjectOfPerson)
+                    .build();
+
+                // metadata - person 3 & project 4
+                itemService.addMetadata(context, pe3_1, "dc", "relation", null, null, "project 4 (mdv)");
+
+                // relationship - person 3 & project 5
+                RelationshipBuilder.createRelationshipBuilder(context, pe3_1, pr5_1, isProjectOfPerson)
+                    .build();
+
+                // metadata - person 3 & project 6
+                itemService.addMetadata(context, pe3_1, "dc", "relation", null, null, "project 6 (mdv)");
+
+                // SUMMARY
+                //
+                // person 3
+                // - pos 0: project 1 (item)
+                // - pos 1: project 2 (mdv)
+                // - pos 2: project 3 (item)     [A]
+                // - pos 3: project 4 (mdv)
+                // - pos 4: project 5 (item)     [B]
+                // - pos 5: project 6 (mdv)
+                //
+                // project 3
+                // - pos 0: person 1 (item)
+                // - pos 1: person 2 (mdv)
+                // - pos 2: person 3 (item)    [A]
+                // - pos 3: person 4 (mdv)
+                // - pos 4: person 5 (item)
+                // - pos 5: person 6 (mdv)
+                //
+                // project 5
+                // - pos 0: person 7 (mdv)
+                // - pos 1: person 5 (item)
+                // - pos 2: person 3 (item)    [B]
+
+                /////////////////////////////////
+                // initial - verify person 3.1 //
+                /////////////////////////////////
+
+                List<MetadataValue> mdvs1 = itemService.getMetadata(
+                    pe3_1, "dc", "relation", null, Item.ANY
+                );
+                assertEquals(6, mdvs1.size());
+
+                assertTrue(mdvs1.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("project 1 (item)", mdvs1.get(0).getValue());
+                assertEquals(0, mdvs1.get(0).getPlace());
+
+                assertFalse(mdvs1.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("project 2 (mdv)", mdvs1.get(1).getValue());
+                assertEquals(1, mdvs1.get(1).getPlace());
+
+                assertTrue(mdvs1.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("project 3 (item)", mdvs1.get(2).getValue());
+                assertEquals(2, mdvs1.get(2).getPlace());
+
+                assertFalse(mdvs1.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("project 4 (mdv)", mdvs1.get(3).getValue());
+                assertEquals(3, mdvs1.get(3).getPlace());
+
+                assertTrue(mdvs1.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("project 5 (item)", mdvs1.get(4).getValue());
+                assertEquals(4, mdvs1.get(4).getPlace());
+
+                assertFalse(mdvs1.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("project 6 (mdv)", mdvs1.get(5).getValue());
+                assertEquals(5, mdvs1.get(5).getPlace());
+
+                //////////////////////////////////
+                // initial - verify project 3.1 //
+                //////////////////////////////////
+
+                List<MetadataValue> mdvs2 = itemService.getMetadata(
+                    pr3_1, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(6, mdvs2.size());
+
+                assertTrue(mdvs2.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 1 (item)", mdvs2.get(0).getValue());
+                assertEquals(0, mdvs2.get(0).getPlace());
+
+                assertFalse(mdvs2.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 2 (mdv)", mdvs2.get(1).getValue());
+                assertEquals(1, mdvs2.get(1).getPlace());
+
+                assertTrue(mdvs2.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs2.get(2).getValue());
+                assertEquals(2, mdvs2.get(2).getPlace());
+
+                assertFalse(mdvs2.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("person 4 (mdv)", mdvs2.get(3).getValue());
+                assertEquals(3, mdvs2.get(3).getPlace());
+
+                assertTrue(mdvs2.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs2.get(4).getValue());
+                assertEquals(4, mdvs2.get(4).getPlace());
+
+                assertFalse(mdvs2.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("person 6 (mdv)", mdvs2.get(5).getValue());
+                assertEquals(5, mdvs2.get(5).getPlace());
+
+                //////////////////////////////////
+                // initial - verify project 5.1 //
+                //////////////////////////////////
+
+                List<MetadataValue> mdvs3 = itemService.getMetadata(
+                    pr5_1, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(3, mdvs3.size());
+
+                assertFalse(mdvs3.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 7 (mdv)", mdvs3.get(0).getValue());
+                assertEquals(0, mdvs3.get(0).getPlace());
+
+                assertTrue(mdvs3.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs3.get(1).getValue());
+                assertEquals(1, mdvs3.get(1).getPlace());
+
+                assertTrue(mdvs3.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs3.get(2).getValue());
+                assertEquals(2, mdvs3.get(2).getPlace());
+
+                /////////////////////////////////////
+                // create new version - person 3.2 //
+                /////////////////////////////////////
+
+                Item pe3_2 = versioningService.createNewVersion(context, pe3_1).getItem();
+                installItemService.installItem(context, workspaceItemService.findByItem(context, pe3_2));
+                context.commit();
+
+                //////////////////////////////////////
+                // create new version - project 3.2 //
+                //////////////////////////////////////
+
+                Item pr3_2 = versioningService.createNewVersion(context, pr3_1).getItem();
+                installItemService.installItem(context, workspaceItemService.findByItem(context, pr3_2));
+                context.commit();
+
+                ////////////////////////////////////////////////
+                // after version creation - verify person 3.1 //
+                ////////////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pe3_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe3_1, isProjectOfPerson, pr1_1, RIGHT_ONLY, 0, 0),
+                        isRel(pe3_1, isProjectOfPerson, pr3_1, RIGHT_ONLY, 2, 2),
+                        isRel(pe3_1, isProjectOfPerson, pr5_1, RIGHT_ONLY, 4, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs4 = itemService.getMetadata(
+                    pe3_1, "dc", "relation", null, Item.ANY
+                );
+                assertEquals(6, mdvs4.size());
+
+                assertTrue(mdvs4.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("project 1 (item)", mdvs4.get(0).getValue());
+                assertEquals(0, mdvs4.get(0).getPlace());
+
+                assertFalse(mdvs4.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("project 2 (mdv)", mdvs4.get(1).getValue());
+                assertEquals(1, mdvs4.get(1).getPlace());
+
+                assertTrue(mdvs4.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("project 3 (item)", mdvs4.get(2).getValue());
+                assertEquals(2, mdvs4.get(2).getPlace());
+
+                assertFalse(mdvs4.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("project 4 (mdv)", mdvs4.get(3).getValue());
+                assertEquals(3, mdvs4.get(3).getPlace());
+
+                assertTrue(mdvs4.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("project 5 (item)", mdvs4.get(4).getValue());
+                assertEquals(4, mdvs4.get(4).getPlace());
+
+                assertFalse(mdvs4.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("project 6 (mdv)", mdvs4.get(5).getValue());
+                assertEquals(5, mdvs4.get(5).getPlace());
+
+                /////////////////////////////////////////////////
+                // after version creation - verify project 3.1 //
+                /////////////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr3_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe1_1, isProjectOfPerson, pr3_1, LEFT_ONLY, 0, 0),
+                        isRel(pe3_1, isProjectOfPerson, pr3_1, RIGHT_ONLY, 2, 2),
+                        isRel(pe5_1, isProjectOfPerson, pr3_1, LEFT_ONLY, 0, 4),
+                        isRel(pe3_2, isProjectOfPerson, pr3_1, LEFT_ONLY, 2, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs5 = itemService.getMetadata(
+                    pr3_1, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(6, mdvs5.size());
+
+                assertTrue(mdvs5.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 1 (item)", mdvs5.get(0).getValue());
+                assertEquals(0, mdvs5.get(0).getPlace());
+
+                assertFalse(mdvs5.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 2 (mdv)", mdvs5.get(1).getValue());
+                assertEquals(1, mdvs5.get(1).getPlace());
+
+                assertTrue(mdvs5.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs5.get(2).getValue());
+                assertEquals(2, mdvs5.get(2).getPlace());
+
+                assertFalse(mdvs5.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("person 4 (mdv)", mdvs5.get(3).getValue());
+                assertEquals(3, mdvs5.get(3).getPlace());
+
+                assertTrue(mdvs5.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs5.get(4).getValue());
+                assertEquals(4, mdvs5.get(4).getPlace());
+
+                assertFalse(mdvs5.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("person 6 (mdv)", mdvs5.get(5).getValue());
+                assertEquals(5, mdvs5.get(5).getPlace());
+
+                /////////////////////////////////////////////////
+                // after version creation - verify project 5.1 //
+                /////////////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr5_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe5_1, isProjectOfPerson, pr5_1, BOTH, 1, 1),
+                        isRel(pe3_1, isProjectOfPerson, pr5_1, RIGHT_ONLY, 4, 2),
+                        isRel(pe3_2, isProjectOfPerson, pr5_1, BOTH, 4, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs6 = itemService.getMetadata(
+                    pr5_1, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(3, mdvs6.size());
+
+                assertFalse(mdvs6.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 7 (mdv)", mdvs6.get(0).getValue());
+                assertEquals(0, mdvs6.get(0).getPlace());
+
+                assertTrue(mdvs6.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs6.get(1).getValue());
+                assertEquals(1, mdvs6.get(1).getPlace());
+
+                assertTrue(mdvs6.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs6.get(2).getValue());
+                assertEquals(2, mdvs6.get(2).getPlace());
+
+                ////////////////////////////////////////////////
+                // after version creation - verify volume 3.2 //
+                ////////////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pe3_2, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe3_2, isProjectOfPerson, pr1_1, BOTH, 0, 0),
+                        isRel(pe3_2, isProjectOfPerson, pr3_1, LEFT_ONLY, 2, 2),
+                        isRel(pe3_2, isProjectOfPerson, pr3_2, BOTH, 2, 2),
+                        isRel(pe3_2, isProjectOfPerson, pr5_1, BOTH, 4, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs7 = itemService.getMetadata(
+                    pe3_2, "dc", "relation", null, Item.ANY
+                );
+                assertEquals(6, mdvs7.size());
+
+                assertTrue(mdvs7.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("project 1 (item)", mdvs7.get(0).getValue());
+                assertEquals(0, mdvs7.get(0).getPlace());
+
+                assertFalse(mdvs7.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("project 2 (mdv)", mdvs7.get(1).getValue());
+                assertEquals(1, mdvs7.get(1).getPlace());
+
+                assertTrue(mdvs7.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("project 3 (item)", mdvs7.get(2).getValue());
+                assertEquals(2, mdvs7.get(2).getPlace());
+
+                assertFalse(mdvs7.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("project 4 (mdv)", mdvs7.get(3).getValue());
+                assertEquals(3, mdvs7.get(3).getPlace());
+
+                assertTrue(mdvs7.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("project 5 (item)", mdvs7.get(4).getValue());
+                assertEquals(4, mdvs7.get(4).getPlace());
+
+                assertFalse(mdvs7.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("project 6 (mdv)", mdvs7.get(5).getValue());
+                assertEquals(5, mdvs7.get(5).getPlace());
+
+                /////////////////////////////////////////////////
+                // after version creation - verify project 3.2 //
+                /////////////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr3_2, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe1_1, isProjectOfPerson, pr3_2, BOTH, 0, 0),
+                        isRel(pe5_1, isProjectOfPerson, pr3_2, BOTH, 0, 4),
+                        isRel(pe3_2, isProjectOfPerson, pr3_2, BOTH, 2, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs8 = itemService.getMetadata(
+                    pr3_2, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(6, mdvs8.size());
+
+                assertTrue(mdvs8.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 1 (item)", mdvs8.get(0).getValue());
+                assertEquals(0, mdvs8.get(0).getPlace());
+
+                assertFalse(mdvs8.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 2 (mdv)", mdvs8.get(1).getValue());
+                assertEquals(1, mdvs8.get(1).getPlace());
+
+                assertTrue(mdvs8.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs8.get(2).getValue());
+                assertEquals(2, mdvs8.get(2).getPlace());
+
+                assertFalse(mdvs8.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("person 4 (mdv)", mdvs8.get(3).getValue());
+                assertEquals(3, mdvs8.get(3).getPlace());
+
+                assertTrue(mdvs8.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs8.get(4).getValue());
+                assertEquals(4, mdvs8.get(4).getPlace());
+
+                assertFalse(mdvs8.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("person 6 (mdv)", mdvs8.get(5).getValue());
+                assertEquals(5, mdvs8.get(5).getPlace());
+
+                ////////////////////////////////////////////////////
+                // remove relationship - person 3.2 & project 3.2 //
+                ////////////////////////////////////////////////////
+
+                Relationship rel1 = getRelationship(pe3_2, isProjectOfPerson, pr3_2);
+                assertNotNull(rel1);
+
+                relationshipService.delete(context, rel1, false, false);
+                context.commit();
+
+                ////////////////////////////////////
+                // after remove 1 - cache busting //
+                ////////////////////////////////////
+
+                pe3_2.setMetadataModified();
+                pe3_2 = context.reloadEntity(pe3_2);
+
+                pr3_2.setMetadataModified();
+                pr3_2 = context.reloadEntity(pr3_2);
+
+                ////////////////////////////////////////
+                // after remove 1 - verify person 3.1 //
+                ////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pe3_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe3_1, isProjectOfPerson, pr1_1, RIGHT_ONLY, 0, 0),
+                        isRel(pe3_1, isProjectOfPerson, pr3_1, RIGHT_ONLY, 2, 2),
+                        isRel(pe3_1, isProjectOfPerson, pr5_1, RIGHT_ONLY, 4, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs9 = itemService.getMetadata(
+                    pe3_1, "dc", "relation", null, Item.ANY
+                );
+                assertEquals(6, mdvs9.size());
+
+                assertTrue(mdvs9.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("project 1 (item)", mdvs9.get(0).getValue());
+                assertEquals(0, mdvs9.get(0).getPlace());
+
+                assertFalse(mdvs9.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("project 2 (mdv)", mdvs9.get(1).getValue());
+                assertEquals(1, mdvs9.get(1).getPlace());
+
+                assertTrue(mdvs9.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("project 3 (item)", mdvs9.get(2).getValue());
+                assertEquals(2, mdvs9.get(2).getPlace());
+
+                assertFalse(mdvs9.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("project 4 (mdv)", mdvs9.get(3).getValue());
+                assertEquals(3, mdvs9.get(3).getPlace());
+
+                assertTrue(mdvs9.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("project 5 (item)", mdvs9.get(4).getValue());
+                assertEquals(4, mdvs9.get(4).getPlace());
+
+                assertFalse(mdvs9.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("project 6 (mdv)", mdvs9.get(5).getValue());
+                assertEquals(5, mdvs9.get(5).getPlace());
+
+                /////////////////////////////////////////
+                // after remove 1 - verify project 3.1 //
+                /////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr3_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe1_1, isProjectOfPerson, pr3_1, LEFT_ONLY, 0, 0),
+                        isRel(pe3_1, isProjectOfPerson, pr3_1, RIGHT_ONLY, 2, 2),
+                        isRel(pe3_2, isProjectOfPerson, pr3_1, LEFT_ONLY, 2, 2),
+                        isRel(pe5_1, isProjectOfPerson, pr3_1, LEFT_ONLY, 0, 4)
+                    ))
+                );
+
+                List<MetadataValue> mdvs10 = itemService.getMetadata(
+                    pr3_1, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(6, mdvs10.size());
+
+                assertTrue(mdvs10.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 1 (item)", mdvs10.get(0).getValue());
+                assertEquals(0, mdvs10.get(0).getPlace());
+
+                assertFalse(mdvs10.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 2 (mdv)", mdvs10.get(1).getValue());
+                assertEquals(1, mdvs10.get(1).getPlace());
+
+                assertTrue(mdvs10.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs10.get(2).getValue());
+                assertEquals(2, mdvs10.get(2).getPlace());
+
+                assertFalse(mdvs10.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("person 4 (mdv)", mdvs10.get(3).getValue());
+                assertEquals(3, mdvs10.get(3).getPlace());
+
+                assertTrue(mdvs10.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs10.get(4).getValue());
+                assertEquals(4, mdvs10.get(4).getPlace());
+
+                assertFalse(mdvs10.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("person 6 (mdv)", mdvs10.get(5).getValue());
+                assertEquals(5, mdvs10.get(5).getPlace());
+
+                /////////////////////////////////////////
+                // after remove 1 - verify project 5.1 //
+                /////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr5_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe5_1, isProjectOfPerson, pr5_1, BOTH, 1, 1),
+                        isRel(pe3_1, isProjectOfPerson, pr5_1, RIGHT_ONLY, 4, 2),
+                        // NOTE: left place was reduced by one
+                        isRel(pe3_2, isProjectOfPerson, pr5_1, BOTH, 3, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs11 = itemService.getMetadata(
+                    pr5_1, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(3, mdvs11.size());
+
+                assertFalse(mdvs11.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 7 (mdv)", mdvs11.get(0).getValue());
+                assertEquals(0, mdvs11.get(0).getPlace());
+
+                assertTrue(mdvs11.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs11.get(1).getValue());
+                assertEquals(1, mdvs11.get(1).getPlace());
+
+                assertTrue(mdvs11.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs11.get(2).getValue());
+                assertEquals(2, mdvs11.get(2).getPlace());
+
+                ////////////////////////////////////////
+                // after remove 1 - verify person 3.2 //
+                ////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pe3_2, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe3_2, isProjectOfPerson, pr1_1, BOTH, 0, 0),
+                        isRel(pe3_2, isProjectOfPerson, pr3_1, LEFT_ONLY, 2, 2),
+                        // NOTE: left place was reduced by one (from 4 to 3)
+                        isRel(pe3_2, isProjectOfPerson, pr5_1, BOTH, 3, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs12 = itemService.getMetadata(
+                    pe3_2, "dc", "relation", null, Item.ANY
+                );
+                assertEquals(5, mdvs12.size());
+
+                assertTrue(mdvs12.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("project 1 (item)", mdvs12.get(0).getValue());
+                assertEquals(0, mdvs12.get(0).getPlace());
+
+                assertFalse(mdvs12.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("project 2 (mdv)", mdvs12.get(1).getValue());
+                assertEquals(1, mdvs12.get(1).getPlace());
+
+                assertFalse(mdvs12.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("project 4 (mdv)", mdvs12.get(2).getValue());
+                assertEquals(2, mdvs12.get(2).getPlace());
+
+                assertTrue(mdvs12.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("project 5 (item)", mdvs12.get(3).getValue());
+                assertEquals(3, mdvs12.get(3).getPlace());
+
+                assertFalse(mdvs12.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("project 6 (mdv)", mdvs12.get(4).getValue());
+                assertEquals(4, mdvs12.get(4).getPlace());
+
+                /////////////////////////////////////////
+                // after remove 1 - verify project 3.2 //
+                /////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr3_2, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe1_1, isProjectOfPerson, pr3_2, BOTH, 0, 0),
+                        // NOTE: right place was reduced by one (from 4 to 3)
+                        isRel(pe5_1, isProjectOfPerson, pr3_2, BOTH, 0, 3)
+                    ))
+                );
+
+                List<MetadataValue> mdvs13 = itemService.getMetadata(
+                    pr3_2, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(5, mdvs13.size());
+
+                assertTrue(mdvs13.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 1 (item)", mdvs13.get(0).getValue());
+                assertEquals(0, mdvs13.get(0).getPlace());
+
+                assertFalse(mdvs13.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 2 (mdv)", mdvs13.get(1).getValue());
+                assertEquals(1, mdvs13.get(1).getPlace());
+
+                assertFalse(mdvs13.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 4 (mdv)", mdvs13.get(2).getValue());
+                assertEquals(2, mdvs13.get(2).getPlace());
+
+                assertTrue(mdvs13.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs13.get(3).getValue());
+                assertEquals(3, mdvs13.get(3).getPlace());
+
+                assertFalse(mdvs13.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("person 6 (mdv)", mdvs13.get(4).getValue());
+                assertEquals(4, mdvs13.get(4).getPlace());
+
+                ////////////////////////////////////////
+                // remove metadata value - person 3.2 //
+                ////////////////////////////////////////
+
+                MetadataValue removeMdv1 = mdvs12.get(2);
+
+                // let's make sure we have the metadata value that we intended to remove
+                assertFalse(removeMdv1 instanceof RelationshipMetadataValue);
+                assertEquals("project 4 (mdv)", removeMdv1.getValue());
+                assertEquals(2, removeMdv1.getPlace());
+                assertEquals(pe3_2, removeMdv1.getDSpaceObject());
+
+                itemService.removeMetadataValues(context, pe3_2, List.of(removeMdv1));
+                itemService.update(context, pe3_2);
+                context.commit();
+
+                ////////////////////////////////////////
+                // after remove 2 - verify person 3.1 //
+                ////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pe3_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe3_1, isProjectOfPerson, pr1_1, RIGHT_ONLY, 0, 0),
+                        isRel(pe3_1, isProjectOfPerson, pr3_1, RIGHT_ONLY, 2, 2),
+                        isRel(pe3_1, isProjectOfPerson, pr5_1, RIGHT_ONLY, 4, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs14 = itemService.getMetadata(
+                    pe3_1, "dc", "relation", null, Item.ANY
+                );
+                assertEquals(6, mdvs14.size());
+
+                assertTrue(mdvs14.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("project 1 (item)", mdvs14.get(0).getValue());
+                assertEquals(0, mdvs14.get(0).getPlace());
+
+                assertFalse(mdvs14.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("project 2 (mdv)", mdvs14.get(1).getValue());
+                assertEquals(1, mdvs14.get(1).getPlace());
+
+                assertTrue(mdvs14.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("project 3 (item)", mdvs14.get(2).getValue());
+                assertEquals(2, mdvs14.get(2).getPlace());
+
+                assertFalse(mdvs14.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("project 4 (mdv)", mdvs14.get(3).getValue());
+                assertEquals(3, mdvs14.get(3).getPlace());
+
+                assertTrue(mdvs14.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("project 5 (item)", mdvs14.get(4).getValue());
+                assertEquals(4, mdvs14.get(4).getPlace());
+
+                assertFalse(mdvs14.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("project 6 (mdv)", mdvs14.get(5).getValue());
+                assertEquals(5, mdvs14.get(5).getPlace());
+
+                /////////////////////////////////////////
+                // after remove 2 - verify project 3.1 //
+                /////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr3_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe1_1, isProjectOfPerson, pr3_1, LEFT_ONLY, 0, 0),
+                        isRel(pe3_1, isProjectOfPerson, pr3_1, RIGHT_ONLY, 2, 2),
+                        isRel(pe3_2, isProjectOfPerson, pr3_1, LEFT_ONLY, 2, 2),
+                        isRel(pe5_1, isProjectOfPerson, pr3_1, LEFT_ONLY, 0, 4)
+                    ))
+                );
+
+                List<MetadataValue> mdvs15 = itemService.getMetadata(
+                    pr3_1, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(6, mdvs15.size());
+
+                assertTrue(mdvs15.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 1 (item)", mdvs15.get(0).getValue());
+                assertEquals(0, mdvs15.get(0).getPlace());
+
+                assertFalse(mdvs15.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 2 (mdv)", mdvs15.get(1).getValue());
+                assertEquals(1, mdvs15.get(1).getPlace());
+
+                assertTrue(mdvs15.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs15.get(2).getValue());
+                assertEquals(2, mdvs15.get(2).getPlace());
+
+                assertFalse(mdvs15.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("person 4 (mdv)", mdvs15.get(3).getValue());
+                assertEquals(3, mdvs15.get(3).getPlace());
+
+                assertTrue(mdvs15.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs15.get(4).getValue());
+                assertEquals(4, mdvs15.get(4).getPlace());
+
+                assertFalse(mdvs15.get(5) instanceof RelationshipMetadataValue);
+                assertEquals("person 6 (mdv)", mdvs15.get(5).getValue());
+                assertEquals(5, mdvs15.get(5).getPlace());
+
+                /////////////////////////////////////////
+                // after remove 2 - verify project 5.1 //
+                /////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr5_1, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe5_1, isProjectOfPerson, pr5_1, BOTH, 1, 1),
+                        isRel(pe3_1, isProjectOfPerson, pr5_1, RIGHT_ONLY, 4, 2),
+                        // NOTE: left place was reduced by one
+                        isRel(pe3_2, isProjectOfPerson, pr5_1, BOTH, 2, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs16 = itemService.getMetadata(
+                    pr5_1, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(3, mdvs16.size());
+
+                assertFalse(mdvs16.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 7 (mdv)", mdvs16.get(0).getValue());
+                assertEquals(0, mdvs16.get(0).getPlace());
+
+                assertTrue(mdvs16.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs16.get(1).getValue());
+                assertEquals(1, mdvs16.get(1).getPlace());
+
+                assertTrue(mdvs16.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 3 (item)", mdvs16.get(2).getValue());
+                assertEquals(2, mdvs16.get(2).getPlace());
+
+                ////////////////////////////////////////
+                // after remove 2 - verify person 3.2 //
+                ////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pe3_2, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe3_2, isProjectOfPerson, pr1_1, BOTH, 0, 0),
+                        isRel(pe3_2, isProjectOfPerson, pr3_1, LEFT_ONLY, 2, 2),
+                        // NOTE: left place was reduced by one (from 3 to 2)
+                        isRel(pe3_2, isProjectOfPerson, pr5_1, BOTH, 2, 2)
+                    ))
+                );
+
+                List<MetadataValue> mdvs17 = itemService.getMetadata(
+                    pe3_2, "dc", "relation", null, Item.ANY
+                );
+                assertEquals(4, mdvs17.size());
+
+                assertTrue(mdvs17.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("project 1 (item)", mdvs17.get(0).getValue());
+                assertEquals(0, mdvs17.get(0).getPlace());
+
+                assertFalse(mdvs17.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("project 2 (mdv)", mdvs17.get(1).getValue());
+                assertEquals(1, mdvs17.get(1).getPlace());
+
+                assertTrue(mdvs17.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("project 5 (item)", mdvs17.get(2).getValue());
+                assertEquals(2, mdvs17.get(2).getPlace());
+
+                assertFalse(mdvs17.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("project 6 (mdv)", mdvs17.get(3).getValue());
+                assertEquals(3, mdvs17.get(3).getPlace());
+
+                /////////////////////////////////////////
+                // after remove 2 - verify project 3.2 //
+                /////////////////////////////////////////
+
+                assertThat(
+                    relationshipService.findByItem(context, pr3_2, -1, -1, false, false),
+                    containsInAnyOrder(List.of(
+                        isRel(pe1_1, isProjectOfPerson, pr3_2, BOTH, 0, 0),
+                        isRel(pe5_1, isProjectOfPerson, pr3_2, BOTH, 0, 3)
+                    ))
+                );
+
+                List<MetadataValue> mdvs18 = itemService.getMetadata(
+                    pr3_2, "dc", "contributor", "author", Item.ANY
+                );
+                assertEquals(5, mdvs18.size());
+
+                assertTrue(mdvs18.get(0) instanceof RelationshipMetadataValue);
+                assertEquals("person 1 (item)", mdvs18.get(0).getValue());
+                assertEquals(0, mdvs18.get(0).getPlace());
+
+                assertFalse(mdvs18.get(1) instanceof RelationshipMetadataValue);
+                assertEquals("person 2 (mdv)", mdvs18.get(1).getValue());
+                assertEquals(1, mdvs18.get(1).getPlace());
+
+                assertFalse(mdvs18.get(2) instanceof RelationshipMetadataValue);
+                assertEquals("person 4 (mdv)", mdvs18.get(2).getValue());
+                assertEquals(2, mdvs18.get(2).getPlace());
+
+                assertTrue(mdvs18.get(3) instanceof RelationshipMetadataValue);
+                assertEquals("person 5 (item)", mdvs18.get(3).getValue());
+                assertEquals(3, mdvs18.get(3).getPlace());
+
+                assertFalse(mdvs18.get(4) instanceof RelationshipMetadataValue);
+                assertEquals("person 6 (mdv)", mdvs18.get(4).getValue());
+                assertEquals(4, mdvs18.get(4).getPlace());
+            }
+        );
+    }
+
+    @Test
+    public void test_placeRecalculationNoUseForPlace() throws Exception {
+        // NOTE: this test uses relationship isIssueOfJournalVolume, because it adds virtual metadata
+        //       on both sides of the relationship
+
+        //////////////////
+        // create items //
+        //////////////////
+
+        // journal volume 1.1
+        Item v1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal volume 1")
+            .withMetadata("dspace", "entity", "type", journalVolumeEntityType.getLabel())
+            .withMetadata("publicationvolume", "volumeNumber", null, "volume nr 1 (rel)")
+            .build();
+
+        // journal issue 1.1
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal issue 1")
+            .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+            .withMetadata("publicationissue", "issueNumber", null, "issue nr 1 (rel)")
+            .build();
+
+        // journal issue 2.1
+        Item i2_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal issue 2")
+            .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+            .withMetadata("publicationissue", "issueNumber", null, "issue nr 2 (rel)")
+            .build();
+
+        // journal issue 3.1
+        Item i3_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal issue 3")
+            .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+            .withMetadata("publicationissue", "issueNumber", null, "issue nr 3 (rel)")
+            .build();
+
+        // journal issue 4.1
+        Item i4_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal issue 4")
+            .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+            .withMetadata("publicationissue", "issueNumber", null, "issue nr 4 (rel)")
+            .build();
+
+        // journal issue 5.1
+        Item i5_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("journal issue 5")
+            .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+            .withMetadata("publicationissue", "issueNumber", null, "issue nr 5 (rel)")
+            .build();
+
+        //////////////////////////////////////////////
+        // create relationships and metadata values //
+        //////////////////////////////////////////////
+
+        // relationship - volume 1 & issue 1
+        RelationshipBuilder.createRelationshipBuilder(context, v1_1, i1_1, isIssueOfJournalVolume)
+            .build();
+
+        // relationship - volume 1 & issue 2
+        RelationshipBuilder.createRelationshipBuilder(context, v1_1, i2_1, isIssueOfJournalVolume)
+            .build();
+
+        // relationship - volume 1 & issue 3
+        RelationshipBuilder.createRelationshipBuilder(context, v1_1, i3_1, isIssueOfJournalVolume)
+            .build();
+
+        // relationship - volume 1 & issue 4
+        RelationshipBuilder.createRelationshipBuilder(context, v1_1, i4_1, isIssueOfJournalVolume)
+            .build();
+
+        // relationship - volume 1 & issue 5
+        RelationshipBuilder.createRelationshipBuilder(context, v1_1, i5_1, isIssueOfJournalVolume)
+            .build();
+
+        /////////////////////////////////
+        // initial - verify volume 3.1 //
+        /////////////////////////////////
+
+        List<MetadataValue> mdvs1 = itemService.getMetadata(
+            v1_1, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(5, mdvs1.size());
+
+        assertTrue(mdvs1.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs1.get(0).getValue());
+        assertEquals(0, mdvs1.get(0).getPlace());
+
+        assertTrue(mdvs1.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (rel)", mdvs1.get(1).getValue());
+        assertEquals(1, mdvs1.get(1).getPlace());
+
+        assertTrue(mdvs1.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs1.get(2).getValue());
+        assertEquals(2, mdvs1.get(2).getPlace());
+
+        assertTrue(mdvs1.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (rel)", mdvs1.get(3).getValue());
+        assertEquals(3, mdvs1.get(3).getPlace());
+
+        assertTrue(mdvs1.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs1.get(4).getValue());
+        assertEquals(4, mdvs1.get(4).getPlace());
+
+        /////////////////////////////////////
+        // create new version - volume 1.2 //
+        /////////////////////////////////////
+
+        Item v1_2 = versioningService.createNewVersion(context, v1_1).getItem();
+        installItemService.installItem(context, workspaceItemService.findByItem(context, v1_2));
+        context.commit();
+
+        ////////////////////////////////////
+        // create new version - issue 3.2 //
+        ////////////////////////////////////
+
+        Item i3_2 = versioningService.createNewVersion(context, i3_1).getItem();
+        installItemService.installItem(context, workspaceItemService.findByItem(context, i3_2));
+        context.commit();
+
+        ////////////////////////////////////////////////
+        // after version creation - verify volume 3.1 //
+        ////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(v1_1, isIssueOfJournalVolume, i1_1, RIGHT_ONLY, 0, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i2_1, RIGHT_ONLY, 1, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i3_1, RIGHT_ONLY, 2, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i4_1, RIGHT_ONLY, 3, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i5_1, RIGHT_ONLY, 4, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs4 = itemService.getMetadata(
+            v1_1, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(5, mdvs4.size());
+
+        assertTrue(mdvs4.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs4.get(0).getValue());
+        assertEquals(0, mdvs4.get(0).getPlace());
+
+        assertTrue(mdvs4.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (rel)", mdvs4.get(1).getValue());
+        assertEquals(1, mdvs4.get(1).getPlace());
+
+        assertTrue(mdvs4.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs4.get(2).getValue());
+        assertEquals(2, mdvs4.get(2).getPlace());
+
+        assertTrue(mdvs4.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (rel)", mdvs4.get(3).getValue());
+        assertEquals(3, mdvs4.get(3).getPlace());
+
+        assertTrue(mdvs4.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs4.get(4).getValue());
+        assertEquals(4, mdvs4.get(4).getPlace());
+
+        ////////////////////////////////////////////////
+        // after version creation - verify volume 1.2 //
+        ////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(v1_2, isIssueOfJournalVolume, i1_1, BOTH, 0, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i2_1, BOTH, 1, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i3_1, LEFT_ONLY, 2, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i3_2, BOTH, 2, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i4_1, BOTH, 3, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i5_1, BOTH, 4, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs7 = itemService.getMetadata(
+            v1_2, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(5, mdvs7.size());
+
+        assertTrue(mdvs7.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs7.get(0).getValue());
+        assertEquals(0, mdvs7.get(0).getPlace());
+
+        assertTrue(mdvs7.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (rel)", mdvs7.get(1).getValue());
+        assertEquals(1, mdvs7.get(1).getPlace());
+
+        assertTrue(mdvs7.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs7.get(2).getValue());
+        assertEquals(2, mdvs7.get(2).getPlace());
+
+        assertTrue(mdvs7.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (rel)", mdvs7.get(3).getValue());
+        assertEquals(3, mdvs7.get(3).getPlace());
+
+        assertTrue(mdvs7.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs7.get(4).getValue());
+        assertEquals(4, mdvs7.get(4).getPlace());
+
+        ///////////////////////////////////////////////////////////
+        // remove relationship - volume 1.2 & issue 3.2          //
+        // since an issue needs a relationship, delete the issue //
+        ///////////////////////////////////////////////////////////
+
+        Relationship rel1 = getRelationship(v1_2, isIssueOfJournalVolume, i3_2);
+        assertNotNull(rel1);
+
+        itemService.delete(context, context.reloadEntity(i3_2));
+
+        context.commit();
+
+        ////////////////////////////////////
+        // after remove 1 - cache busting //
+        ////////////////////////////////////
+
+        v1_2.setMetadataModified();
+        v1_2 = context.reloadEntity(v1_2);
+
+        i3_2.setMetadataModified();
+        i3_2 = context.reloadEntity(i3_2);
+
+        ////////////////////////////////////////
+        // after remove 1 - verify volume 3.1 //
+        ////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(v1_1, isIssueOfJournalVolume, i1_1, RIGHT_ONLY, 0, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i2_1, RIGHT_ONLY, 1, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i3_1, RIGHT_ONLY, 2, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i4_1, RIGHT_ONLY, 3, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i5_1, RIGHT_ONLY, 4, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs9 = itemService.getMetadata(
+            v1_1, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(5, mdvs9.size());
+
+        assertTrue(mdvs9.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs9.get(0).getValue());
+        assertEquals(0, mdvs9.get(0).getPlace());
+
+        assertTrue(mdvs9.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (rel)", mdvs9.get(1).getValue());
+        assertEquals(1, mdvs9.get(1).getPlace());
+
+        assertTrue(mdvs9.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs9.get(2).getValue());
+        assertEquals(2, mdvs9.get(2).getPlace());
+
+        assertTrue(mdvs9.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (rel)", mdvs9.get(3).getValue());
+        assertEquals(3, mdvs9.get(3).getPlace());
+
+        assertTrue(mdvs9.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs9.get(4).getValue());
+        assertEquals(4, mdvs9.get(4).getPlace());
+
+        ////////////////////////////////////////
+        // after remove 1 - verify volume 3.2 //
+        ////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(v1_2, isIssueOfJournalVolume, i1_1, BOTH, 0, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i2_1, BOTH, 1, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i3_1, LEFT_ONLY, 2, 0),
+                // NOTE: left place was reduced by one
+                isRel(v1_2, isIssueOfJournalVolume, i4_1, BOTH, 2, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i5_1, BOTH, 3, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs12 = itemService.getMetadata(
+            v1_2, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(4, mdvs12.size());
+
+        assertTrue(mdvs12.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs12.get(0).getValue());
+        assertEquals(0, mdvs12.get(0).getPlace());
+
+        assertTrue(mdvs12.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (rel)", mdvs12.get(1).getValue());
+        assertEquals(1, mdvs12.get(1).getPlace());
+
+        assertTrue(mdvs12.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (rel)", mdvs12.get(2).getValue());
+        assertEquals(2, mdvs12.get(2).getPlace());
+
+        assertTrue(mdvs12.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs12.get(3).getValue());
+        assertEquals(3, mdvs12.get(3).getPlace());
+
+        ////////////////////////////////////
+        // create new version - issue 3.3 //
+        ////////////////////////////////////
+
+        // journal issue 3.3
+        Item i3_3 = ItemBuilder.createItem(context, collection)
+                .withTitle("journal issue 3")
+                .withMetadata("dspace", "entity", "type", journalIssueEntityType.getLabel())
+                .withMetadata("publicationissue", "issueNumber", null, "issue nr 3 (rel)")
+                .build();
+
+        ///////////////////////////////////////////////
+        // add relationship - volume 1.2 & issue 3.3 //
+        ///////////////////////////////////////////////
+
+        RelationshipBuilder.createRelationshipBuilder(context, v1_2, i3_3, isIssueOfJournalVolume, 2, -1)
+                .build();
+
+        context.commit();
+
+        ////////////////////////////////////////////
+        // after add relationship - cache busting //
+        ////////////////////////////////////////////
+
+        v1_2.setMetadataModified();
+        v1_2 = context.reloadEntity(v1_2);
+
+        i3_3.setMetadataModified();
+        i3_3 = context.reloadEntity(i3_3);
+
+        ////////////////////////////////////////////////
+        // after add relationship - verify volume 1.1 //
+        ////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(v1_1, isIssueOfJournalVolume, i1_1, RIGHT_ONLY, 0, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i2_1, RIGHT_ONLY, 1, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i3_1, RIGHT_ONLY, 2, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i4_1, RIGHT_ONLY, 3, 0),
+                isRel(v1_1, isIssueOfJournalVolume, i5_1, RIGHT_ONLY, 4, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs14 = itemService.getMetadata(
+            v1_1, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(5, mdvs14.size());
+
+        assertTrue(mdvs14.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs14.get(0).getValue());
+        assertEquals(0, mdvs14.get(0).getPlace());
+
+        assertTrue(mdvs14.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (rel)", mdvs14.get(1).getValue());
+        assertEquals(1, mdvs14.get(1).getPlace());
+
+        assertTrue(mdvs14.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs14.get(2).getValue());
+        assertEquals(2, mdvs14.get(2).getPlace());
+
+        assertTrue(mdvs14.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (rel)", mdvs14.get(3).getValue());
+        assertEquals(3, mdvs14.get(3).getPlace());
+
+        assertTrue(mdvs14.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs14.get(4).getValue());
+        assertEquals(4, mdvs14.get(4).getPlace());
+
+        ////////////////////////////////////////////////
+        // after add relationship - verify volume 1.2 //
+        ////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, v1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(v1_2, isIssueOfJournalVolume, i1_1, BOTH, 0, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i2_1, BOTH, 1, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i3_1, LEFT_ONLY, 2, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i3_3, BOTH, 2, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i4_1, BOTH, 3, 0),
+                isRel(v1_2, isIssueOfJournalVolume, i5_1, BOTH, 4, 0)
+            ))
+        );
+
+        assertEquals(
+            6,
+            relationshipService.countByItem(context, v1_2, false, false)
+        );
+
+        List<MetadataValue> mdvs17 = itemService.getMetadata(
+            v1_2, "publicationissue", "issueNumber", null, Item.ANY
+        );
+        assertEquals(5, mdvs17.size());
+
+        assertTrue(mdvs17.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 1 (rel)", mdvs17.get(0).getValue());
+        assertEquals(0, mdvs17.get(0).getPlace());
+
+        assertTrue(mdvs17.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 2 (rel)", mdvs17.get(1).getValue());
+        assertEquals(1, mdvs17.get(1).getPlace());
+
+        assertTrue(mdvs7.get(2) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 3 (rel)", mdvs7.get(2).getValue());
+        assertEquals(2, mdvs7.get(2).getPlace());
+
+        assertTrue(mdvs17.get(3) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 4 (rel)", mdvs17.get(3).getValue());
+        assertEquals(3, mdvs17.get(3).getPlace());
+
+        assertTrue(mdvs17.get(4) instanceof RelationshipMetadataValue);
+        assertEquals("issue nr 5 (rel)", mdvs17.get(4).getValue());
+        assertEquals(4, mdvs17.get(4).getPlace());
+
+        /////////////////////////////////////////////
+        // delete volume first for min cardinality //
+        /////////////////////////////////////////////
+
+        itemService.delete(context, context.reloadEntity(v1_1));
+        itemService.delete(context, context.reloadEntity(v1_2));
+    }
+
+    protected void verifySolrField(Item item, String fieldName, List<Object> expectedValues) throws Exception {
+        QueryResponse result = solrSearchCore.getSolr().query(new SolrQuery(String.format(
+            "search.resourcetype:\"Item\" AND search.resourceid:\"%s\"", item.getID()
+        )));
+
+        SolrDocumentList docs = result.getResults();
+        Assert.assertEquals(1, docs.size());
+        SolrDocument doc = docs.get(0);
+
+        java.util.Collection<Object> actualValues = doc.getFieldValues(fieldName);
+
+        if (expectedValues == null) {
+            assertNull(actualValues);
+        } else {
+            assertThat(actualValues, containsInAnyOrder(expectedValues.toArray()));
+        }
+    }
+
+    /**
+     * Setup:
+     * - two people are linked to one publication
+     * - create a new version of the publication
+     * - create a new version of person 1
+     * - create a new version of person 2
+     *
+     * Goals:
+     * - check that the metadata (plain text and from relationships) of the items have the correct value and place,
+     *   as new versions of the items get created and edited
+     * - verify that changes to newer versions and relationships don't affect older versions and relationships
+     * - verify that the (versions of) items are properly indexed in the Solr search core
+     */
+    @Test
+    public void test_virtualMetadataPreserved() throws Exception {
+        //////////////////////////////////////////////
+        // create a publication and link two people //
+        //////////////////////////////////////////////
+
+        Item publication1V1 = ItemBuilder.createItem(context, collection)
+            .withTitle("publication 1V1")
+            .withMetadata("dspace", "entity", "type", publicationEntityType.getLabel())
+            .build();
+
+        Item person1V1 = ItemBuilder.createItem(context, collection)
+            .withTitle("person 1V1")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .withPersonIdentifierFirstName("Donald")
+            .withPersonIdentifierLastName("Smith")
+            .build();
+
+        Item person2V1 = ItemBuilder.createItem(context, collection)
+            .withTitle("person 2V1")
+            .withMetadata("dspace", "entity", "type", personEntityType.getLabel())
+            .withPersonIdentifierFirstName("Jane")
+            .withPersonIdentifierLastName("Doe")
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, publication1V1, person1V1, isAuthorOfPublication)
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, publication1V1, person2V1, isAuthorOfPublication)
+            .withRightwardValue("Doe, J.")
+            .build();
+
+        ///////////////////////////////////////////////
+        // test dc.contributor.author of publication //
+        ///////////////////////////////////////////////
+
+        List<MetadataValue> mdvs1 = itemService.getMetadata(
+            publication1V1, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs1.size());
+
+        assertTrue(mdvs1.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, Donald", mdvs1.get(0).getValue());
+        assertEquals(0, mdvs1.get(0).getPlace());
+
+        assertTrue(mdvs1.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, J.", mdvs1.get(1).getValue());
+        assertEquals(1, mdvs1.get(1).getPlace());
+
+        verifySolrField(publication1V1, "dc.contributor.author", List.of(
+            "Smith, Donald", "Doe, J."
+        ));
+
+        ////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of publication //
+        ////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR1 = itemService.getMetadata(
+            publication1V1, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR1.size());
+
+        assertTrue(mdvsR1.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V1.getID().toString(), mdvsR1.get(0).getValue());
+        assertEquals(0, mdvsR1.get(0).getPlace());
+
+        assertTrue(mdvsR1.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V1.getID().toString(), mdvsR1.get(1).getValue());
+        assertEquals(1, mdvsR1.get(1).getPlace());
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication", List.of(
+            person1V1.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of publication //
+        ///////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V1, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder(
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person2V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                )
+            )
+        );
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication.latestForDiscovery", List.of(
+            person1V1.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////
+        // create a new version of publication 1 and archive //
+        ///////////////////////////////////////////////////////
+
+        Item publication1V2 = versioningService.createNewVersion(context, publication1V1).getItem();
+        installItemService.installItem(context, workspaceItemService.findByItem(context, publication1V2));
+        context.dispatchEvents();
+
+        ////////////////////////////////////
+        // create new version of person 1 //
+        ////////////////////////////////////
+
+        Item person1V2 = versioningService.createNewVersion(context, person1V1).getItem();
+        // update "Smith, Donald" to "Smith, D."
+        itemService.replaceMetadata(
+            context, person1V2, "person", "givenName", null, null, "D.",
+            null, -1, 0
+        );
+        itemService.update(context, person1V2);
+        context.dispatchEvents();
+
+        ///////////////////
+        // cache busting //
+        ///////////////////
+
+        publication1V1.setMetadataModified();
+        publication1V1 = context.reloadEntity(publication1V1);
+
+        publication1V2.setMetadataModified();
+        publication1V2 = context.reloadEntity(publication1V2);
+
+        ///////////////////////////////////////////////////
+        // test dc.contributor.author of old publication //
+        ///////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, publication1V1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1V1, isAuthorOfPublication, person1V1, RIGHT_ONLY, 0, 0),
+                isRel(publication1V1, isAuthorOfPublication, person2V1, RIGHT_ONLY, null, "Doe, J.", 1, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs2 = itemService.getMetadata(
+            publication1V1, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs2.size());
+
+        assertTrue(mdvs2.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, Donald", mdvs2.get(0).getValue());
+        assertEquals(0, mdvs2.get(0).getPlace());
+
+        assertTrue(mdvs2.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, J.", mdvs2.get(1).getValue());
+        assertEquals(1, mdvs2.get(1).getPlace());
+
+        verifySolrField(publication1V1, "dc.contributor.author", List.of(
+            "Smith, Donald", "Doe, J."
+        ));
+
+        ////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of old publication //
+        ////////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR2 = itemService.getMetadata(
+            publication1V1, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR2.size());
+
+        assertTrue(mdvsR2.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V1.getID().toString(), mdvsR2.get(0).getValue());
+        assertEquals(0, mdvsR2.get(0).getPlace());
+
+        assertTrue(mdvsR2.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V1.getID().toString(), mdvsR2.get(1).getValue());
+        assertEquals(1, mdvsR2.get(1).getPlace());
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication", List.of(
+            person1V1.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of old publication //
+        ///////////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V1, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder()
+        );
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication.latestForDiscovery", null);
+
+        ///////////////////////////////////////////////////
+        // test dc.contributor.author of new publication //
+        ///////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, publication1V2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1V2, isAuthorOfPublication, person1V1, BOTH, 0, 0),
+                isRel(publication1V2, isAuthorOfPublication, person1V2, LEFT_ONLY, 0, 0),
+                isRel(publication1V2, isAuthorOfPublication, person2V1, BOTH, null, "Doe, J.", 1, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs3 = itemService.getMetadata(
+            publication1V2, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs3.size());
+
+        assertTrue(mdvs3.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, Donald", mdvs3.get(0).getValue());
+        assertEquals(0, mdvs3.get(0).getPlace());
+
+        assertTrue(mdvs3.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, J.", mdvs3.get(1).getValue());
+        assertEquals(1, mdvs3.get(1).getPlace());
+
+        verifySolrField(publication1V2, "dc.contributor.author", List.of(
+            "Smith, Donald", "Doe, J."
+        ));
+
+        ////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of new publication //
+        ////////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR3 = itemService.getMetadata(
+            publication1V2, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR3.size());
+
+        assertTrue(mdvsR3.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V1.getID().toString(), mdvsR3.get(0).getValue());
+        assertEquals(0, mdvsR3.get(0).getPlace());
+
+        assertTrue(mdvsR3.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V1.getID().toString(), mdvsR3.get(1).getValue());
+        assertEquals(1, mdvsR3.get(1).getPlace());
+
+        verifySolrField(publication1V2, "relation.isAuthorOfPublication", List.of(
+            person1V1.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of new publication //
+        ///////////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V2, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder(
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V2.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person2V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                )
+            )
+        );
+
+        verifySolrField(publication1V2, "relation.isAuthorOfPublication.latestForDiscovery", List.of(
+            person1V1.getID().toString(), person1V2.getID().toString(), person2V1.getID().toString()
+        ));
+
+        /////////////////////////////////////
+        // archive new version of person 1 //
+        /////////////////////////////////////
+
+        installItemService.installItem(context, workspaceItemService.findByItem(context, person1V2));
+        context.dispatchEvents();
+
+        ///////////////////
+        // cache busting //
+        ///////////////////
+
+        publication1V1.setMetadataModified();
+        publication1V1 = context.reloadEntity(publication1V1);
+
+        publication1V2.setMetadataModified();
+        publication1V2 = context.reloadEntity(publication1V2);
+
+        ///////////////////////////////////////////////////
+        // test dc.contributor.author of old publication //
+        ///////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, publication1V1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1V1, isAuthorOfPublication, person1V1, RIGHT_ONLY, 0, 0),
+                isRel(publication1V1, isAuthorOfPublication, person2V1, RIGHT_ONLY, null, "Doe, J.", 1, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs4 = itemService.getMetadata(
+            publication1V1, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs4.size());
+
+        assertTrue(mdvs4.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, Donald", mdvs4.get(0).getValue());
+        assertEquals(0, mdvs4.get(0).getPlace());
+
+        assertTrue(mdvs4.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, J.", mdvs4.get(1).getValue());
+        assertEquals(1, mdvs4.get(1).getPlace());
+
+        verifySolrField(publication1V1, "dc.contributor.author", List.of(
+            "Smith, Donald", "Doe, J."
+        ));
+
+        ////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of publication //
+        ////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR4 = itemService.getMetadata(
+            publication1V1, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR4.size());
+
+        assertTrue(mdvsR4.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V1.getID().toString(), mdvsR4.get(0).getValue());
+        assertEquals(0, mdvsR4.get(0).getPlace());
+
+        assertTrue(mdvsR4.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V1.getID().toString(), mdvsR4.get(1).getValue());
+        assertEquals(1, mdvsR4.get(1).getPlace());
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication", List.of(
+            person1V1.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of publication //
+        ///////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V1, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder()
+        );
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication.latestForDiscovery", null);
+
+        ///////////////////////////////////////////////////
+        // test dc.contributor.author of new publication //
+        ///////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, publication1V2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1V2, isAuthorOfPublication, person1V1, LEFT_ONLY, 0, 0),
+                isRel(publication1V2, isAuthorOfPublication, person1V2, BOTH, 0, 0),
+                isRel(publication1V2, isAuthorOfPublication, person2V1, BOTH, null, "Doe, J.", 1, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs5 = itemService.getMetadata(
+            publication1V2, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs5.size());
+
+        assertTrue(mdvs5.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, D.", mdvs5.get(0).getValue());
+        assertEquals(0, mdvs5.get(0).getPlace());
+
+        assertTrue(mdvs5.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, J.", mdvs5.get(1).getValue());
+        assertEquals(1, mdvs5.get(1).getPlace());
+
+        verifySolrField(publication1V2, "dc.contributor.author", List.of(
+            "Smith, D.", "Doe, J."
+        ));
+
+        ////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of new publication //
+        ////////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR5 = itemService.getMetadata(
+            publication1V2, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR5.size());
+
+        assertTrue(mdvsR5.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V2.getID().toString(), mdvsR5.get(0).getValue());
+        assertEquals(0, mdvsR5.get(0).getPlace());
+
+        assertTrue(mdvsR5.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V1.getID().toString(), mdvsR5.get(1).getValue());
+        assertEquals(1, mdvsR5.get(1).getPlace());
+
+        verifySolrField(publication1V2, "relation.isAuthorOfPublication", List.of(
+            person1V2.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of new publication //
+        ///////////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V2, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder(
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V2.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person2V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                )
+            )
+        );
+
+        verifySolrField(publication1V2, "relation.isAuthorOfPublication.latestForDiscovery", List.of(
+            person1V1.getID().toString(), person1V2.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ////////////////////////////////////
+        // create new version of person 2 //
+        ////////////////////////////////////
+
+        Item person2V2 = versioningService.createNewVersion(context, person2V1).getItem();
+        Relationship rel1 = getRelationship(publication1V2, isAuthorOfPublication, person2V2);
+        assertNotNull(rel1);
+        rel1.setRightwardValue("Doe, Jane Jr");
+        relationshipService.update(context, rel1);
+        context.dispatchEvents();
+
+        ///////////////////
+        // cache busting //
+        ///////////////////
+
+        publication1V1.setMetadataModified();
+        publication1V1 = context.reloadEntity(publication1V1);
+
+        publication1V2.setMetadataModified();
+        publication1V2 = context.reloadEntity(publication1V2);
+
+        ///////////////////////////////////////////////////
+        // test dc.contributor.author of old publication //
+        ///////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, publication1V1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1V1, isAuthorOfPublication, person1V1, RIGHT_ONLY, 0, 0),
+                isRel(publication1V1, isAuthorOfPublication, person2V1, RIGHT_ONLY, null, "Doe, J.", 1, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs6 = itemService.getMetadata(
+            publication1V1, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs6.size());
+
+        assertTrue(mdvs6.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, Donald", mdvs6.get(0).getValue());
+        assertEquals(0, mdvs6.get(0).getPlace());
+
+        assertTrue(mdvs6.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, J.", mdvs6.get(1).getValue());
+        assertEquals(1, mdvs6.get(1).getPlace());
+
+        verifySolrField(publication1V1, "dc.contributor.author", List.of(
+            "Smith, Donald", "Doe, J."
+        ));
+
+        ////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of old publication //
+        ////////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR6 = itemService.getMetadata(
+            publication1V1, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR6.size());
+
+        assertTrue(mdvsR6.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V1.getID().toString(), mdvsR6.get(0).getValue());
+        assertEquals(0, mdvsR6.get(0).getPlace());
+
+        assertTrue(mdvsR6.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V1.getID().toString(), mdvsR6.get(1).getValue());
+        assertEquals(1, mdvsR6.get(1).getPlace());
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication", List.of(
+            person1V1.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of old publication //
+        ///////////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V1, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder()
+        );
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication.latestForDiscovery", null);
+
+        ///////////////////////////////////////////////////
+        // test dc.contributor.author of new publication //
+        ///////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, publication1V2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1V2, isAuthorOfPublication, person1V1, LEFT_ONLY, 0, 0),
+                isRel(publication1V2, isAuthorOfPublication, person1V2, BOTH, 0, 0),
+                isRel(publication1V2, isAuthorOfPublication, person2V1, BOTH, null, "Doe, J.", 1, 0),
+                isRel(publication1V2, isAuthorOfPublication, person2V2, LEFT_ONLY, null, "Doe, Jane Jr", 1, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs7 = itemService.getMetadata(
+            publication1V2, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs7.size());
+
+        assertTrue(mdvs7.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, D.", mdvs7.get(0).getValue());
+        assertEquals(0, mdvs7.get(0).getPlace());
+
+        assertTrue(mdvs7.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, J.", mdvs7.get(1).getValue());
+        assertEquals(1, mdvs7.get(1).getPlace());
+
+        verifySolrField(publication1V2, "dc.contributor.author", List.of(
+            "Smith, D.", "Doe, J."
+        ));
+
+        ////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of new publication //
+        ////////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR7 = itemService.getMetadata(
+            publication1V2, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR7.size());
+
+        assertTrue(mdvsR7.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V2.getID().toString(), mdvsR7.get(0).getValue());
+        assertEquals(0, mdvsR7.get(0).getPlace());
+
+        assertTrue(mdvsR7.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V1.getID().toString(), mdvsR7.get(1).getValue());
+        assertEquals(1, mdvsR7.get(1).getPlace());
+
+        verifySolrField(publication1V2, "relation.isAuthorOfPublication", List.of(
+            person1V2.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of new publication //
+        ///////////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V2, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder(
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V2.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person2V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person2V2.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                )
+            )
+        );
+
+        verifySolrField(publication1V2, "relation.isAuthorOfPublication.latestForDiscovery", List.of(
+            person1V1.getID().toString(), person1V2.getID().toString(),
+            person2V1.getID().toString(), person2V2.getID().toString()
+        ));
+
+        /////////////////////////////////////
+        // archive new version of person 2 //
+        /////////////////////////////////////
+
+        installItemService.installItem(context, workspaceItemService.findByItem(context, person2V2));
+        context.dispatchEvents();
+
+        ///////////////////
+        // cache busting //
+        ///////////////////
+
+        publication1V1.setMetadataModified();
+        publication1V1 = context.reloadEntity(publication1V1);
+
+        publication1V2.setMetadataModified();
+        publication1V2 = context.reloadEntity(publication1V2);
+
+        ///////////////////////////////////////////////////
+        // test dc.contributor.author of old publication //
+        ///////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, publication1V1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1V1, isAuthorOfPublication, person1V1, RIGHT_ONLY, 0, 0),
+                isRel(publication1V1, isAuthorOfPublication, person2V1, RIGHT_ONLY, null, "Doe, J.", 1, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs8 = itemService.getMetadata(
+            publication1V1, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs8.size());
+
+        assertTrue(mdvs8.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, Donald", mdvs8.get(0).getValue());
+        assertEquals(0, mdvs8.get(0).getPlace());
+
+        assertTrue(mdvs8.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, J.", mdvs8.get(1).getValue());
+        assertEquals(1, mdvs8.get(1).getPlace());
+
+        verifySolrField(publication1V1, "dc.contributor.author", List.of(
+            "Smith, Donald", "Doe, J."
+        ));
+
+        ////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of old publication //
+        ////////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR8 = itemService.getMetadata(
+            publication1V1, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR8.size());
+
+        assertTrue(mdvsR8.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V1.getID().toString(), mdvsR8.get(0).getValue());
+        assertEquals(0, mdvsR8.get(0).getPlace());
+
+        assertTrue(mdvsR8.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V1.getID().toString(), mdvsR8.get(1).getValue());
+        assertEquals(1, mdvsR8.get(1).getPlace());
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication", List.of(
+            person1V1.getID().toString(), person2V1.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of old publication //
+        ///////////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V1, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder()
+        );
+
+        verifySolrField(publication1V1, "relation.isAuthorOfPublication.latestForDiscovery", null);
+
+        ///////////////////////////////////////////////////
+        // test dc.contributor.author of new publication //
+        ///////////////////////////////////////////////////
+
+        assertThat(
+            relationshipService.findByItem(context, publication1V2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(publication1V2, isAuthorOfPublication, person1V1, LEFT_ONLY, 0, 0),
+                isRel(publication1V2, isAuthorOfPublication, person1V2, BOTH, 0, 0),
+                isRel(publication1V2, isAuthorOfPublication, person2V1, LEFT_ONLY, null, "Doe, J.", 1, 0),
+                isRel(publication1V2, isAuthorOfPublication, person2V2, BOTH, null, "Doe, Jane Jr", 1, 0)
+            ))
+        );
+
+        List<MetadataValue> mdvs9 = itemService.getMetadata(
+            publication1V2, "dc", "contributor", "author", Item.ANY
+        );
+        assertEquals(2, mdvs9.size());
+
+        assertTrue(mdvs9.get(0) instanceof RelationshipMetadataValue);
+        assertEquals("Smith, D.", mdvs9.get(0).getValue());
+        assertEquals(0, mdvs9.get(0).getPlace());
+
+        assertTrue(mdvs9.get(1) instanceof RelationshipMetadataValue);
+        assertEquals("Doe, Jane Jr", mdvs9.get(1).getValue());
+        assertEquals(1, mdvs9.get(1).getPlace());
+
+        verifySolrField(publication1V2, "dc.contributor.author", List.of(
+            "Smith, D.", "Doe, Jane Jr"
+        ));
+
+        ////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication of new publication //
+        ////////////////////////////////////////////////////////////
+
+        List<MetadataValue> mdvsR9 = itemService.getMetadata(
+            publication1V2, "relation", "isAuthorOfPublication", null, Item.ANY
+        );
+        assertEquals(2, mdvsR9.size());
+
+        assertTrue(mdvsR9.get(0) instanceof RelationshipMetadataValue);
+        assertEquals(person1V2.getID().toString(), mdvsR9.get(0).getValue());
+        assertEquals(0, mdvsR9.get(0).getPlace());
+
+        assertTrue(mdvsR9.get(1) instanceof RelationshipMetadataValue);
+        assertEquals(person2V2.getID().toString(), mdvsR9.get(1).getValue());
+        assertEquals(1, mdvsR9.get(1).getPlace());
+
+        verifySolrField(publication1V2, "relation.isAuthorOfPublication", List.of(
+            person1V2.getID().toString(), person2V2.getID().toString()
+        ));
+
+        ///////////////////////////////////////////////////////////////////////////////
+        // test relation.isAuthorOfPublication.latestForDiscovery of new publication //
+        ///////////////////////////////////////////////////////////////////////////////
+
+        assertThat(
+            itemService.getMetadata(
+                publication1V2, "relation", "isAuthorOfPublication", "latestForDiscovery", Item.ANY
+            ),
+            containsInAnyOrder(
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person1V2.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person2V1.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                ),
+                allOf(
+                    instanceOf(RelationshipMetadataValue.class),
+                    hasProperty("value", is(person2V2.getID().toString())),
+                    hasProperty("place", is(-1)),
+                    hasProperty("authority", startsWith(Constants.VIRTUAL_AUTHORITY_PREFIX))
+                )
+            )
+        );
+
+        verifySolrField(publication1V2, "relation.isAuthorOfPublication.latestForDiscovery", List.of(
+            person1V1.getID().toString(), person1V2.getID().toString(),
+            person2V1.getID().toString(), person2V2.getID().toString()
+        ));
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/content/crosswalk/QDCCrosswalkTest.java b/dspace-api/src/test/java/org/dspace/content/crosswalk/QDCCrosswalkTest.java
index efed8ad8dc..2eafc03986 100644
--- a/dspace-api/src/test/java/org/dspace/content/crosswalk/QDCCrosswalkTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/crosswalk/QDCCrosswalkTest.java
@@ -14,7 +14,7 @@ import org.dspace.AbstractDSpaceTest;
 import org.dspace.core.service.PluginService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.jdom.Namespace;
+import org.jdom2.Namespace;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/dspace-api/src/test/java/org/dspace/content/dao/RelationshipDAOImplTest.java b/dspace-api/src/test/java/org/dspace/content/dao/RelationshipDAOImplTest.java
index 2143090fcf..b6f5da6be0 100644
--- a/dspace-api/src/test/java/org/dspace/content/dao/RelationshipDAOImplTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/dao/RelationshipDAOImplTest.java
@@ -138,28 +138,6 @@ public class RelationshipDAOImplTest extends AbstractIntegrationTest {
                 -1, -1, false));
     }
 
-    /**
-     * Test findNextLeftPlaceByLeftItem should return 0 given our test left Item itemOne.
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testFindNextLeftPlaceByLeftItem() throws Exception {
-        assertEquals("TestNextLeftPlaceByLeftItem 0", 1, relationshipService.findNextLeftPlaceByLeftItem(context,
-                itemOne));
-    }
-
-    /**
-     * Test findNextRightPlaceByRightItem should return 0 given our test right Item itemTwo.
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testFindNextRightPlaceByRightItem() throws Exception {
-        assertEquals("TestNextRightPlaceByRightItem 0", 1, relationshipService.findNextRightPlaceByRightItem(context,
-                itemTwo));
-    }
-
     /**
      * Test findByRelationshipType should return our defined relationshipsList given our test RelationshipType
      * relationshipType
diff --git a/dspace-api/src/test/java/org/dspace/content/logic/LogicalFilterTest.java b/dspace-api/src/test/java/org/dspace/content/logic/LogicalFilterTest.java
index 7c8268a03b..0e08646220 100644
--- a/dspace-api/src/test/java/org/dspace/content/logic/LogicalFilterTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/logic/LogicalFilterTest.java
@@ -408,6 +408,7 @@ public class LogicalFilterTest extends AbstractUnitTest {
 
         // Create condition to match pattern on dc.title metadata
         Condition condition = new MetadataValuesMatchCondition();
+        condition.setItemService(ContentServiceFactory.getInstance().getItemService());
         Map<String, Object> parameters = new HashMap<>();
         // Match on the dc.title field
         parameters.put("field", "dc.title");
@@ -461,6 +462,7 @@ public class LogicalFilterTest extends AbstractUnitTest {
         // Instantiate new filter for testing this condition
         DefaultFilter filter = new DefaultFilter();
         Condition condition = new InCollectionCondition();
+        condition.setItemService(ContentServiceFactory.getInstance().getItemService());
         Map<String, Object> parameters = new HashMap<>();
 
         // Add collectionOne handle to the collections parameter - ie. we are testing to see if the item is
diff --git a/dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java b/dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java
index 33e353f457..a634b98130 100644
--- a/dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java
+++ b/dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java
@@ -194,7 +194,7 @@ public class ITDSpaceAIP extends AbstractIntegrationTest {
             ePersonService.update(context, submitter);
             context.setCurrentUser(submitter);
 
-            //Make our test ePerson an admin so he can perform deletes and restores
+            //Make our test ePerson an admin so it can perform deletes and restores
             GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
             Group adminGroup = groupService.findByName(context, Group.ADMIN);
             groupService.addMember(context, adminGroup, submitter);
diff --git a/dspace-api/src/test/java/org/dspace/content/service/ItemServiceTest.java b/dspace-api/src/test/java/org/dspace/content/service/ItemServiceTest.java
new file mode 100644
index 0000000000..267d66ac2f
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/content/service/ItemServiceTest.java
@@ -0,0 +1,485 @@
+/**
+ * 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/
+ */
+package org.dspace.content.service;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.sql.SQLException;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.RelationshipBuilder;
+import org.dspace.builder.RelationshipTypeBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.Relationship;
+import org.dspace.content.RelationshipType;
+import org.dspace.content.WorkspaceItem;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.versioning.Version;
+import org.dspace.versioning.factory.VersionServiceFactory;
+import org.dspace.versioning.service.VersioningService;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ItemServiceTest extends AbstractIntegrationTestWithDatabase {
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemServiceTest.class);
+
+    protected RelationshipService relationshipService = ContentServiceFactory.getInstance().getRelationshipService();
+    protected RelationshipTypeService relationshipTypeService = ContentServiceFactory.getInstance()
+                                                                                     .getRelationshipTypeService();
+    protected EntityTypeService entityTypeService = ContentServiceFactory.getInstance().getEntityTypeService();
+    protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
+    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
+    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+    protected InstallItemService installItemService = ContentServiceFactory.getInstance().getInstallItemService();
+    protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService();
+    protected MetadataValueService metadataValueService = ContentServiceFactory.getInstance().getMetadataValueService();
+    protected VersioningService versioningService = VersionServiceFactory.getInstance().getVersionService();
+
+    Community community;
+    Collection collection1;
+
+    Item item;
+
+    String authorQualifier = "author";
+    String contributorElement = "contributor";
+    String dcSchema = "dc";
+    String subjectElement = "subject";
+    String descriptionElement = "description";
+    String abstractQualifier = "abstract";
+
+    /**
+     * This method will be run before every test as per @Before. It will
+     * initialize resources required for the tests.
+     */
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        try {
+            context.turnOffAuthorisationSystem();
+
+            community = CommunityBuilder.createCommunity(context)
+                .build();
+
+            collection1 = CollectionBuilder.createCollection(context, community)
+                .withEntityType("Publication")
+                .build();
+
+            WorkspaceItem is = workspaceItemService.create(context, collection1, false);
+
+            item = installItemService.installItem(context, is);
+
+            context.restoreAuthSystemState();
+        } catch (AuthorizeException ex) {
+            log.error("Authorization Error in init", ex);
+            fail("Authorization Error in init: " + ex.getMessage());
+        } catch (SQLException ex) {
+            log.error("SQL Error in init", ex);
+            fail("SQL Error in init: " + ex.getMessage());
+        }
+    }
+
+    @Test
+    public void InsertAndMoveMetadataShiftPlaceTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Here we add the first set of metadata to the item
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, one");
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, two");
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, three");
+
+        context.restoreAuthSystemState();
+
+        // The code below performs the mentioned assertions to ensure the place is correct
+        List<MetadataValue> list = itemService
+            .getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
+        assertThat(list.size(), equalTo(3));
+
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 1, list.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 2, list.get(2));
+
+        context.turnOffAuthorisationSystem();
+
+        // This is where we add metadata at place=1
+        itemService.addAndShiftRightMetadata(
+            context, item, dcSchema, contributorElement, authorQualifier, null, "test, four", null, -1, 1
+        );
+
+        // Here we retrieve the list of metadata again to perform the assertions on the places below as mentioned
+        list = itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY)
+                          .stream()
+                          .sorted(Comparator.comparingInt(MetadataValue::getPlace))
+                          .collect(Collectors.toList());
+        assertThat(list.size(), equalTo(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 1, list.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 2, list.get(2));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list.get(3));
+
+        // And move metadata from place=2 to place=0
+        itemService.moveMetadata(context, item, dcSchema, contributorElement, authorQualifier, 2, 0);
+
+        context.restoreAuthSystemState();
+
+        // Here we retrieve the list of metadata again to perform the assertions on the places below as mentioned
+        list = itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY)
+                          .stream()
+                          .sorted(Comparator.comparingInt(MetadataValue::getPlace))
+                          .collect(Collectors.toList());
+        assertThat(list.size(), equalTo(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 0, list.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 1, list.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 2, list.get(2));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list.get(3));
+    }
+
+    @Test
+    public void InsertAndMoveMetadataShiftPlaceTest_complex() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Here we add the first set of metadata to the item
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, one");
+
+        // NOTE: dc.subject should NOT affect dc.contributor.author
+        itemService.addMetadata(context, item, dcSchema, subjectElement, null, null, "test, sub1");
+        // NOTE: dc.subject should NOT affect dc.contributor.author
+        itemService.addMetadata(context, item, dcSchema, subjectElement, null, null, "test, sub2");
+
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, two");
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, three");
+
+        // NOTE: dc.description.abstract should NOT affect dc.contributor.author
+        itemService.addMetadata(context, item, dcSchema, descriptionElement, abstractQualifier, null, "test, abs1");
+
+        context.restoreAuthSystemState();
+
+        // The code below performs the mentioned assertions to ensure the place is correct
+        List<MetadataValue> list1 = itemService
+            .getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
+        assertThat(list1.size(), equalTo(3));
+
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list1.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 1, list1.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 2, list1.get(2));
+
+        List<MetadataValue> list2 = itemService
+            .getMetadata(item, dcSchema, subjectElement, null, Item.ANY);
+        assertThat(list2.size(), equalTo(2));
+
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub1", null, 0, list2.get(0));
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub2", null, 1, list2.get(1));
+
+        List<MetadataValue> list3 = itemService
+            .getMetadata(item, dcSchema, descriptionElement, abstractQualifier, Item.ANY);
+        assertThat(list3.size(), equalTo(1));
+
+        assertMetadataValue(abstractQualifier, descriptionElement, dcSchema, "test, abs1", null, 0, list3.get(0));
+
+        context.turnOffAuthorisationSystem();
+
+        // This is where we add metadata at place=1
+        itemService.addAndShiftRightMetadata(
+            context, item, dcSchema, contributorElement, authorQualifier, null, "test, four", null, -1, 1
+        );
+
+        // Here we retrieve the list of metadata again to perform the assertions on the places below as mentioned
+        List<MetadataValue> list4 = itemService
+            .getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY)
+            .stream()
+            .sorted(Comparator.comparingInt(MetadataValue::getPlace))
+            .collect(Collectors.toList());
+        assertThat(list4.size(), equalTo(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list4.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 1, list4.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 2, list4.get(2));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list4.get(3));
+
+        List<MetadataValue> list5 = itemService
+            .getMetadata(item, dcSchema, subjectElement, null, Item.ANY);
+        assertThat(list5.size(), equalTo(2));
+
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub1", null, 0, list5.get(0));
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub2", null, 1, list5.get(1));
+
+        List<MetadataValue> list6 = itemService
+            .getMetadata(item, dcSchema, descriptionElement, abstractQualifier, Item.ANY);
+        assertThat(list3.size(), equalTo(1));
+
+        assertMetadataValue(abstractQualifier, descriptionElement, dcSchema, "test, abs1", null, 0, list6.get(0));
+
+        // And move metadata from place=2 to place=0
+        itemService.moveMetadata(context, item, dcSchema, contributorElement, authorQualifier, 2, 0);
+
+        context.restoreAuthSystemState();
+
+        // Here we retrieve the list of metadata again to perform the assertions on the places below as mentioned
+        List<MetadataValue> list7 = itemService
+            .getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY)
+            .stream()
+            .sorted(Comparator.comparingInt(MetadataValue::getPlace))
+            .collect(Collectors.toList());
+        assertThat(list7.size(), equalTo(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 0, list7.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 1, list7.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 2, list7.get(2));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list7.get(3));
+
+        List<MetadataValue> list8 = itemService
+            .getMetadata(item, dcSchema, subjectElement, null, Item.ANY);
+        assertThat(list8.size(), equalTo(2));
+
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub1", null, 0, list8.get(0));
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub2", null, 1, list8.get(1));
+
+        List<MetadataValue> list9 = itemService
+            .getMetadata(item, dcSchema, descriptionElement, abstractQualifier, Item.ANY);
+        assertThat(list9.size(), equalTo(1));
+
+        assertMetadataValue(abstractQualifier, descriptionElement, dcSchema, "test, abs1", null, 0, list9.get(0));
+    }
+
+    @Test
+    public void InsertAndMoveMetadataOnePlaceForwardTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Here we add the first set of metadata to the item
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, one");
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, two");
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, three");
+
+        context.restoreAuthSystemState();
+
+        // The code below performs the mentioned assertions to ensure the place is correct
+        List<MetadataValue> list = itemService
+            .getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
+        assertThat(list.size(), equalTo(3));
+
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 1, list.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 2, list.get(2));
+
+        context.turnOffAuthorisationSystem();
+
+        // This is where we add metadata at place=1
+        itemService.addAndShiftRightMetadata(
+            context, item, dcSchema, contributorElement, authorQualifier, null, "test, four", null, -1, 1
+        );
+
+        // Here we retrieve the list of metadata again to perform the assertions on the places below as mentioned
+        list = itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY)
+                          .stream()
+                          .sorted(Comparator.comparingInt(MetadataValue::getPlace))
+                          .collect(Collectors.toList());
+        assertThat(list.size(), equalTo(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 1, list.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 2, list.get(2));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list.get(3));
+
+        // And move metadata from place=1 to place=2
+        itemService.moveMetadata(context, item, dcSchema, contributorElement, authorQualifier, 1, 2);
+
+        context.restoreAuthSystemState();
+
+        // Here we retrieve the list of metadata again to perform the assertions on the places below as mentioned
+        list = itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY)
+                          .stream()
+                          .sorted(Comparator.comparingInt(MetadataValue::getPlace))
+                          .collect(Collectors.toList());
+        assertThat(list.size(), equalTo(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 1, list.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 2, list.get(2));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list.get(3));
+    }
+
+    @Test
+    public void InsertAndMoveMetadataOnePlaceForwardTest_complex() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // NOTE: dc.description.abstract should NOT affect dc.contributor.author
+        itemService.addMetadata(context, item, dcSchema, descriptionElement, abstractQualifier, null, "test, abs1");
+
+        // Here we add the first set of metadata to the item
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, one");
+
+        // NOTE: dc.subject should NOT affect dc.contributor.author
+        itemService.addMetadata(context, item, dcSchema, subjectElement, null, null, "test, sub1");
+
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, two");
+        itemService.addMetadata(context, item, dcSchema, contributorElement, authorQualifier, null, "test, three");
+
+        // NOTE: dc.subject should NOT affect dc.contributor.author
+        itemService.addMetadata(context, item, dcSchema, subjectElement, null, null, "test, sub2");
+
+        context.restoreAuthSystemState();
+
+        // The code below performs the mentioned assertions to ensure the place is correct
+        List<MetadataValue> list1 = itemService
+            .getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
+        assertThat(list1.size(), equalTo(3));
+
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list1.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 1, list1.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 2, list1.get(2));
+
+        List<MetadataValue> list2 = itemService
+            .getMetadata(item, dcSchema, subjectElement, null, Item.ANY);
+        assertThat(list2.size(), equalTo(2));
+
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub1", null, 0, list2.get(0));
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub2", null, 1, list2.get(1));
+
+        List<MetadataValue> list3 = itemService
+            .getMetadata(item, dcSchema, descriptionElement, abstractQualifier, Item.ANY);
+        assertThat(list3.size(), equalTo(1));
+
+        assertMetadataValue(abstractQualifier, descriptionElement, dcSchema, "test, abs1", null, 0, list3.get(0));
+
+        context.turnOffAuthorisationSystem();
+
+        // This is where we add metadata at place=1
+        itemService.addAndShiftRightMetadata(
+            context, item, dcSchema, contributorElement, authorQualifier, null, "test, four", null, -1, 1
+        );
+
+        // Here we retrieve the list of metadata again to perform the assertions on the places below as mentioned
+        List<MetadataValue> list4 = itemService
+            .getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY)
+            .stream()
+            .sorted(Comparator.comparingInt(MetadataValue::getPlace))
+            .collect(Collectors.toList());
+        assertThat(list4.size(), equalTo(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list4.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 1, list4.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 2, list4.get(2));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list4.get(3));
+
+        List<MetadataValue> list5 = itemService
+            .getMetadata(item, dcSchema, subjectElement, null, Item.ANY);
+        assertThat(list5.size(), equalTo(2));
+
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub1", null, 0, list5.get(0));
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub2", null, 1, list5.get(1));
+
+        List<MetadataValue> list6 = itemService
+            .getMetadata(item, dcSchema, descriptionElement, abstractQualifier, Item.ANY);
+        assertThat(list6.size(), equalTo(1));
+
+        assertMetadataValue(abstractQualifier, descriptionElement, dcSchema, "test, abs1", null, 0, list6.get(0));
+
+        // And move metadata from place=1 to place=2
+        itemService.moveMetadata(context, item, dcSchema, contributorElement, authorQualifier, 1, 2);
+
+        context.restoreAuthSystemState();
+
+        // Here we retrieve the list of metadata again to perform the assertions on the places below as mentioned
+        List<MetadataValue> list7 = itemService
+            .getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY)
+            .stream()
+            .sorted(Comparator.comparingInt(MetadataValue::getPlace))
+            .collect(Collectors.toList());
+        assertThat(list7.size(), equalTo(4));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, one", null, 0, list7.get(0));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, two", null, 1, list7.get(1));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, four", null, 2, list7.get(2));
+        assertMetadataValue(authorQualifier, contributorElement, dcSchema, "test, three", null, 3, list7.get(3));
+
+        List<MetadataValue> list8 = itemService
+            .getMetadata(item, dcSchema, subjectElement, null, Item.ANY);
+        assertThat(list8.size(), equalTo(2));
+
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub1", null, 0, list8.get(0));
+        assertMetadataValue(null, subjectElement, dcSchema, "test, sub2", null, 1, list8.get(1));
+
+        List<MetadataValue> list9 = itemService
+            .getMetadata(item, dcSchema, descriptionElement, abstractQualifier, Item.ANY);
+        assertThat(list9.size(), equalTo(1));
+
+        assertMetadataValue(abstractQualifier, descriptionElement, dcSchema, "test, abs1", null, 0, list9.get(0));
+    }
+
+    @Test
+    public void testDeleteItemWithMultipleVersions() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EntityType publicationEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication")
+            .build();
+
+        EntityType personEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person")
+            .build();
+
+        RelationshipType isAuthorOfPublication = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, publicationEntityType, personEntityType, "isAuthorOfPublication", "isPublicationOfAuthor",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        Collection collection2 = CollectionBuilder.createCollection(context, community)
+            .withEntityType("Person")
+            .build();
+
+        Item publication1 = ItemBuilder.createItem(context, collection1)
+            .withTitle("publication 1")
+            // NOTE: entity type comes from collection
+            .build();
+
+        Item person1 = ItemBuilder.createItem(context, collection2)
+            .withTitle("person 2")
+            // NOTE: entity type comes from collection
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, publication1, person1, isAuthorOfPublication);
+
+        // create a new version, which results in a non-latest relationship attached person 1.
+        Version newVersion = versioningService.createNewVersion(context, publication1);
+        Item newPublication1 = newVersion.getItem();
+        WorkspaceItem newPublication1WSI = workspaceItemService.findByItem(context, newPublication1);
+        installItemService.installItem(context, newPublication1WSI);
+        context.dispatchEvents();
+
+        // verify person1 has a non-latest relationship, which should also be removed
+        List<Relationship> relationships1 = relationshipService.findByItem(context, person1, -1, -1, false, true);
+        assertEquals(1, relationships1.size());
+        List<Relationship> relationships2 = relationshipService.findByItem(context, person1, -1, -1, false, false);
+        assertEquals(2, relationships2.size());
+
+        itemService.delete(context, person1);
+
+        context.restoreAuthSystemState();
+    }
+
+    private void assertMetadataValue(String authorQualifier, String contributorElement, String dcSchema, String value,
+                                     String authority, int place, MetadataValue metadataValue) {
+        assertThat(metadataValue.getValue(), equalTo(value));
+        assertThat(metadataValue.getMetadataField().getMetadataSchema().getName(), equalTo(dcSchema));
+        assertThat(metadataValue.getMetadataField().getElement(), equalTo(contributorElement));
+        assertThat(metadataValue.getMetadataField().getQualifier(), equalTo(authorQualifier));
+        assertThat(metadataValue.getAuthority(), equalTo(authority));
+        assertThat(metadataValue.getPlace(), equalTo(place));
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/core/ContextTest.java b/dspace-api/src/test/java/org/dspace/core/ContextTest.java
index 811582c569..c6cd849d21 100644
--- a/dspace-api/src/test/java/org/dspace/core/ContextTest.java
+++ b/dspace-api/src/test/java/org/dspace/core/ContextTest.java
@@ -8,6 +8,7 @@
 package org.dspace.core;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -511,9 +512,8 @@ public class ContextTest extends AbstractUnitTest {
 
         // Now get our special groups
         List<Group> specialGroups = instance.getSpecialGroups();
-        assertThat("testGetSpecialGroup 0", specialGroups.size(), equalTo(2));
-        assertThat("testGetSpecialGroup 1", specialGroups.get(0), equalTo(group));
-        assertThat("testGetSpecialGroup 1", specialGroups.get(1), equalTo(adminGroup));
+        assertThat("testGetSpecialGroup size", specialGroups.size(), equalTo(2));
+        assertThat("testGetSpecialGroup content", specialGroups, hasItems(group, adminGroup));
 
         // Cleanup our context & group
         groupService.delete(instance, group);
diff --git a/dspace-api/src/test/java/org/dspace/ctask/general/CreateMissingIdentifiersIT.java b/dspace-api/src/test/java/org/dspace/ctask/general/CreateMissingIdentifiersIT.java
new file mode 100644
index 0000000000..2a07799dee
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/ctask/general/CreateMissingIdentifiersIT.java
@@ -0,0 +1,89 @@
+/**
+ * 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/
+ */
+package org.dspace.ctask.general;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.core.factory.CoreServiceFactory;
+import org.dspace.curate.Curator;
+import org.dspace.identifier.VersionedHandleIdentifierProviderWithCanonicalHandles;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.After;
+import org.junit.Test;
+
+/**
+ * Rudimentary test of the curation task.
+ *
+ * @author mwood
+ */
+public class CreateMissingIdentifiersIT
+        extends AbstractIntegrationTestWithDatabase {
+    private static final String P_TASK_DEF
+            = "plugin.named.org.dspace.curate.CurationTask";
+    private static final String TASK_NAME = "test";
+
+    @Test
+    public void testPerform()
+            throws IOException {
+        // Must remove any cached named plugins before creating a new one
+        CoreServiceFactory.getInstance().getPluginService().clearNamedPluginClasses();
+        ConfigurationService configurationService = kernelImpl.getConfigurationService();
+        // Define a new task dynamically
+        configurationService.setProperty(P_TASK_DEF,
+                CreateMissingIdentifiers.class.getCanonicalName() + " = " + TASK_NAME);
+
+        Curator curator = new Curator();
+        curator.addTask(TASK_NAME);
+
+        context.setCurrentUser(admin);
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .build();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+                                                 .build();
+        Item item = ItemBuilder.createItem(context, collection)
+                               .build();
+
+        /*
+         * Curate with regular test configuration -- should succeed.
+         */
+        curator.curate(context, item);
+        int status = curator.getStatus(TASK_NAME);
+        assertEquals("Curation should succeed", Curator.CURATE_SUCCESS, status);
+
+        /*
+         * Now install an incompatible provider to make the task fail.
+         */
+        DSpaceServicesFactory.getInstance()
+                .getServiceManager()
+                .registerServiceClass(
+                        VersionedHandleIdentifierProviderWithCanonicalHandles.class.getCanonicalName(),
+                        VersionedHandleIdentifierProviderWithCanonicalHandles.class);
+
+        curator.curate(context, item);
+        System.out.format("With incompatible provider, result is '%s'.\n",
+                curator.getResult(TASK_NAME));
+        assertEquals("Curation should fail", Curator.CURATE_ERROR,
+                curator.getStatus(TASK_NAME));
+    }
+
+    @Override
+    @After
+    public void destroy() throws Exception {
+        super.destroy();
+        DSpaceServicesFactory.getInstance().getServiceManager().getApplicationContext().refresh();
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java b/dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java
index 9504d01393..0d1cc13106 100644
--- a/dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java
+++ b/dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java
@@ -8,13 +8,18 @@
 package org.dspace.discovery;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.app.launcher.ScriptLauncher;
+import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.builder.ClaimedTaskBuilder;
 import org.dspace.builder.CollectionBuilder;
@@ -55,6 +60,7 @@ import org.dspace.xmlworkflow.storedcomponents.ClaimedTask;
 import org.dspace.xmlworkflow.storedcomponents.PoolTask;
 import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.dspace.xmlworkflow.storedcomponents.service.ClaimedTaskService;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 
@@ -64,7 +70,7 @@ import org.springframework.mock.web.MockHttpServletRequest;
 public class DiscoveryIT extends AbstractIntegrationTestWithDatabase {
 
     protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService();
-    protected SearchService searchService = SearchUtils.getSearchService();
+    protected SearchService searchService;
 
     XmlWorkflowService workflowService = XmlWorkflowServiceFactory.getInstance().getXmlWorkflowService();
 
@@ -86,6 +92,14 @@ public class DiscoveryIT extends AbstractIntegrationTestWithDatabase {
     MetadataAuthorityService metadataAuthorityService = ContentAuthorityServiceFactory.getInstance()
                                                                                       .getMetadataAuthorityService();
 
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        configurationService.setProperty("solr-database-resync.time-until-reindex", 1);
+        searchService = SearchUtils.getSearchService();
+    }
+
     @Test
     public void solrRecordsAfterDepositOrDeletionOfWorkspaceItemTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -371,7 +385,8 @@ public class DiscoveryIT extends AbstractIntegrationTestWithDatabase {
         collectionService.delete(context, col1);
         context.restoreAuthSystemState();
         assertSearchQuery(IndexableCollection.TYPE, 2);
-        assertSearchQuery(IndexableItem.TYPE, 2);
+        // Deleted item contained within totalFound due to predb status (SolrDatabaseResyncCli takes care of this)
+        assertSearchQuery(IndexableItem.TYPE, 2, 3, 0, -1);
     }
 
     @Test
@@ -453,6 +468,10 @@ public class DiscoveryIT extends AbstractIntegrationTestWithDatabase {
         assertSearchQuery(IndexableCollection.TYPE, 2, 2, 0, -1);
         // check Item type with start=0 and limit=2, we expect: indexableObjects=2, totalFound=6
         assertSearchQuery(IndexableItem.TYPE, 2, 6, 0, 2);
+
+        // Run SolrDatabaseResyncCli, updating items with "preDB" status and removing stale items
+        performSolrDatabaseResyncScript();
+
         // check Item type with start=2 and limit=4, we expect: indexableObjects=1, totalFound=3
         assertSearchQuery(IndexableItem.TYPE, 1, 3, 2, 4);
         // check Item type with start=0 and limit=default, we expect: indexableObjects=3, totalFound=3
@@ -639,16 +658,85 @@ public class DiscoveryIT extends AbstractIntegrationTestWithDatabase {
         // check Item type with start=0 and limit=default,
         // we expect: indexableObjects=3, totalFound=6 (3 stale objects here)
         assertSearchQuery(IndexableItem.TYPE, 3, 6, 0, -1);
-        // as the previous query hit the stale objects running a new query should lead to a clean situation
+
+        // Run SolrDatabaseResyncCli, updating items with "preDB" status and removing stale items
+        performSolrDatabaseResyncScript();
+
+        // as SolrDatabaseResyncCli removed the stale objects, running a new query should lead to a clean situation
         assertSearchQuery(IndexableItem.TYPE, 3, 3, 0, -1);
     }
 
+    @Test
+    public void iteratorSearchServiceTest() throws SearchServiceException {
+        String subject1 = "subject1";
+        String subject2 = "subject2";
+        int numberItemsSubject1 = 30;
+        int numberItemsSubject2 = 2;
+        Item[] itemsSubject1 = new Item[numberItemsSubject1];
+        Item[] itemsSubject2 = new Item[numberItemsSubject2];
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        for (int i = 0; i < numberItemsSubject1; i++) {
+            itemsSubject1[i] = ItemBuilder.createItem(context, collection)
+                .withTitle("item subject 1 number" + i)
+                .withSubject(subject1)
+                .build();
+        }
+
+        for (int i = 0; i < numberItemsSubject2; i++) {
+            itemsSubject2[i] = ItemBuilder.createItem(context, collection)
+                .withTitle("item subject 2 number " + i)
+                .withSubject(subject2)
+                .build();
+        }
+
+        Collection collection2 = CollectionBuilder.createCollection(context, community).build();
+        ItemBuilder.createItem(context, collection2)
+            .withTitle("item collection2")
+            .withSubject(subject1)
+            .build();
+        context.restoreAuthSystemState();
+
+
+        DiscoverQuery discoverQuery = new DiscoverQuery();
+        discoverQuery.addFilterQueries("subject:" + subject1);
+
+        Iterator<Item> itemIterator =
+            searchService.iteratorSearch(context, new IndexableCollection(collection), discoverQuery);
+        int counter = 0;
+        List<Item> foundItems = new ArrayList<>();
+        while (itemIterator.hasNext()) {
+            foundItems.add(itemIterator.next());
+            counter++;
+        }
+        for (Item item : itemsSubject1) {
+            assertTrue(foundItems.contains(item));
+        }
+        assertEquals(numberItemsSubject1, counter);
+
+        discoverQuery = new DiscoverQuery();
+        discoverQuery.addFilterQueries("subject:" + subject2);
+
+        itemIterator = searchService.iteratorSearch(context, null, discoverQuery);
+        counter = 0;
+        foundItems = new ArrayList<>();
+        while (itemIterator.hasNext()) {
+            foundItems.add(itemIterator.next());
+            counter++;
+        }
+        assertEquals(numberItemsSubject2, counter);
+        for (Item item : itemsSubject2) {
+            assertTrue(foundItems.contains(item));
+        }
+    }
+
     private void assertSearchQuery(String resourceType, int size) throws SearchServiceException {
         assertSearchQuery(resourceType, size, size, 0, -1);
     }
 
     private void assertSearchQuery(String resourceType, int size, int totalFound, int start, int limit)
-            throws SearchServiceException {
+        throws SearchServiceException {
         DiscoverQuery discoverQuery = new DiscoverQuery();
         discoverQuery.setQuery("*:*");
         discoverQuery.setStart(start);
@@ -739,6 +827,13 @@ public class DiscoveryIT extends AbstractIntegrationTestWithDatabase {
         context.setCurrentUser(previousUser);
     }
 
+    public void performSolrDatabaseResyncScript() throws Exception {
+        String[] args = new String[] {"solr-database-resync"};
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+        ScriptLauncher
+                .handleScript(args, ScriptLauncher.getConfig(kernelImpl), testDSpaceRunnableHandler, kernelImpl);
+    }
+
     private void abort(XmlWorkflowItem workflowItem)
             throws SQLException, AuthorizeException, IOException, SearchServiceException {
         final EPerson previousUser = context.getCurrentUser();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/utils/DiscoverQueryBuilderTest.java b/dspace-api/src/test/java/org/dspace/discovery/utils/DiscoverQueryBuilderTest.java
similarity index 79%
rename from dspace-server-webapp/src/test/java/org/dspace/app/rest/utils/DiscoverQueryBuilderTest.java
rename to dspace-api/src/test/java/org/dspace/discovery/utils/DiscoverQueryBuilderTest.java
index 9a8f07e76a..07652e8c0c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/utils/DiscoverQueryBuilderTest.java
+++ b/dspace-api/src/test/java/org/dspace/discovery/utils/DiscoverQueryBuilderTest.java
@@ -5,7 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.rest.utils;
+package org.dspace.discovery.utils;
 
 import static java.util.Collections.emptyList;
 import static org.dspace.discovery.configuration.DiscoveryConfigurationParameters.SORT.COUNT;
@@ -16,10 +16,10 @@ import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.emptyOrNullString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -35,9 +35,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Function;
 
-import org.dspace.app.rest.exception.DSpaceBadRequestException;
-import org.dspace.app.rest.exception.InvalidSearchRequestException;
-import org.dspace.app.rest.parameter.SearchFilter;
 import org.dspace.core.Context;
 import org.dspace.discovery.DiscoverFacetField;
 import org.dspace.discovery.DiscoverFilterQuery;
@@ -45,6 +42,7 @@ import org.dspace.discovery.DiscoverHitHighlightingField;
 import org.dspace.discovery.DiscoverQuery;
 import org.dspace.discovery.FacetYearRange;
 import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.SearchServiceException;
 import org.dspace.discovery.SolrServiceImpl;
 import org.dspace.discovery.configuration.DiscoveryConfiguration;
 import org.dspace.discovery.configuration.DiscoveryConfigurationParameters;
@@ -56,6 +54,7 @@ import org.dspace.discovery.configuration.DiscoverySortFieldConfiguration;
 import org.dspace.discovery.configuration.HierarchicalSidebarFacetConfiguration;
 import org.dspace.discovery.indexobject.IndexableItem;
 import org.dspace.discovery.indexobject.factory.IndexFactory;
+import org.dspace.discovery.utils.parameter.QueryBuilderSearchFilter;
 import org.dspace.services.ConfigurationService;
 import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
@@ -65,8 +64,7 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
+
 
 /**
  * Unit tests for {@link DiscoverQueryBuilder}
@@ -94,8 +92,14 @@ public class DiscoverQueryBuilderTest {
 
     private DiscoveryConfiguration discoveryConfiguration;
     private String query;
-    private SearchFilter searchFilter;
-    private PageRequest page;
+
+    private int pageSize = 10;
+    private long offset = 10;
+    private String sortProperty = "dc.title";
+    private String sortDirection = "ASC";
+
+    private QueryBuilderSearchFilter searchFilter;
+
 
     @Before
     public void setUp() throws Exception {
@@ -106,33 +110,35 @@ public class DiscoverQueryBuilderTest {
         when(configurationService.getIntProperty(eq("rest.search.max.results"), anyInt())).thenReturn(100);
 
         when(searchService.toSortFieldIndex(any(String.class), any(String.class)))
-            .then(invocation -> invocation.getArguments()[0] + "_sort");
+                .then(invocation -> invocation.getArguments()[0] + "_sort");
 
         when(searchService
-            .getFacetYearRange(eq(context), nullable(IndexableObject.class), any(DiscoverySearchFilterFacet.class),
-                any(), any(DiscoverQuery.class)))
-            .then(invocation -> new FacetYearRange((DiscoverySearchFilterFacet) invocation.getArguments()[2]));
+                     .getFacetYearRange(eq(context), nullable(IndexableObject.class),
+                                        any(DiscoverySearchFilterFacet.class),
+                                        any(), any(DiscoverQuery.class)))
+                .then(invocation -> new FacetYearRange((DiscoverySearchFilterFacet) invocation.getArguments()[2]));
 
         when(searchService.toFilterQuery(any(Context.class), any(String.class), any(String.class), any(String.class),
-            any(DiscoveryConfiguration.class)))
-            .then(invocation -> new DiscoverFilterQuery((String) invocation.getArguments()[1],
-                invocation.getArguments()[1] + ":\"" + invocation.getArguments()[3] + "\"",
-                (String) invocation.getArguments()[3]));
+                                         any(DiscoveryConfiguration.class)))
+                .then(invocation -> new DiscoverFilterQuery((String) invocation.getArguments()[1],
+                                                            invocation.getArguments()[1] + ":\"" + invocation
+                                                                    .getArguments()[3] + "\"",
+                                                            (String) invocation.getArguments()[3]));
 
         discoveryConfiguration = new DiscoveryConfiguration();
         discoveryConfiguration.setDefaultFilterQueries(Arrays.asList("archived:true"));
 
 
         DiscoveryHitHighlightingConfiguration discoveryHitHighlightingConfiguration =
-            new DiscoveryHitHighlightingConfiguration();
+                new DiscoveryHitHighlightingConfiguration();
         List<DiscoveryHitHighlightFieldConfiguration> discoveryHitHighlightFieldConfigurations = new LinkedList<>();
 
         DiscoveryHitHighlightFieldConfiguration discoveryHitHighlightFieldConfiguration =
-            new DiscoveryHitHighlightFieldConfiguration();
+                new DiscoveryHitHighlightFieldConfiguration();
         discoveryHitHighlightFieldConfiguration.setField("dc.title");
 
         DiscoveryHitHighlightFieldConfiguration discoveryHitHighlightFieldConfiguration1 =
-            new DiscoveryHitHighlightFieldConfiguration();
+                new DiscoveryHitHighlightFieldConfiguration();
         discoveryHitHighlightFieldConfiguration1.setField("fulltext");
 
         discoveryHitHighlightFieldConfigurations.add(discoveryHitHighlightFieldConfiguration1);
@@ -177,9 +183,8 @@ public class DiscoverQueryBuilderTest {
         discoveryConfiguration.setSidebarFacets(Arrays.asList(subjectFacet, dateFacet, hierarchyFacet));
         discoveryConfiguration.setSearchFilters(Arrays.asList(subjectFacet, dateFacet, hierarchyFacet));
 
+        searchFilter = new QueryBuilderSearchFilter("subject", "equals", "Java");
         query = "my test case";
-        searchFilter = new SearchFilter("subject", "equals", "Java");
-        page = PageRequest.of(1, 10, Sort.Direction.ASC, "dc.title");
 
         queryBuilder.afterPropertiesSet();
     }
@@ -188,7 +193,8 @@ public class DiscoverQueryBuilderTest {
     public void testBuildQuery() throws Exception {
 
         DiscoverQuery discoverQuery = queryBuilder
-            .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "item", page);
+                .buildQuery(context, scope, discoveryConfiguration, query, Collections.singletonList(searchFilter),
+                            "item", pageSize, offset, sortProperty, sortDirection);
 
         assertThat(discoverQuery.getFilterQueries(), containsInAnyOrder("archived:true", "subject:\"Java\""));
         assertThat(discoverQuery.getQuery(), is(query));
@@ -214,10 +220,11 @@ public class DiscoverQueryBuilderTest {
     @Test
     public void testBuildQueryDefaults() throws Exception {
         DiscoverQuery discoverQuery =
-            queryBuilder.buildQuery(context, null, discoveryConfiguration, null, null, emptyList(), null);
+                queryBuilder.buildQuery(context, null, discoveryConfiguration, null, null, emptyList(), null, null,
+                                        null, null);
 
         assertThat(discoverQuery.getFilterQueries(), containsInAnyOrder("archived:true"));
-        assertThat(discoverQuery.getQuery(), is(emptyOrNullString()));
+        assertThat(discoverQuery.getQuery(), isEmptyOrNullString());
         assertThat(discoverQuery.getDSpaceObjectFilters(), is(empty()));
         //Note this should actually be "dc.date.accessioned_dt"  but remember that our searchService is just a stupid
         // mock
@@ -241,13 +248,12 @@ public class DiscoverQueryBuilderTest {
 
     @Test
     public void testSortByScore() throws Exception {
-        page = PageRequest.of(2, 10, Sort.Direction.ASC, "SCORE");
-
         DiscoverQuery discoverQuery =
-            queryBuilder.buildQuery(context, null, discoveryConfiguration, null, null, emptyList(), page);
+                queryBuilder.buildQuery(context, null, discoveryConfiguration, null, null, emptyList(), 10, 20L,
+                                        "SCORE", "ASC");
 
         assertThat(discoverQuery.getFilterQueries(), containsInAnyOrder("archived:true"));
-        assertThat(discoverQuery.getQuery(), is(emptyOrNullString()));
+        assertThat(discoverQuery.getQuery(), isEmptyOrNullString());
         assertThat(discoverQuery.getDSpaceObjectFilters(), is(empty()));
         //Note this should actually be "dc.date.accessioned_dt"  but remember that our searchService is just a stupid
         // mock
@@ -269,48 +275,50 @@ public class DiscoverQueryBuilderTest {
         ));
     }
 
-    @Test(expected = DSpaceBadRequestException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testInvalidDSOType() throws Exception {
         queryBuilder
-            .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "TEST", page);
+                .buildQuery(context, scope, discoveryConfiguration, query, Collections.singletonList(searchFilter),
+                            "TEST", pageSize, offset, sortProperty, sortDirection);
     }
 
-    @Test(expected = InvalidSearchRequestException.class)
+    @Test(expected = SearchServiceException.class)
     public void testInvalidSortField() throws Exception {
-        page = PageRequest.of(2, 10, Sort.Direction.ASC, "test");
         queryBuilder
-            .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "ITEM", page);
+                .buildQuery(context, scope, discoveryConfiguration, query, Collections.singletonList(searchFilter),
+                            "ITEM", pageSize, 20L, "test", sortDirection);
     }
 
-    @Test(expected = DSpaceBadRequestException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testInvalidSearchFilter1() throws Exception {
-        searchFilter = new SearchFilter("test", "equals", "Smith, Donald");
+        searchFilter = new QueryBuilderSearchFilter("test", "equals", "Smith, Donald");
 
         queryBuilder
-            .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "ITEM", page);
+                .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "ITEM",
+                            pageSize, offset, sortProperty, sortDirection);
     }
 
-    @Test(expected = DSpaceBadRequestException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testInvalidSearchFilter2() throws Exception {
         when(searchService.toFilterQuery(any(Context.class), any(String.class), any(String.class), any(String.class),
-            any(DiscoveryConfiguration.class)))
-            .thenThrow(SQLException.class);
+                                         any(DiscoveryConfiguration.class)))
+                .thenThrow(SQLException.class);
 
         queryBuilder
-            .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "ITEM", page);
+                .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "ITEM",
+                            pageSize, offset, sortProperty, sortDirection);
     }
 
     @Test
     public void testBuildFacetQuery() throws Exception {
-        DiscoverQuery discoverQuery = queryBuilder.buildFacetQuery(context, scope, discoveryConfiguration,
-                                                            "prefix", query,
-                                                                   Arrays.asList(searchFilter), "item", page,
-                                                                   "subject");
+        DiscoverQuery discoverQuery = queryBuilder.buildFacetQuery(context, scope, discoveryConfiguration, "prefix",
+                                                                   query, Collections.singletonList(searchFilter),
+                                                                   "item", pageSize, offset, "subject");
 
         assertThat(discoverQuery.getFilterQueries(), containsInAnyOrder("archived:true", "subject:\"Java\""));
         assertThat(discoverQuery.getQuery(), is(query));
         assertThat(discoverQuery.getDSpaceObjectFilters(), contains(IndexableItem.TYPE));
-        assertThat(discoverQuery.getSortField(), is(emptyOrNullString()));
+        assertThat(discoverQuery.getSortField(), isEmptyOrNullString());
         assertThat(discoverQuery.getMaxResults(), is(0));
         assertThat(discoverQuery.getStart(), is(0));
         assertThat(discoverQuery.getFacetMinCount(), is(1));
@@ -321,10 +329,10 @@ public class DiscoverQueryBuilderTest {
         ));
     }
 
-    @Test(expected = DSpaceBadRequestException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testInvalidSearchFacet() throws Exception {
         queryBuilder.buildFacetQuery(context, scope, discoveryConfiguration, null, query,
-                Arrays.asList(searchFilter), "item", page, "test");
+                                     Collections.singletonList(searchFilter), "item", pageSize, offset, "test");
     }
 
     public Matcher<DiscoverFacetField> discoverFacetFieldMatcher(DiscoverFacetField expected) {
diff --git a/dspace-api/src/test/java/org/dspace/external/provider/impl/MockPubmedImportMetadataSourceServiceImpl.java b/dspace-api/src/test/java/org/dspace/external/provider/impl/MockPubmedImportMetadataSourceServiceImpl.java
deleted file mode 100644
index 1a88c1e55b..0000000000
--- a/dspace-api/src/test/java/org/dspace/external/provider/impl/MockPubmedImportMetadataSourceServiceImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.external.provider.impl;
-
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.dspace.importer.external.pubmed.service.PubmedImportMetadataSourceServiceImpl;
-import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.springframework.util.FileCopyUtils;
-
-/**
- * we override the init method to mock the rest call to pubmed the following
- * mock definitions will allow to answer to efetch or esearch requests using the
- * test resource files (pubmed-esearch.fcgi.xml or pubmed-efetch.fcgi.xml)
- * 
- * @author Andrea Bollini (andrea.bollini at 4science.it)
- *
- */
-public class MockPubmedImportMetadataSourceServiceImpl extends PubmedImportMetadataSourceServiceImpl {
-
-    @Override
-    public void init() throws Exception {
-        pubmedWebTarget = Mockito.mock(WebTarget.class);
-        ArgumentCaptor<String> valueCapture = ArgumentCaptor.forClass(String.class);
-        when(pubmedWebTarget.queryParam(ArgumentMatchers.any(), ArgumentMatchers.any()))
-                .thenAnswer(new Answer<WebTarget>() {
-                    @Override
-                    public WebTarget answer(InvocationOnMock invocation) throws Throwable {
-                        return pubmedWebTarget;
-                    }
-                });
-        when(pubmedWebTarget.path(valueCapture.capture())).thenAnswer(new Answer<WebTarget>() {
-            @Override
-            public WebTarget answer(InvocationOnMock invocation) throws Throwable {
-                return pubmedWebTarget;
-            }
-        });
-        when(pubmedWebTarget.request(ArgumentMatchers.any(MediaType.class)))
-                .thenAnswer(new Answer<Invocation.Builder>() {
-                    @Override
-                    public Invocation.Builder answer(InvocationOnMock invocation) throws Throwable {
-                        Invocation.Builder builder = Mockito.mock(Invocation.Builder.class);
-                        when(builder.get()).thenAnswer(new Answer<Response>() {
-                            @Override
-                            public Response answer(InvocationOnMock invocation) throws Throwable {
-                                Response response = Mockito.mock(Response.class);
-                                when(response.readEntity(ArgumentMatchers.eq(String.class))).then(new Answer<String>() {
-                                    @Override
-                                    public String answer(InvocationOnMock invocation) throws Throwable {
-                                        String resourceName = "pubmed-" + valueCapture.getValue() + ".xml";
-                                        InputStream resource = getClass().getResourceAsStream(resourceName);
-                                        try (Reader reader = new InputStreamReader(resource, StandardCharsets.UTF_8)) {
-                                            return FileCopyUtils.copyToString(reader);
-                                        } catch (IOException e) {
-                                            throw new UncheckedIOException(e);
-                                        }
-                                    }
-                                });
-                                return response;
-                            }
-                        });
-                        return builder;
-                    };
-                });
-    }
-
-}
diff --git a/dspace-api/src/test/java/org/dspace/external/provider/impl/OrcidPublicationDataProviderIT.java b/dspace-api/src/test/java/org/dspace/external/provider/impl/OrcidPublicationDataProviderIT.java
new file mode 100644
index 0000000000..dae14115b8
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/external/provider/impl/OrcidPublicationDataProviderIT.java
@@ -0,0 +1,434 @@
+/**
+ * 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/
+ */
+package org.dspace.external.provider.impl;
+
+import static java.util.Optional.of;
+import static org.dspace.app.matcher.LambdaMatcher.has;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+
+import org.apache.commons.codec.binary.StringUtils;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.OrcidTokenBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataFieldName;
+import org.dspace.content.dto.MetadataValueDTO;
+import org.dspace.external.model.ExternalDataObject;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.utils.DSpace;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.orcid.jaxb.model.v3.release.record.Work;
+import org.orcid.jaxb.model.v3.release.record.WorkBulk;
+import org.orcid.jaxb.model.v3.release.record.summary.Works;
+
+/**
+ * Integration tests for {@link OrcidPublicationDataProvider}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidPublicationDataProviderIT extends AbstractIntegrationTestWithDatabase {
+
+    private static final String BASE_XML_DIR_PATH = "org/dspace/app/orcid-works/";
+
+    private static final String ACCESS_TOKEN = "32c83ccb-c6d5-4981-b6ea-6a34a36de8ab";
+
+    private static final String ORCID = "0000-1111-2222-3333";
+
+    private OrcidPublicationDataProvider dataProvider;
+
+    private OrcidConfiguration orcidConfiguration;
+
+    private OrcidClient orcidClient;
+
+    private OrcidClient orcidClientMock;
+
+    private String originalClientId;
+
+    private Collection persons;
+
+    @Before
+    public void setup() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        persons = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Person")
+            .withName("Profiles")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        dataProvider = new DSpace().getServiceManager()
+            .getServiceByName("orcidPublicationDataProvider", OrcidPublicationDataProvider.class);
+
+        orcidConfiguration = new DSpace().getServiceManager()
+            .getServiceByName("org.dspace.orcid.client.OrcidConfiguration", OrcidConfiguration.class);
+
+        orcidClientMock = mock(OrcidClient.class);
+        orcidClient = dataProvider.getOrcidClient();
+
+        dataProvider.setReadPublicAccessToken(null);
+        dataProvider.setOrcidClient(orcidClientMock);
+
+        originalClientId = orcidConfiguration.getClientId();
+        orcidConfiguration.setClientId("DSPACE-CLIENT-ID");
+        orcidConfiguration.setClientSecret("DSPACE-CLIENT-SECRET");
+
+        when(orcidClientMock.getReadPublicAccessToken()).thenReturn(buildTokenResponse(ACCESS_TOKEN));
+
+        when(orcidClientMock.getWorks(any(), eq(ORCID))).thenReturn(unmarshall("works.xml", Works.class));
+        when(orcidClientMock.getWorks(eq(ORCID))).thenReturn(unmarshall("works.xml", Works.class));
+
+        when(orcidClientMock.getObject(any(), eq(ORCID), any(), eq(Work.class)))
+            .then((invocation) -> of(unmarshall("work-" + invocation.getArgument(2) + ".xml", Work.class)));
+        when(orcidClientMock.getObject(eq(ORCID), any(), eq(Work.class)))
+            .then((invocation) -> of(unmarshall("work-" + invocation.getArgument(1) + ".xml", Work.class)));
+
+        when(orcidClientMock.getWorkBulk(any(), eq(ORCID), any()))
+            .then((invocation) -> unmarshallWorkBulk(invocation.getArgument(2)));
+        when(orcidClientMock.getWorkBulk(eq(ORCID), any()))
+            .then((invocation) -> unmarshallWorkBulk(invocation.getArgument(1)));
+
+    }
+
+    @After
+    public void after() {
+        dataProvider.setOrcidClient(orcidClient);
+        orcidConfiguration.setClientId(originalClientId);
+    }
+
+    @Test
+    public void testSearchWithoutPagination() throws Exception {
+
+        List<ExternalDataObject> externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, -1);
+        assertThat(externalObjects, hasSize(3));
+
+        ExternalDataObject firstObject = externalObjects.get(0);
+        assertThat(firstObject.getDisplayValue(), is("The elements of style and the survey of ophthalmology."));
+        assertThat(firstObject.getValue(), is("The elements of style and the survey of ophthalmology."));
+        assertThat(firstObject.getId(), is(ORCID + "::277904"));
+        assertThat(firstObject.getSource(), is("orcidWorks"));
+
+        List<MetadataValueDTO> metadata = firstObject.getMetadata();
+        assertThat(metadata, hasSize(7));
+        assertThat(metadata, has(metadata("dc.date.issued", "2011")));
+        assertThat(metadata, has(metadata("dc.source", "Test Journal")));
+        assertThat(metadata, has(metadata("dc.language.iso", "it")));
+        assertThat(metadata, has(metadata("dc.type", "Other")));
+        assertThat(metadata, has(metadata("dc.identifier.doi", "10.11234.12")));
+        assertThat(metadata, has(metadata("dc.contributor.author", "Walter White")));
+        assertThat(metadata, has(metadata("dc.title", "The elements of style and the survey of ophthalmology.")));
+
+        ExternalDataObject secondObject = externalObjects.get(1);
+        assertThat(secondObject.getDisplayValue(), is("Another cautionary tale."));
+        assertThat(secondObject.getValue(), is("Another cautionary tale."));
+        assertThat(secondObject.getId(), is(ORCID + "::277902"));
+        assertThat(secondObject.getSource(), is("orcidWorks"));
+
+        metadata = secondObject.getMetadata();
+        assertThat(metadata, hasSize(8));
+        assertThat(metadata, has(metadata("dc.date.issued", "2011-05-01")));
+        assertThat(metadata, has(metadata("dc.description.abstract", "Short description")));
+        assertThat(metadata, has(metadata("dc.relation.ispartof", "Journal title")));
+        assertThat(metadata, has(metadata("dc.contributor.author", "Walter White")));
+        assertThat(metadata, has(metadata("dc.contributor.author", "John White")));
+        assertThat(metadata, has(metadata("dc.contributor.editor", "Jesse Pinkman")));
+        assertThat(metadata, has(metadata("dc.title", "Another cautionary tale.")));
+        assertThat(metadata, has(metadata("dc.type", "Article")));
+
+        ExternalDataObject thirdObject = externalObjects.get(2);
+        assertThat(thirdObject.getDisplayValue(), is("Branch artery occlusion in a young woman."));
+        assertThat(thirdObject.getValue(), is("Branch artery occlusion in a young woman."));
+        assertThat(thirdObject.getId(), is(ORCID + "::277871"));
+        assertThat(thirdObject.getSource(), is("orcidWorks"));
+
+        metadata = thirdObject.getMetadata();
+        assertThat(metadata, hasSize(3));
+        assertThat(metadata, has(metadata("dc.date.issued", "1985-07-01")));
+        assertThat(metadata, has(metadata("dc.title", "Branch artery occlusion in a young woman.")));
+        assertThat(metadata, has(metadata("dc.type", "Article")));
+
+        verify(orcidClientMock).getReadPublicAccessToken();
+        verify(orcidClientMock).getWorks(ACCESS_TOKEN, ORCID);
+        verify(orcidClientMock).getWorkBulk(ACCESS_TOKEN, ORCID, List.of("277904", "277902", "277871"));
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testSearchWithInvalidOrcidId() {
+
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+            () -> dataProvider.searchExternalDataObjects("0000-1111-2222", 0, -1));
+
+        assertThat(exception.getMessage(), is("The given ORCID ID is not valid: 0000-1111-2222"));
+
+    }
+
+    @Test
+    public void testSearchWithStoredAccessToken() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        String accessToken = "95cb5ed9-c208-4bbc-bc99-aa0bd76e4452";
+
+        Item profile = ItemBuilder.createItem(context, persons)
+            .withTitle("Profile")
+            .withOrcidIdentifier(ORCID)
+            .withDspaceObjectOwner(eperson.getEmail(), eperson.getID().toString())
+            .build();
+
+        OrcidTokenBuilder.create(context, eperson, accessToken)
+            .withProfileItem(profile)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        List<ExternalDataObject> externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, -1);
+        assertThat(externalObjects, hasSize(3));
+
+        verify(orcidClientMock).getWorks(accessToken, ORCID);
+        verify(orcidClientMock).getWorkBulk(accessToken, ORCID, List.of("277904", "277902", "277871"));
+        verifyNoMoreInteractions(orcidClientMock);
+    }
+
+    @Test
+    public void testSearchWithProfileWithoutAccessToken() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        ItemBuilder.createItem(context, persons)
+            .withTitle("Profile")
+            .withOrcidIdentifier(ORCID)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        List<ExternalDataObject> externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, -1);
+        assertThat(externalObjects, hasSize(3));
+        verify(orcidClientMock).getReadPublicAccessToken();
+        verify(orcidClientMock).getWorks(ACCESS_TOKEN, ORCID);
+        verify(orcidClientMock).getWorkBulk(ACCESS_TOKEN, ORCID, List.of("277904", "277902", "277871"));
+        verifyNoMoreInteractions(orcidClientMock);
+    }
+
+    @Test
+    public void testSearchWithoutResults() throws Exception {
+
+        String unknownOrcid = "1111-2222-3333-4444";
+        when(orcidClientMock.getWorks(ACCESS_TOKEN, unknownOrcid)).thenReturn(new Works());
+
+        List<ExternalDataObject> externalObjects = dataProvider.searchExternalDataObjects(unknownOrcid, 0, -1);
+        assertThat(externalObjects, empty());
+
+        verify(orcidClientMock).getReadPublicAccessToken();
+        verify(orcidClientMock).getWorks(ACCESS_TOKEN, unknownOrcid);
+        verifyNoMoreInteractions(orcidClientMock);
+    }
+
+    @Test
+    public void testClientCredentialsTokenCache() throws Exception {
+
+        List<ExternalDataObject> externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, -1);
+        assertThat(externalObjects, hasSize(3));
+
+        verify(orcidClientMock).getReadPublicAccessToken();
+
+        externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, -1);
+        assertThat(externalObjects, hasSize(3));
+
+        verify(orcidClientMock, times(1)).getReadPublicAccessToken();
+
+        dataProvider.setReadPublicAccessToken(null);
+
+        externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, -1);
+        assertThat(externalObjects, hasSize(3));
+
+        verify(orcidClientMock, times(2)).getReadPublicAccessToken();
+
+    }
+
+    @Test
+    public void testSearchPagination() throws Exception {
+
+        List<ExternalDataObject> externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, -1);
+        assertThat(externalObjects, hasSize(3));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277904"))));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277902"))));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277871"))));
+
+        verify(orcidClientMock).getReadPublicAccessToken();
+        verify(orcidClientMock).getWorks(ACCESS_TOKEN, ORCID);
+        verify(orcidClientMock).getWorkBulk(ACCESS_TOKEN, ORCID, List.of("277904", "277902", "277871"));
+
+        externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, 5);
+        assertThat(externalObjects, hasSize(3));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277904"))));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277902"))));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277871"))));
+
+        verify(orcidClientMock, times(2)).getWorks(ACCESS_TOKEN, ORCID);
+        verify(orcidClientMock, times(2)).getWorkBulk(ACCESS_TOKEN, ORCID, List.of("277904", "277902", "277871"));
+
+        externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, 2);
+        assertThat(externalObjects, hasSize(2));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277904"))));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277902"))));
+
+        verify(orcidClientMock, times(3)).getWorks(ACCESS_TOKEN, ORCID);
+        verify(orcidClientMock).getWorkBulk(ACCESS_TOKEN, ORCID, List.of("277904", "277902"));
+
+        externalObjects = dataProvider.searchExternalDataObjects(ORCID, 1, 1);
+        assertThat(externalObjects, hasSize(1));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277902"))));
+
+        verify(orcidClientMock, times(4)).getWorks(ACCESS_TOKEN, ORCID);
+        verify(orcidClientMock).getObject(ACCESS_TOKEN, ORCID, "277902", Work.class);
+
+        externalObjects = dataProvider.searchExternalDataObjects(ORCID, 2, 1);
+        assertThat(externalObjects, hasSize(1));
+        assertThat(externalObjects, has((externalObject -> externalObject.getId().equals(ORCID + "::277871"))));
+
+        verify(orcidClientMock, times(5)).getWorks(ACCESS_TOKEN, ORCID);
+        verify(orcidClientMock).getObject(ACCESS_TOKEN, ORCID, "277871", Work.class);
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testGetExternalDataObject() {
+        Optional<ExternalDataObject> optional = dataProvider.getExternalDataObject(ORCID + "::277902");
+        assertThat(optional.isPresent(), is(true));
+
+        ExternalDataObject externalDataObject = optional.get();
+        assertThat(externalDataObject.getDisplayValue(), is("Another cautionary tale."));
+        assertThat(externalDataObject.getValue(), is("Another cautionary tale."));
+        assertThat(externalDataObject.getId(), is(ORCID + "::277902"));
+        assertThat(externalDataObject.getSource(), is("orcidWorks"));
+
+        List<MetadataValueDTO> metadata = externalDataObject.getMetadata();
+        assertThat(metadata, hasSize(8));
+        assertThat(metadata, has(metadata("dc.date.issued", "2011-05-01")));
+        assertThat(metadata, has(metadata("dc.description.abstract", "Short description")));
+        assertThat(metadata, has(metadata("dc.relation.ispartof", "Journal title")));
+        assertThat(metadata, has(metadata("dc.contributor.author", "Walter White")));
+        assertThat(metadata, has(metadata("dc.contributor.author", "John White")));
+        assertThat(metadata, has(metadata("dc.contributor.editor", "Jesse Pinkman")));
+        assertThat(metadata, has(metadata("dc.title", "Another cautionary tale.")));
+        assertThat(metadata, has(metadata("dc.type", "Article")));
+
+        verify(orcidClientMock).getReadPublicAccessToken();
+        verify(orcidClientMock).getObject(ACCESS_TOKEN, ORCID, "277902", Work.class);
+        verifyNoMoreInteractions(orcidClientMock);
+    }
+
+    @Test
+    public void testGetExternalDataObjectWithInvalidOrcidId() {
+
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+            () -> dataProvider.getExternalDataObject("invalid::277902"));
+
+        assertThat(exception.getMessage(), is("The given ORCID ID is not valid: invalid" ));
+    }
+
+    @Test
+    public void testGetExternalDataObjectWithInvalidId() {
+
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+            () -> dataProvider.getExternalDataObject("id"));
+
+        assertThat(exception.getMessage(), is("Invalid identifier 'id', expected <orcid-id>::<put-code>"));
+    }
+
+    @Test
+    public void testSearchWithoutApiKeysConfigured() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        orcidConfiguration.setClientSecret(null);
+
+        ItemBuilder.createItem(context, persons)
+            .withTitle("Profile")
+            .withOrcidIdentifier(ORCID)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        List<ExternalDataObject> externalObjects = dataProvider.searchExternalDataObjects(ORCID, 0, -1);
+        assertThat(externalObjects, hasSize(3));
+
+        verify(orcidClientMock).getWorks(ORCID);
+        verify(orcidClientMock).getWorkBulk(ORCID, List.of("277904", "277902", "277871"));
+        verifyNoMoreInteractions(orcidClientMock);
+    }
+
+    private Predicate<MetadataValueDTO> metadata(String metadataField, String value) {
+        MetadataFieldName metadataFieldName = new MetadataFieldName(metadataField);
+        return metadata(metadataFieldName.schema, metadataFieldName.element, metadataFieldName.qualifier, value);
+    }
+
+    private Predicate<MetadataValueDTO> metadata(String schema, String element, String qualifier, String value) {
+        return dto -> StringUtils.equals(schema, dto.getSchema())
+            && StringUtils.equals(element, dto.getElement())
+            && StringUtils.equals(qualifier, dto.getQualifier())
+            && StringUtils.equals(value, dto.getValue());
+    }
+
+    private OrcidTokenResponseDTO buildTokenResponse(String accessToken) {
+        OrcidTokenResponseDTO response = new OrcidTokenResponseDTO();
+        response.setAccessToken(accessToken);
+        return response;
+    }
+
+    private WorkBulk unmarshallWorkBulk(List<String> putCodes) throws Exception {
+        return unmarshall("workBulk-" + String.join("-", putCodes) + ".xml", WorkBulk.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T unmarshall(String fileName, Class<T> clazz) throws Exception {
+        JAXBContext jaxbContext = JAXBContext.newInstance(clazz);
+        Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+        URL resource = getClass().getClassLoader().getResource(BASE_XML_DIR_PATH + fileName);
+        if (resource == null) {
+            throw new IllegalStateException("No resource found named " + BASE_XML_DIR_PATH + fileName);
+        }
+        return (T) unmarshaller.unmarshal(new File(resource.getFile()));
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/google/client/GoogleAnalytics4ClientRequestBuilderTest.java b/dspace-api/src/test/java/org/dspace/google/client/GoogleAnalytics4ClientRequestBuilderTest.java
new file mode 100644
index 0000000000..1a5d0b4eb3
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/google/client/GoogleAnalytics4ClientRequestBuilderTest.java
@@ -0,0 +1,220 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+import static java.util.List.of;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+import org.dspace.google.GoogleAnalyticsEvent;
+import org.dspace.services.ConfigurationService;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link GoogleAnalytics4ClientRequestBuilder}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GoogleAnalytics4ClientRequestBuilderTest {
+
+    private GoogleAnalytics4ClientRequestBuilder requestBuilder;
+
+    private ConfigurationService configurationService = mock(ConfigurationService.class);
+
+    @Before
+    public void setup() {
+        requestBuilder = new GoogleAnalytics4ClientRequestBuilder("https://google-analytics/test");
+        requestBuilder.setConfigurationService(configurationService);
+    }
+
+    @Test
+    public void testGetEndpointUrl() {
+
+        when(configurationService.getProperty("google.analytics.api-secret")).thenReturn("abc123");
+
+        String endpointUrl = requestBuilder.getEndpointUrl("G-12345");
+        assertThat(endpointUrl, is("https://google-analytics/test?api_secret=abc123&measurement_id=G-12345"));
+
+    }
+
+    @Test
+    public void testGetEndpointUrlWithNotSupportedKey() {
+
+        assertThrows("Only keys with G- prefix are supported",
+            IllegalArgumentException.class, () -> requestBuilder.getEndpointUrl("UA-12345"));
+
+    }
+
+    @Test
+    public void testGetEndpointUrlWithoutApiSecretConfigured() {
+
+        assertThrows("The API secret must be configured to sent GA4 events",
+            GoogleAnalyticsClientException.class, () -> requestBuilder.getEndpointUrl("G-12345"));
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithoutEvents() {
+
+        List<String> requestsBody = requestBuilder.composeRequestsBody("G-12345", List.of());
+        assertThat(requestsBody, empty());
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithSingleEvent() {
+
+        GoogleAnalyticsEvent event = buildEvent("123", "192.168.1.25", "Chrome", "REF",
+            "/api/documents/123", "Test publication");
+
+        List<String> requestsBody = requestBuilder.composeRequestsBody("G-12345", List.of(event));
+        assertThat(requestsBody, hasSize(1));
+
+        JSONObject requestBody = new JSONObject(requestsBody.get(0));
+        assertThat(requestBody.get("client_id"), is("123"));
+
+        JSONArray eventsArray = requestBody.getJSONArray("events");
+        assertThat(eventsArray.length(), is(1));
+
+        assertEventJsonHasAttributes(eventsArray.getJSONObject(0), "item", "download", "bitstream", "192.168.1.25",
+            "Chrome", "REF", "/api/documents/123", "Test publication");
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithManyEventsWithSameClientId() {
+
+        GoogleAnalyticsEvent event1 = buildEvent("123", "192.168.1.25", "Chrome", "REF",
+            "/api/documents/123", "Test publication");
+
+        GoogleAnalyticsEvent event2 = buildEvent("123", "192.168.1.25", "Mozilla Firefox", "REF-2",
+            "/api/documents/12345", "Test publication 2");
+
+        List<String> requestsBody = requestBuilder.composeRequestsBody("G-12345", List.of(event1, event2));
+        assertThat(requestsBody, hasSize(1));
+
+        JSONObject requestBody = new JSONObject(requestsBody.get(0));
+        assertThat(requestBody.get("client_id"), is("123"));
+
+        JSONArray eventsArray = requestBody.getJSONArray("events");
+        assertThat(eventsArray.length(), is(2));
+
+        JSONObject eventJson1 = findEventJsonByDocumentTitle(eventsArray, "Test publication");
+        JSONObject eventJson2 = findEventJsonByDocumentTitle(eventsArray, "Test publication 2");
+
+        assertThat(eventJson1, notNullValue());
+        assertThat(eventJson2, notNullValue());
+
+        assertEventJsonHasAttributes(eventJson1, "item", "download", "bitstream", "192.168.1.25",
+            "Chrome", "REF", "/api/documents/123", "Test publication");
+
+        assertEventJsonHasAttributes(eventJson2, "item", "download", "bitstream", "192.168.1.25",
+            "Mozilla Firefox", "REF-2", "/api/documents/12345", "Test publication 2");
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithManyEventsWithDifferentClientId() {
+
+        GoogleAnalyticsEvent event1 = buildEvent("123", "192.168.1.25", "Chrome", "REF",
+            "/api/documents/123", "Test publication");
+
+        GoogleAnalyticsEvent event2 = buildEvent("123", "192.168.1.25", "Mozilla Firefox", "REF-2",
+            "/api/documents/12345", "Test publication 2");
+
+        GoogleAnalyticsEvent event3 = buildEvent("987", "192.168.1.13", "Postman", null,
+            "/api/documents/654", "Test publication 3");
+
+        List<String> requestsBody = requestBuilder.composeRequestsBody("G-12345", of(event1, event2, event3));
+        assertThat(requestsBody, hasSize(2));
+
+        JSONObject firstRequestBody = findRequestBodyByClientId(requestsBody, "123");
+        assertThat(firstRequestBody.get("client_id"), is("123"));
+
+        JSONArray firstEventsArray = firstRequestBody.getJSONArray("events");
+        assertThat(firstEventsArray.length(), is(2));
+
+        JSONObject eventJson1 = findEventJsonByDocumentTitle(firstEventsArray, "Test publication");
+        JSONObject eventJson2 = findEventJsonByDocumentTitle(firstEventsArray, "Test publication 2");
+
+        assertThat(eventJson1, notNullValue());
+        assertThat(eventJson2, notNullValue());
+
+        assertEventJsonHasAttributes(eventJson1, "item", "download", "bitstream", "192.168.1.25",
+            "Chrome", "REF", "/api/documents/123", "Test publication");
+
+        assertEventJsonHasAttributes(eventJson2, "item", "download", "bitstream", "192.168.1.25",
+            "Mozilla Firefox", "REF-2", "/api/documents/12345", "Test publication 2");
+
+        JSONObject secondRequestBody = findRequestBodyByClientId(requestsBody, "987");
+        assertThat(secondRequestBody.get("client_id"), is("987"));
+
+        JSONArray secondEventsArray = secondRequestBody.getJSONArray("events");
+        assertThat(secondEventsArray.length(), is(1));
+
+        assertEventJsonHasAttributes(secondEventsArray.getJSONObject(0), "item", "download", "bitstream",
+            "192.168.1.13", "Postman", "", "/api/documents/654", "Test publication 3");
+
+    }
+
+    private void assertEventJsonHasAttributes(JSONObject event, String name, String action, String category,
+        String userIp, String userAgent, String documentReferrer, String documentPath, String documentTitle) {
+
+        assertThat(event.get("name"), is(name));
+        assertThat(event.getJSONObject("params"), notNullValue());
+        assertThat(event.getJSONObject("params").get("action"), is(action));
+        assertThat(event.getJSONObject("params").get("category"), is(category));
+        assertThat(event.getJSONObject("params").get("document_title"), is(documentTitle));
+        assertThat(event.getJSONObject("params").get("user_ip"), is(userIp));
+        assertThat(event.getJSONObject("params").get("user_agent"), is(userAgent));
+        assertThat(event.getJSONObject("params").get("document_referrer"), is(documentReferrer));
+        assertThat(event.getJSONObject("params").get("document_path"), is(documentPath));
+        assertThat(event.getJSONObject("params").get("time"), notNullValue());
+
+    }
+
+    private JSONObject findRequestBodyByClientId(List<String> requestsBody, String clientId) {
+        for (String requestBody : requestsBody) {
+            JSONObject requestBodyJson = new JSONObject(requestBody);
+            if (requestBodyJson.get("client_id").equals(clientId)) {
+                return requestBodyJson;
+            }
+        }
+        return null;
+    }
+
+    private JSONObject findEventJsonByDocumentTitle(JSONArray events, String documentTitle) {
+
+        for (int i = 0; i < events.length(); i++) {
+            JSONObject event = events.getJSONObject(i);
+            assertThat(event.getJSONObject("params"), notNullValue());
+            if (event.getJSONObject("params").get("document_title").equals(documentTitle)) {
+                return event;
+            }
+        }
+
+        return null;
+    }
+
+    private GoogleAnalyticsEvent buildEvent(String clientId, String userIp, String userAgent,
+        String documentReferrer, String documentPath, String documentTitle) {
+        return new GoogleAnalyticsEvent(clientId, userIp, userAgent, documentReferrer, documentPath, documentTitle);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/google/client/UniversalAnalyticsClientRequestBuilderTest.java b/dspace-api/src/test/java/org/dspace/google/client/UniversalAnalyticsClientRequestBuilderTest.java
new file mode 100644
index 0000000000..bc30c2a124
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/google/client/UniversalAnalyticsClientRequestBuilderTest.java
@@ -0,0 +1,152 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+import static java.util.List.of;
+import static org.apache.commons.lang.StringUtils.countMatches;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThrows;
+
+import java.util.List;
+
+import org.dspace.google.GoogleAnalyticsEvent;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link UniversalAnalyticsClientRequestBuilder}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class UniversalAnalyticsClientRequestBuilderTest {
+
+    private UniversalAnalyticsClientRequestBuilder requestBuilder;
+
+    @Before
+    public void setup() {
+        requestBuilder = new UniversalAnalyticsClientRequestBuilder("https://google-analytics/test");
+    }
+
+    @Test
+    public void testGetEndpointUrl() {
+
+        String endpointUrl = requestBuilder.getEndpointUrl("UA-12345");
+        assertThat(endpointUrl, is("https://google-analytics/test"));
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithoutEvents() {
+
+        List<String> requestsBody = requestBuilder.composeRequestsBody("UA-12345", List.of());
+        assertThat(requestsBody, empty());
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithNotSupportedKey() {
+
+        GoogleAnalyticsEvent event = buildEvent("123", "192.168.1.25", "Chrome", "REF",
+            "/api/documents/123", "Test publication");
+
+        assertThrows("Only keys with G- prefix are supported",
+            IllegalArgumentException.class, () -> requestBuilder.composeRequestsBody("G-12345", List.of(event)));
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithSingleEvent() {
+
+        GoogleAnalyticsEvent event = buildEvent("123", "192.168.1.25", "Chrome", "REF",
+            "/api/documents/123", "Test publication");
+
+        List<String> requestsBody = requestBuilder.composeRequestsBody("UA-12345", List.of(event));
+        assertThat(requestsBody, hasSize(1));
+
+        String requestBody = requestsBody.get(0);
+        assertThat(countMatches(requestBody, "&qt="), is(1));
+
+        String requestBodyWithoutTime = removeAllTimeSections(requestBody);
+
+        String expectedRequestBodyWithoutTime = "v=1&tid=UA-12345&cid=123&t=event&uip=192.168.1.25&ua=Chrome&dr=REF"
+            + "&dp=%2Fapi%2Fdocuments%2F123&dt=Test+publication&ec=bitstream&ea=download&el=item";
+
+        assertThat(requestBodyWithoutTime, is(expectedRequestBodyWithoutTime));
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithManyEventsWithSameClientId() {
+
+        GoogleAnalyticsEvent event1 = buildEvent("123", "192.168.1.25", "Chrome", "REF",
+            "/api/documents/123", "Test publication");
+
+        GoogleAnalyticsEvent event2 = buildEvent("123", "192.168.1.25", "Mozilla Firefox", "REF-2",
+            "/api/documents/12345", "Test publication 2");
+
+        List<String> requestsBody = requestBuilder.composeRequestsBody("UA-12345", List.of(event1, event2));
+        assertThat(requestsBody, hasSize(1));
+        String requestBody = requestsBody.get(0);
+
+        assertThat(countMatches(requestBody, "&qt="), is(2));
+
+        String requestBodyWithoutTime = removeAllTimeSections(requestBody);
+
+        String expectedRequestBodyWithoutTime = "v=1&tid=UA-12345&cid=123&t=event&uip=192.168.1.25&ua=Chrome&dr=REF"
+            + "&dp=%2Fapi%2Fdocuments%2F123&dt=Test+publication&ec=bitstream&ea=download&el=item\n"
+            + "v=1&tid=UA-12345&cid=123&t=event&uip=192.168.1.25&ua=Mozilla+Firefox&dr=REF-2"
+            + "&dp=%2Fapi%2Fdocuments%2F12345&dt=Test+publication+2&ec=bitstream&ea=download&el=item";
+
+        assertThat(requestBodyWithoutTime, is(expectedRequestBodyWithoutTime));
+
+    }
+
+    @Test
+    public void testComposeRequestBodiesWithManyEventsWithDifferentClientId() {
+
+        GoogleAnalyticsEvent event1 = buildEvent("123", "192.168.1.25", "Chrome", "REF",
+            "/api/documents/123", "Test publication");
+
+        GoogleAnalyticsEvent event2 = buildEvent("123", "192.168.1.25", "Mozilla Firefox", "REF-2",
+            "/api/documents/12345", "Test publication 2");
+
+        GoogleAnalyticsEvent event3 = buildEvent("987", "192.168.1.13", "Postman", null,
+            "/api/documents/654", "Test publication 3");
+
+        List<String> requestsBody = requestBuilder.composeRequestsBody("UA-12345", of(event1, event2, event3));
+        assertThat(requestsBody, hasSize(1));
+        String requestBody = requestsBody.get(0);
+
+        assertThat(countMatches(requestBody, "&qt="), is(3));
+
+        String requestBodyWithoutTime = removeAllTimeSections(requestBody);
+
+        String expectedRequestBodyWithoutTime = "v=1&tid=UA-12345&cid=123&t=event&uip=192.168.1.25&ua=Chrome&dr=REF"
+            + "&dp=%2Fapi%2Fdocuments%2F123&dt=Test+publication&ec=bitstream&ea=download&el=item\n"
+            + "v=1&tid=UA-12345&cid=123&t=event&uip=192.168.1.25&ua=Mozilla+Firefox&dr=REF-2"
+            + "&dp=%2Fapi%2Fdocuments%2F12345&dt=Test+publication+2&ec=bitstream&ea=download&el=item\n"
+            + "v=1&tid=UA-12345&cid=987&t=event&uip=192.168.1.13&ua=Postman&dr="
+            + "&dp=%2Fapi%2Fdocuments%2F654&dt=Test+publication+3&ec=bitstream&ea=download&el=item";
+
+        assertThat(requestBodyWithoutTime, is(expectedRequestBodyWithoutTime));
+
+    }
+
+    private String removeAllTimeSections(String requestBody) {
+        return requestBody.replaceAll("&qt=\\d+", "");
+    }
+
+    private GoogleAnalyticsEvent buildEvent(String clientId, String userIp, String userAgent,
+        String documentReferrer, String documentPath, String documentTitle) {
+        return new GoogleAnalyticsEvent(clientId, userIp, userAgent, documentReferrer, documentPath, documentTitle);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java b/dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java
index 52cda18df5..b9dbbba647 100644
--- a/dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java
+++ b/dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java
@@ -191,7 +191,7 @@ public class DOIIdentifierProviderTest
         List<String> remainder = new ArrayList<>();
 
         for (MetadataValue id : metadata) {
-            if (!id.getValue().startsWith(DOI.RESOLVER)) {
+            if (!id.getValue().startsWith(doiService.getResolver())) {
                 remainder.add(id.getValue());
             }
         }
@@ -278,11 +278,11 @@ public class DOIIdentifierProviderTest
             PREFIX + "/" + NAMESPACE_SEPARATOR + "lkjljasd1234",
             DOI.SCHEME + "10.5072/123abc-lkj/kljl",
             "http://dx.doi.org/10.5072/123abc-lkj/kljl",
-            DOI.RESOLVER + "/10.5072/123abc-lkj/kljl"
+            doiService.getResolver() + "/10.5072/123abc-lkj/kljl"
         };
 
         for (String doi : validDOIs) {
-            assertTrue("DOI should be supported", provider.supports(doi));
+            assertTrue("DOI " + doi + " should be supported", provider.supports(doi));
         }
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/iiif/MockIIIFApiQueryServiceImpl.java b/dspace-api/src/test/java/org/dspace/iiif/MockIIIFApiQueryServiceImpl.java
new file mode 100644
index 0000000000..a240e76f97
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/iiif/MockIIIFApiQueryServiceImpl.java
@@ -0,0 +1,20 @@
+/**
+ * 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/
+ */
+package org.dspace.iiif;
+
+import org.dspace.content.Bitstream;
+
+/**
+ * Mock for the IIIFApiQueryService.
+ * @author Michael Spalti (mspalti at willamette.edu)
+ */
+public class MockIIIFApiQueryServiceImpl extends IIIFApiQueryServiceImpl {
+    public int[] getImageDimensions(Bitstream bitstream) {
+        return new int[]{64, 64};
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/iiif/canvasdimension/CanvasDimensionsIT.java b/dspace-api/src/test/java/org/dspace/iiif/canvasdimension/CanvasDimensionsIT.java
index 502266da06..038654af43 100644
--- a/dspace-api/src/test/java/org/dspace/iiif/canvasdimension/CanvasDimensionsIT.java
+++ b/dspace-api/src/test/java/org/dspace/iiif/canvasdimension/CanvasDimensionsIT.java
@@ -7,14 +7,15 @@
  */
 package org.dspace.iiif.canvasdimension;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.util.regex.Pattern;
 
+import org.apache.commons.lang.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.builder.BitstreamBuilder;
 import org.dspace.builder.CollectionBuilder;
@@ -231,9 +232,7 @@ public class CanvasDimensionsIT extends AbstractIntegrationTestWithDatabase  {
             .withName("Bitstream2.jpg")
             .withMimeType("image/jpeg")
             .build();
-
         context.restoreAuthSystemState();
-
         String id = parentCommunity.getID().toString();
         execCanvasScript(id);
 
@@ -408,7 +407,8 @@ public class CanvasDimensionsIT extends AbstractIntegrationTestWithDatabase  {
 
         execCanvasScriptWithMaxRecs(id);
         // check System.out for number of items processed.
-        assertEquals("2 IIIF items were processed.\n", outContent.toString());
+        Pattern regex = Pattern.compile(".*2 IIIF items were processed", Pattern.DOTALL);
+        assertTrue(regex.matcher(StringUtils.chomp(outContent.toString())).find());
     }
 
     @Test
diff --git a/dspace-api/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java b/dspace-api/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
index 8545c4187d..30a5a3a9b5 100644
--- a/dspace-api/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
+++ b/dspace-api/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jdom.Document;
-import org.jdom.JDOMException;
+import org.jdom2.Document;
+import org.jdom2.JDOMException;
 
 /**
  * Mock implementation for the Creative commons license connector service.
diff --git a/dspace-api/src/test/java/org/dspace/orcid/OrcidQueueConsumerIT.java b/dspace-api/src/test/java/org/dspace/orcid/OrcidQueueConsumerIT.java
new file mode 100644
index 0000000000..f2e528d78c
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/orcid/OrcidQueueConsumerIT.java
@@ -0,0 +1,791 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid;
+
+import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
+import static org.dspace.builder.OrcidHistoryBuilder.createOrcidHistory;
+import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
+import static org.dspace.orcid.OrcidOperation.DELETE;
+import static org.dspace.orcid.OrcidOperation.INSERT;
+import static org.dspace.orcid.OrcidOperation.UPDATE;
+import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
+import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
+import static org.dspace.profile.OrcidEntitySyncPreference.DISABLED;
+import static org.dspace.profile.OrcidProfileSyncPreference.BIOGRAPHICAL;
+import static org.dspace.profile.OrcidProfileSyncPreference.IDENTIFIERS;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+
+import java.sql.SQLException;
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.OrcidHistoryBuilder;
+import org.dspace.builder.RelationshipBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.RelationshipType;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.orcid.consumer.OrcidQueueConsumer;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration tests for {@link OrcidQueueConsumer}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidQueueConsumerIT extends AbstractIntegrationTestWithDatabase {
+
+    private OrcidQueueService orcidQueueService = OrcidServiceFactory.getInstance().getOrcidQueueService();
+
+    private ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    private Collection profileCollection;
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent community")
+            .build();
+
+        profileCollection = createCollection("Profiles", "Person");
+
+        context.restoreAuthSystemState();
+    }
+
+    @After
+    @Override
+    public void destroy() throws Exception {
+        List<OrcidQueue> records = orcidQueueService.findAll(context);
+        for (OrcidQueue record : records) {
+            orcidQueueService.delete(context, record);
+        }
+        context.setDispatcher(null);
+
+        super.destroy();
+    }
+
+    @Test
+    public void testWithNotOrcidSynchronizationEntity() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Collection orgUnits = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("OrgUnits")
+            .withEntityType("OrgUnit")
+            .build();
+
+        ItemBuilder.createItem(context, orgUnits)
+            .withTitle("Test OrgUnit")
+            .withSubject("test")
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, empty());
+    }
+
+    @Test
+    public void testWithOrcidSynchronizationDisabled() throws Exception {
+
+        configurationService.setProperty("orcid.synchronization-enabled", false);
+
+        context.turnOffAuthorisationSystem();
+
+        ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withSubject("test")
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .withOrcidSynchronizationProfilePreference(IDENTIFIERS)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, empty());
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationForProfile() throws Exception {
+        // Set a fake handle prefix for this test which we will use to assign handles below
+        configurationService.setProperty("handle.prefix", "fake-handle");
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withSubject("test")
+            .withHandle("fake-handle/190")
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .withOrcidSynchronizationProfilePreference(IDENTIFIERS)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(2));
+        assertThat(queueRecords, hasItem(matches(profile, profile, "KEYWORDS", null,
+            "dc.subject::test", "test", INSERT)));
+        assertThat(queueRecords, hasItem(matches(profile, "RESEARCHER_URLS", null,
+            "dc.identifier.uri::http://localhost:4000/handle/fake-handle/190",
+            "http://localhost:4000/handle/fake-handle/190", INSERT)));
+
+        addMetadata(profile, "person", "name", "variant", "User Test", null);
+        context.commit();
+
+        queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(3));
+        assertThat(queueRecords, hasItem(
+            matches(profile, profile, "KEYWORDS", null, "dc.subject::test", "test", INSERT)));
+        assertThat(queueRecords, hasItem(matches(profile, "RESEARCHER_URLS", null,
+            "dc.identifier.uri::http://localhost:4000/handle/fake-handle/190",
+            "http://localhost:4000/handle/fake-handle/190", INSERT)));
+        assertThat(queueRecords, hasItem(matches(profile, profile, "OTHER_NAMES",
+            null, "person.name.variant::User Test", "User Test", INSERT)));
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationForProfileWithSameMetadataPreviouslyDeleted() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .build();
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .withPutCode("123456")
+            .withOperation(OrcidOperation.INSERT)
+            .withTimestamp(Date.from(Instant.ofEpochMilli(100000)))
+            .withStatus(201)
+            .build();
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .withPutCode("123456")
+            .withOperation(OrcidOperation.DELETE)
+            .withTimestamp(Date.from(Instant.ofEpochMilli(200000)))
+            .withStatus(204)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+        addMetadata(profile, "person", "country", null, "IT", null);
+        context.commit();
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords.get(0), matches(profile, "COUNTRY", null, "person.country::IT", "IT", INSERT));
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationForProfileWithMetadataPreviouslyDeletedAndThenInsertedAgain()
+        throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .build();
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .withPutCode("123456")
+            .withOperation(OrcidOperation.INSERT)
+            .withTimestamp(Date.from(Instant.ofEpochMilli(100000)))
+            .withStatus(201)
+            .build();
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .withPutCode("123456")
+            .withOperation(OrcidOperation.DELETE)
+            .withTimestamp(Date.from(Instant.ofEpochMilli(200000)))
+            .withStatus(204)
+            .build();
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .withPutCode("123456")
+            .withOperation(OrcidOperation.INSERT)
+            .withTimestamp(Date.from(Instant.ofEpochMilli(300000)))
+            .withStatus(201)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+        addMetadata(profile, "person", "country", null, "IT", null);
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationForProfileWithNotSuccessfullyMetadataDeletion()
+        throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .build();
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .withPutCode("123456")
+            .withOperation(OrcidOperation.INSERT)
+            .withTimestamp(Date.from(Instant.ofEpochMilli(100000)))
+            .withStatus(201)
+            .build();
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .withPutCode("123456")
+            .withOperation(OrcidOperation.DELETE)
+            .withTimestamp(Date.from(Instant.ofEpochMilli(200000)))
+            .withStatus(400)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+        addMetadata(profile, "person", "country", null, "IT", null);
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationAndDeletion() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item item = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withSubject("Science")
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> records = orcidQueueService.findAll(context);
+        assertThat(records, hasSize(1));
+        assertThat(records, hasItem(matches(item, KEYWORDS.name(), null, "dc.subject::Science", "Science", INSERT)));
+
+        removeMetadata(item, "dc", "subject", null);
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationAndDeletionWithOrcidHistoryInsertionInTheMiddle() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item item = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withSubject("Science")
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> records = orcidQueueService.findAll(context);
+        assertThat(records, hasSize(1));
+        assertThat(records, hasItem(matches(item, KEYWORDS.name(), null, "dc.subject::Science", "Science", INSERT)));
+
+        OrcidHistoryBuilder.createOrcidHistory(context, item, item)
+            .withPutCode("12345")
+            .withMetadata("dc.subject::Science")
+            .withDescription("Science")
+            .withRecordType(KEYWORDS.name())
+            .withOperation(INSERT)
+            .withStatus(201)
+            .build();
+
+        removeMetadata(item, "dc", "subject", null);
+        context.commit();
+
+        records = orcidQueueService.findAll(context);
+        assertThat(records, hasSize(1));
+        assertThat(records, hasItem(matches(item, KEYWORDS.name(), "12345", "dc.subject::Science", "Science", DELETE)));
+
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationAndDeletionWithFailedOrcidHistoryInsertionInTheMiddle() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item item = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withSubject("Science")
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> records = orcidQueueService.findAll(context);
+        assertThat(records, hasSize(1));
+        assertThat(records, hasItem(matches(item, KEYWORDS.name(), null, "dc.subject::Science", "Science", INSERT)));
+
+        OrcidHistoryBuilder.createOrcidHistory(context, item, item)
+            .withPutCode("12345")
+            .withMetadata("dc.subject::Science")
+            .withDescription("Science")
+            .withRecordType(KEYWORDS.name())
+            .withOperation(INSERT)
+            .withStatus(400)
+            .build();
+
+        removeMetadata(item, "dc", "subject", null);
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+    }
+
+    @Test
+    public void testNoOrcidQueueRecordCreationOccursIfProfileSynchronizationIsDisabled() throws SQLException {
+        context.turnOffAuthorisationSystem();
+
+        ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+    }
+
+    @Test
+    public void testNoOrcidQueueRecordCreationOccursIfNoComplianceMetadataArePresent() throws SQLException {
+        context.turnOffAuthorisationSystem();
+
+        ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationForPublication() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withOrcidSynchronizationPublicationsPreference(ALL)
+            .build();
+
+        Collection publicationCollection = createCollection("Publications", "Publication");
+
+        Item publication = ItemBuilder.createItem(context, publicationCollection)
+            .withTitle("Test publication")
+            .withAuthor("Test User")
+            .build();
+
+        EntityType publicationType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
+        EntityType personType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, personType, publicationType,
+            "isAuthorOfPublication", "isPublicationOfAuthor", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, profile, publication, isAuthorOfPublication).build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> orcidQueueRecords = orcidQueueService.findAll(context);
+        assertThat(orcidQueueRecords, hasSize(1));
+        assertThat(orcidQueueRecords.get(0), matches(profile, publication, "Publication", INSERT));
+
+        addMetadata(publication, "dc", "contributor", "editor", "Editor", null);
+        context.commit();
+
+        List<OrcidQueue> newOrcidQueueRecords = orcidQueueService.findAll(context);
+        assertThat(newOrcidQueueRecords, hasSize(1));
+
+        assertThat(orcidQueueRecords.get(0), equalTo(newOrcidQueueRecords.get(0)));
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationToUpdatePublication() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withOrcidSynchronizationPublicationsPreference(ALL)
+            .build();
+
+        Collection publicationCollection = createCollection("Publications", "Publication");
+
+        Item publication = ItemBuilder.createItem(context, publicationCollection)
+            .withTitle("Test publication")
+            .withAuthor("Test User")
+            .build();
+
+        createOrcidHistory(context, profile, publication)
+            .withPutCode("123456")
+            .withOperation(INSERT)
+            .build();
+
+        EntityType publicationType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
+        EntityType personType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, personType, publicationType,
+            "isAuthorOfPublication", "isPublicationOfAuthor", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, profile, publication, isAuthorOfPublication).build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> orcidQueueRecords = orcidQueueService.findAll(context);
+        assertThat(orcidQueueRecords, hasSize(1));
+        assertThat(orcidQueueRecords.get(0), matches(profile, publication, "Publication", "123456", UPDATE));
+    }
+
+    @Test
+    public void testNoOrcidQueueRecordCreationOccursIfPublicationSynchronizationIsDisabled() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .build();
+
+        Collection publicationCollection = createCollection("Publications", "Publication");
+
+        Item publication = ItemBuilder.createItem(context, publicationCollection)
+            .withTitle("Test publication")
+            .withAuthor("Test User")
+            .build();
+
+        EntityType publicationType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
+        EntityType personType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, personType, publicationType,
+            "isAuthorOfPublication", "isPublicationOfAuthor", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, profile, publication, isAuthorOfPublication).build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+        addMetadata(profile, "dspace", "orcid", "sync-publications", DISABLED.name(), null);
+        addMetadata(publication, "dc", "date", "issued", "2021-01-01", null);
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+    }
+
+    @Test
+    public void testOrcidQueueRecordCreationToUpdateProject() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withOrcidSynchronizationFundingsPreference(ALL)
+            .build();
+
+        Collection projectCollection = createCollection("Projects", "Project");
+
+        Item project = ItemBuilder.createItem(context, projectCollection)
+            .withTitle("Test project")
+            .build();
+
+        createOrcidHistory(context, profile, project)
+            .withPutCode("123456")
+            .build();
+
+        EntityType projectType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        EntityType personType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person").build();
+
+        RelationshipType isProjectOfPerson = createRelationshipTypeBuilder(context, projectType, personType,
+            "isProjectOfPerson", "isPersonOfProject", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, project, profile, isProjectOfPerson).build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> orcidQueueRecords = orcidQueueService.findAll(context);
+        assertThat(orcidQueueRecords, hasSize(1));
+        assertThat(orcidQueueRecords.get(0), matches(profile, project, "Project", "123456", UPDATE));
+    }
+
+    @Test
+    public void testNoOrcidQueueRecordCreationOccursForNotConfiguredEntities() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .build();
+
+        Collection projectCollection = createCollection("Projects", "Project");
+
+        Item project = ItemBuilder.createItem(context, projectCollection)
+            .withTitle("Test project")
+            .withProjectInvestigator("Test User")
+            .build();
+
+        EntityType projectType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        EntityType personType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person").build();
+
+        RelationshipType isProjectOfPerson = createRelationshipTypeBuilder(context, projectType, personType,
+            "isProjectOfPerson", "isPersonOfProject", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, project, profile, isProjectOfPerson).build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+    }
+
+    @Test
+    public void testOrcidQueueRecalculationOnProfilePreferenceUpdate() throws Exception {
+        // Set a fake handle prefix for this test which we will use to assign handles below
+        configurationService.setProperty("handle.prefix", "fake-handle");
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-0000-0012-2345")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withSubject("Math")
+            .withHandle("fake-handle/200")
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> records = orcidQueueService.findAll(context);
+        assertThat(records, hasSize(1));
+        assertThat(records, hasItem(matches(profile, "KEYWORDS", null, "dc.subject::Math", "Math", INSERT)));
+
+        addMetadata(profile, "person", "identifier", "rid", "ID", null);
+        addMetadata(profile, "dspace", "orcid", "sync-profile", IDENTIFIERS.name(), null);
+
+        context.commit();
+
+        records = orcidQueueService.findAll(context);
+        assertThat(records, hasSize(3));
+        assertThat(records, hasItem(matches(profile, "KEYWORDS", null, "dc.subject::Math", "Math", INSERT)));
+        assertThat(records, hasItem(matches(profile, "EXTERNAL_IDS", null, "person.identifier.rid::ID", "ID", INSERT)));
+        assertThat(records, hasItem(matches(profile, "RESEARCHER_URLS", null,
+            "dc.identifier.uri::http://localhost:4000/handle/fake-handle/200",
+            "http://localhost:4000/handle/fake-handle/200", INSERT)));
+
+        removeMetadata(profile, "dspace", "orcid", "sync-profile");
+
+        context.commit();
+
+        assertThat(orcidQueueService.findAll(context), empty());
+
+    }
+
+    @Test
+    public void testWithManyInsertionAndDeletionOfSameMetadataValue() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .withOrcidSynchronizationProfilePreference(BIOGRAPHICAL)
+            .withSubject("Science")
+            .build();
+
+        context.restoreAuthSystemState();
+        context.commit();
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords.get(0), matches(profile, "KEYWORDS", null,
+            "dc.subject::Science", "Science", INSERT));
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType(KEYWORDS.name())
+            .withDescription("Science")
+            .withMetadata("dc.subject::Science")
+            .withOperation(OrcidOperation.INSERT)
+            .withPutCode("12345")
+            .withStatus(201)
+            .build();
+
+        removeMetadata(profile, "dc", "subject", null);
+
+        context.commit();
+
+        queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords.get(0), matches(profile, "KEYWORDS", "12345",
+            "dc.subject::Science", "Science", DELETE));
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType(KEYWORDS.name())
+            .withDescription("Science")
+            .withMetadata("dc.subject::Science")
+            .withOperation(OrcidOperation.DELETE)
+            .withStatus(204)
+            .build();
+
+        addMetadata(profile, "dc", "subject", null, "Science", null);
+
+        context.commit();
+
+        queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords.get(0), matches(profile, "KEYWORDS", null,
+            "dc.subject::Science", "Science", INSERT));
+
+        OrcidHistoryBuilder.createOrcidHistory(context, profile, profile)
+            .withRecordType(KEYWORDS.name())
+            .withDescription("Science")
+            .withMetadata("dc.subject::Science")
+            .withOperation(OrcidOperation.INSERT)
+            .withPutCode("12346")
+            .withStatus(201)
+            .build();
+
+        removeMetadata(profile, "dc", "subject", null);
+
+        context.commit();
+
+        queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords.get(0), matches(profile, "KEYWORDS", "12346",
+            "dc.subject::Science", "Science", DELETE));
+
+    }
+
+    private void addMetadata(Item item, String schema, String element, String qualifier, String value,
+        String authority) throws Exception {
+        context.turnOffAuthorisationSystem();
+        item = context.reloadEntity(item);
+        itemService.addMetadata(context, item, schema, element, qualifier, null, value, authority, 600);
+        itemService.update(context, item);
+        context.restoreAuthSystemState();
+    }
+
+    private void removeMetadata(Item item, String schema, String element, String qualifier) throws Exception {
+        context.turnOffAuthorisationSystem();
+        item = context.reloadEntity(item);
+        List<MetadataValue> metadata = itemService.getMetadata(item, schema, element, qualifier, Item.ANY);
+        itemService.removeMetadataValues(context, item, metadata);
+        itemService.update(context, item);
+        context.restoreAuthSystemState();
+    }
+
+    private Collection createCollection(String name, String entityType) {
+        return CollectionBuilder.createCollection(context, parentCommunity)
+            .withName(name)
+            .withEntityType(entityType)
+            .build();
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/orcid/model/validator/OrcidValidatorTest.java b/dspace-api/src/test/java/org/dspace/orcid/model/validator/OrcidValidatorTest.java
new file mode 100644
index 0000000000..20cad9ce2c
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/orcid/model/validator/OrcidValidatorTest.java
@@ -0,0 +1,662 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.model.validator;
+
+import static org.dspace.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
+import static org.dspace.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
+import static org.dspace.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+import org.dspace.orcid.model.validator.impl.OrcidValidatorImpl;
+import org.dspace.services.ConfigurationService;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.orcid.jaxb.model.common.Iso3166Country;
+import org.orcid.jaxb.model.common.Relationship;
+import org.orcid.jaxb.model.common.WorkType;
+import org.orcid.jaxb.model.v3.release.common.Amount;
+import org.orcid.jaxb.model.v3.release.common.DisambiguatedOrganization;
+import org.orcid.jaxb.model.v3.release.common.Organization;
+import org.orcid.jaxb.model.v3.release.common.OrganizationAddress;
+import org.orcid.jaxb.model.v3.release.common.PublicationDate;
+import org.orcid.jaxb.model.v3.release.common.Title;
+import org.orcid.jaxb.model.v3.release.common.Year;
+import org.orcid.jaxb.model.v3.release.record.ExternalID;
+import org.orcid.jaxb.model.v3.release.record.ExternalIDs;
+import org.orcid.jaxb.model.v3.release.record.Funding;
+import org.orcid.jaxb.model.v3.release.record.FundingTitle;
+import org.orcid.jaxb.model.v3.release.record.Work;
+import org.orcid.jaxb.model.v3.release.record.WorkTitle;
+
+/**
+ * Unit tests for {@link OrcidValidatorImpl}
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class OrcidValidatorTest {
+
+    @Mock(lenient = true)
+    private ConfigurationService configurationService;
+
+    @InjectMocks
+    private OrcidValidatorImpl validator;
+
+    @Before
+    public void before() {
+        when(configurationService.getBooleanProperty("orcid.validation.work.enabled", true)).thenReturn(true);
+        when(configurationService.getBooleanProperty("orcid.validation.funding.enabled", true)).thenReturn(true);
+        when(configurationService.getArrayProperty("orcid.validation.organization.identifier-sources"))
+            .thenReturn(new String[] { "RINGGOLD", "GRID", "FUNDREF", "LEI" });
+    }
+
+    @Test
+    public void testWorkWithoutTitleAndTypeAndExternalIds() {
+
+        List<OrcidValidationError> errors = validator.validateWork(new Work());
+        assertThat(errors, hasSize(3));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED, TYPE_REQUIRED, EXTERNAL_ID_REQUIRED));
+    }
+
+    @Test
+    public void testWorkWithoutWorkTitle() {
+
+        Work work = new Work();
+        work.setWorkType(WorkType.DATA_SET);
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testWorkWithoutTitle() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.setWorkType(WorkType.DATA_SET);
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testWorkWithNullTitle() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.getWorkTitle().setTitle(new Title(null));
+        work.setWorkType(WorkType.DATA_SET);
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testWorkWithEmptyTitle() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.getWorkTitle().setTitle(new Title(""));
+        work.setWorkType(WorkType.DATA_SET);
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testWorkWithoutType() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.getWorkTitle().setTitle(new Title("Work title"));
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TYPE_REQUIRED));
+    }
+
+    @Test
+    public void testWorkWithoutExternalIds() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.getWorkTitle().setTitle(new Title("Work title"));
+        work.setWorkType(WorkType.DATA_SET);
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(EXTERNAL_ID_REQUIRED));
+    }
+
+    @Test
+    public void testWorkWithEmptyExternalIds() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.getWorkTitle().setTitle(new Title("Work title"));
+        work.setWorkType(WorkType.DATA_SET);
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(EXTERNAL_ID_REQUIRED));
+    }
+
+    @Test
+    public void testdWorkWithPublicationDateWithoutYear() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.setWorkType(WorkType.DATA_SET);
+        work.getWorkTitle().setTitle(new Title("Work title"));
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        PublicationDate publicationDate = new PublicationDate();
+        work.setPublicationDate(publicationDate);
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(PUBLICATION_DATE_INVALID));
+    }
+
+    @Test
+    public void testdWorkWithPublicationDateWithInvalidYear() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.setWorkType(WorkType.DATA_SET);
+        work.getWorkTitle().setTitle(new Title("Work title"));
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        PublicationDate publicationDate = new PublicationDate();
+        Year year = new Year();
+        year.setValue("INVALID");
+        publicationDate.setYear(year);
+        work.setPublicationDate(publicationDate);
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(PUBLICATION_DATE_INVALID));
+    }
+
+    @Test
+    public void testdWorkWithPublicationDateWithYearPriorTo1900() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.setWorkType(WorkType.DATA_SET);
+        work.getWorkTitle().setTitle(new Title("Work title"));
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        PublicationDate publicationDate = new PublicationDate();
+        publicationDate.setYear(new Year(1850));
+        work.setPublicationDate(publicationDate);
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(PUBLICATION_DATE_INVALID));
+    }
+
+    @Test
+    public void testValidWork() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.setWorkType(WorkType.DATA_SET);
+        work.getWorkTitle().setTitle(new Title("Work title"));
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        PublicationDate publicationDate = new PublicationDate();
+        publicationDate.setYear(new Year(1956));
+        work.setPublicationDate(publicationDate);
+
+        List<OrcidValidationError> errors = validator.validateWork(work);
+        assertThat(errors, empty());
+    }
+
+    @Test
+    public void testFundingWithoutTitleAndExternalIdsAndOrganization() {
+
+        List<OrcidValidationError> errors = validator.validateFunding(new Funding());
+        assertThat(errors, hasSize(3));
+        assertThat(errors, containsInAnyOrder(EXTERNAL_ID_REQUIRED, FUNDER_REQUIRED, TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithoutExternalIdsAndOrganization() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Funding title"));
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(2));
+        assertThat(errors, containsInAnyOrder(EXTERNAL_ID_REQUIRED, FUNDER_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithoutTitleAndOrganization() {
+
+        Funding funding = new Funding();
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(2));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED, FUNDER_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithoutTitleAndExternalIds() {
+
+        Funding funding = new Funding();
+        funding.setOrganization(buildValidOrganization());
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(2));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED, EXTERNAL_ID_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithoutTitle() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        funding.setOrganization(buildValidOrganization());
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithNullTitle() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title(null));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        funding.setOrganization(buildValidOrganization());
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithEmptyTitle() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title(""));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        funding.setOrganization(buildValidOrganization());
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithEmptyExternalIds() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+
+        funding.setOrganization(buildValidOrganization());
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(EXTERNAL_ID_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithoutName() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.setName(null);
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(ORGANIZATION_NAME_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithEmptyName() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.setName("");
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(ORGANIZATION_NAME_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithoutAddress() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.setAddress(null);
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(ORGANIZATION_ADDRESS_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithoutCity() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.getAddress().setCity(null);
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(ORGANIZATION_CITY_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithoutCountry() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.getAddress().setCountry(null);
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(ORGANIZATION_COUNTRY_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithoutDisambiguatedOrganization() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.setDisambiguatedOrganization(null);
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(DISAMBIGUATED_ORGANIZATION_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithoutDisambiguatedOrganizationId() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.getDisambiguatedOrganization().setDisambiguatedOrganizationIdentifier(null);
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithoutDisambiguatedOrganizationSource() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.getDisambiguatedOrganization().setDisambiguationSource(null);
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(DISAMBIGUATION_SOURCE_REQUIRED));
+    }
+
+    @Test
+    public void testFundingWithOrganizationWithInvalidDisambiguationSource() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        Organization organization = buildValidOrganization();
+        organization.getDisambiguatedOrganization().setDisambiguationSource("INVALID");
+        funding.setOrganization(organization);
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(DISAMBIGUATION_SOURCE_INVALID));
+    }
+
+    @Test
+    public void testFundingWithoutAmountCurrency() {
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        funding.setOrganization(buildValidOrganization());
+
+        funding.setAmount(new Amount());
+        funding.getAmount().setContent("20000");
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(AMOUNT_CURRENCY_REQUIRED));
+    }
+
+    @Test
+    public void testValidFunding() {
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title("Title"));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        funding.setOrganization(buildValidOrganization());
+
+        List<OrcidValidationError> errors = validator.validateFunding(funding);
+        assertThat(errors, empty());
+    }
+
+    @Test
+    public void testWithWorkValidationEnabled() {
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.getWorkTitle().setTitle(new Title("Work title"));
+        work.setWorkExternalIdentifiers(new ExternalIDs());
+        work.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        List<OrcidValidationError> errors = validator.validate(work);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TYPE_REQUIRED));
+    }
+
+    @Test
+    public void testWithWorkValidationDisabled() {
+
+        when(configurationService.getBooleanProperty("orcid.validation.work.enabled", true)).thenReturn(false);
+
+        Work work = new Work();
+        work.setWorkTitle(new WorkTitle());
+        work.getWorkTitle().setTitle(new Title("Work title"));
+
+        List<OrcidValidationError> errors = validator.validate(work);
+        assertThat(errors, empty());
+    }
+
+    @Test
+    public void testWithFundingValidationEnabled() {
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title(""));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        funding.setOrganization(buildValidOrganization());
+
+        List<OrcidValidationError> errors = validator.validate(funding);
+        assertThat(errors, hasSize(1));
+        assertThat(errors, containsInAnyOrder(TITLE_REQUIRED));
+    }
+
+    @Test
+    public void testWithFundingValidationDisabled() {
+
+        when(configurationService.getBooleanProperty("orcid.validation.funding.enabled", true)).thenReturn(false);
+
+        Funding funding = new Funding();
+        funding.setTitle(new FundingTitle());
+        funding.getTitle().setTitle(new Title(""));
+
+        funding.setExternalIdentifiers(new ExternalIDs());
+        funding.getExternalIdentifiers().getExternalIdentifier().add(buildValidExternalID());
+
+        funding.setOrganization(buildValidOrganization());
+
+        List<OrcidValidationError> errors = validator.validate(funding);
+        assertThat(errors, empty());
+    }
+
+    private ExternalID buildValidExternalID() {
+        ExternalID externalID = new ExternalID();
+        externalID.setRelationship(Relationship.SELF);
+        externalID.setType("TYPE");
+        externalID.setValue("VALUE");
+        return externalID;
+    }
+
+    private Organization buildValidOrganization() {
+        Organization organization = new Organization();
+        organization.setName("Organization");
+
+        OrganizationAddress address = new OrganizationAddress();
+        address.setCity("City");
+        address.setCountry(Iso3166Country.BA);
+        organization.setAddress(address);
+
+        DisambiguatedOrganization disambiguatedOrganization = new DisambiguatedOrganization();
+        disambiguatedOrganization.setDisambiguatedOrganizationIdentifier("ID");
+        disambiguatedOrganization.setDisambiguationSource("LEI");
+        organization.setDisambiguatedOrganization(disambiguatedOrganization);
+
+        return organization;
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/orcid/script/OrcidBulkPushIT.java b/dspace-api/src/test/java/org/dspace/orcid/script/OrcidBulkPushIT.java
new file mode 100644
index 0000000000..db66f6c7aa
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/orcid/script/OrcidBulkPushIT.java
@@ -0,0 +1,500 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.script;
+
+import static org.dspace.app.launcher.ScriptLauncher.handleScript;
+import static org.dspace.app.matcher.LambdaMatcher.matches;
+import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
+import static org.dspace.builder.OrcidQueueBuilder.createOrcidQueue;
+import static org.dspace.orcid.OrcidOperation.DELETE;
+import static org.dspace.orcid.OrcidOperation.INSERT;
+import static org.dspace.orcid.OrcidOperation.UPDATE;
+import static org.dspace.profile.OrcidSynchronizationMode.BATCH;
+import static org.dspace.profile.OrcidSynchronizationMode.MANUAL;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.app.launcher.ScriptLauncher;
+import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.OrcidTokenBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidResponse;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.impl.OrcidHistoryServiceImpl;
+import org.dspace.profile.OrcidSynchronizationMode;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration tests for {@link OrcidBulkPush}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidBulkPushIT extends AbstractIntegrationTestWithDatabase {
+
+    private Collection profileCollection;
+
+    private Collection publicationCollection;
+
+    private OrcidHistoryServiceImpl orcidHistoryService;
+
+    private OrcidQueueService orcidQueueService;
+
+    private ConfigurationService configurationService;
+
+    private OrcidClient orcidClient;
+
+    private OrcidClient orcidClientMock;
+
+    @Before
+    public void setup() {
+
+        orcidHistoryService = (OrcidHistoryServiceImpl) OrcidServiceFactory.getInstance().getOrcidHistoryService();
+        orcidQueueService = OrcidServiceFactory.getInstance().getOrcidQueueService();
+
+        configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+        context.setCurrentUser(admin);
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent community")
+            .build();
+
+        profileCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Profiles")
+            .withEntityType("Person")
+            .build();
+
+        publicationCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Publications")
+            .withEntityType("Publication")
+            .build();
+
+        orcidClientMock = mock(OrcidClient.class);
+
+        orcidClient = orcidHistoryService.getOrcidClient();
+        orcidHistoryService.setOrcidClient(orcidClientMock);
+
+    }
+
+    @After
+    public void after() throws SQLException {
+        List<OrcidHistory> records = orcidHistoryService.findAll(context);
+        for (OrcidHistory record : records) {
+            orcidHistoryService.delete(context, record);
+        }
+        orcidHistoryService.setOrcidClient(orcidClient);
+    }
+
+    @Test
+    public void testWithoutOrcidQueueRecords() throws Exception {
+        TestDSpaceRunnableHandler handler = runBulkSynchronization(false);
+        assertThat(handler.getInfoMessages(), hasSize(1));
+        assertThat(handler.getInfoMessages().get(0), is("Found 0 queue records to synchronize with ORCID"));
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+    }
+
+    @Test
+    public void testWithManyOrcidQueueRecords() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson owner = EPersonBuilder.createEPerson(context)
+            .withEmail("owner@test.it")
+            .build();
+        context.restoreAuthSystemState();
+
+        Item firstProfileItem = createProfileItemItem("0000-1111-2222-3333", eperson, BATCH);
+        Item secondProfileItem = createProfileItemItem("1111-2222-3333-4444", admin, MANUAL);
+        Item thirdProfileItem = createProfileItemItem("2222-3333-4444-5555", owner, BATCH);
+
+        Item firstEntity = createPublication("First publication");
+        Item secondEntity = createPublication("Second publication");
+        Item thirdEntity = createPublication("Third publication");
+        Item fourthEntity = createPublication("Fourth publication");
+        Item fifthEntity = createPublication("Fifth publication");
+
+        when(orcidClientMock.push(any(), eq("0000-1111-2222-3333"), any()))
+            .thenReturn(createdResponse("12345"));
+
+        when(orcidClientMock.update(any(), eq("0000-1111-2222-3333"), any(), eq("98765")))
+            .thenReturn(updatedResponse("98765"));
+
+        when(orcidClientMock.deleteByPutCode(any(), eq("0000-1111-2222-3333"), eq("22222"), eq("/work")))
+            .thenReturn(deletedResponse());
+
+        when(orcidClientMock.push(any(), eq("2222-3333-4444-5555"), any()))
+            .thenReturn(createdResponse("11111"));
+
+        createOrcidQueue(context, firstProfileItem, firstEntity);
+        createOrcidQueue(context, firstProfileItem, secondEntity, "98765");
+        createOrcidQueue(context, firstProfileItem, "Description", "Publication", "22222");
+        createOrcidQueue(context, secondProfileItem, thirdEntity);
+        createOrcidQueue(context, secondProfileItem, fourthEntity);
+        createOrcidQueue(context, thirdProfileItem, fifthEntity);
+
+        context.commit();
+
+        TestDSpaceRunnableHandler handler = runBulkSynchronization(false);
+
+        String firstProfileItemId = firstProfileItem.getID().toString();
+        String thirdProfileItemId = thirdProfileItem.getID().toString();
+
+        assertThat(handler.getInfoMessages(), hasSize(9));
+        assertThat(handler.getInfoMessages(), containsInAnyOrder(
+            "Found 4 queue records to synchronize with ORCID",
+            "Addition of Publication for profile with ID: " + firstProfileItemId,
+            "History record created with status 201. The operation was completed successfully",
+            "Update of Publication for profile with ID: " + firstProfileItemId + " by put code 98765",
+            "History record created with status 200. The operation was completed successfully",
+            "Deletion of Publication for profile with ID: " + firstProfileItemId + " by put code 22222",
+            "History record created with status 204. The operation was completed successfully",
+            "Addition of Publication for profile with ID: " + thirdProfileItemId,
+            "History record created with status 201. The operation was completed successfully"));
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+
+        verify(orcidClientMock).push(any(), eq("0000-1111-2222-3333"), any());
+        verify(orcidClientMock).push(any(), eq("2222-3333-4444-5555"), any());
+        verify(orcidClientMock).update(any(), eq("0000-1111-2222-3333"), any(), eq("98765"));
+        verify(orcidClientMock).deleteByPutCode(any(), eq("0000-1111-2222-3333"), eq("22222"), eq("/work"));
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(2));
+        assertThat(queueRecords, hasItem(matches(secondProfileItem, thirdEntity, "Publication", INSERT, 0)));
+        assertThat(queueRecords, hasItem(matches(secondProfileItem, fourthEntity, "Publication", INSERT, 0)));
+
+        List<OrcidHistory> historyRecords = orcidHistoryService.findAll(context);
+        assertThat(historyRecords, hasSize(4));
+        assertThat(historyRecords, hasItem(matches(history(firstProfileItem, firstEntity, 201, INSERT))));
+        assertThat(historyRecords, hasItem(matches(history(firstProfileItem, secondEntity, 200, UPDATE))));
+        assertThat(historyRecords, hasItem(matches(history(firstProfileItem, 204, DELETE))));
+        assertThat(historyRecords, hasItem(matches(history(thirdProfileItem, fifthEntity, 201, INSERT))));
+
+    }
+
+    @Test
+    public void testWithOneValidationError() throws Exception {
+
+        Item firstProfileItem = createProfileItemItem("0000-1111-2222-3333", eperson, BATCH);
+        Item secondProfileItem = createProfileItemItem("1111-2222-3333-4444", admin, BATCH);
+
+        Item firstEntity = createPublication("First publication");
+        Item secondEntity = createPublication("");
+        Item thirdEntity = createPublication("Third publication");
+
+        when(orcidClientMock.push(any(), eq("0000-1111-2222-3333"), any()))
+            .thenReturn(createdResponse("12345"));
+
+        when(orcidClientMock.push(any(), eq("1111-2222-3333-4444"), any()))
+            .thenReturn(createdResponse("55555"));
+
+        createOrcidQueue(context, firstProfileItem, firstEntity);
+        createOrcidQueue(context, firstProfileItem, secondEntity, "98765");
+        createOrcidQueue(context, secondProfileItem, thirdEntity);
+
+        context.commit();
+
+        TestDSpaceRunnableHandler handler = runBulkSynchronization(false);
+
+        assertThat(handler.getInfoMessages(), hasSize(6));
+        assertThat(handler.getInfoMessages(), containsInAnyOrder(
+            "Found 3 queue records to synchronize with ORCID",
+            "Addition of Publication for profile with ID: " + firstProfileItem.getID().toString(),
+            "History record created with status 201. The operation was completed successfully",
+            "Update of Publication for profile with ID: " + firstProfileItem.getID().toString() + " by put code 98765",
+            "Addition of Publication for profile with ID: " + secondProfileItem.getID().toString(),
+            "History record created with status 201. The operation was completed successfully"));
+
+        assertThat(handler.getErrorMessages(), hasSize(1));
+        assertThat(handler.getErrorMessages(), containsInAnyOrder(
+            "Errors occurs during ORCID object validation. Error codes: title.required"));
+
+        assertThat(handler.getWarningMessages(), empty());
+
+        verify(orcidClientMock).push(any(), eq("0000-1111-2222-3333"), any());
+        verify(orcidClientMock).push(any(), eq("1111-2222-3333-4444"), any());
+        verifyNoMoreInteractions(orcidClientMock);
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords, hasItem(matches(firstProfileItem, secondEntity, "Publication", UPDATE, 1)));
+
+        List<OrcidHistory> historyRecords = orcidHistoryService.findAll(context);
+        assertThat(historyRecords, hasSize(2));
+        assertThat(historyRecords, hasItem(matches(history(firstProfileItem, firstEntity, 201, INSERT))));
+        assertThat(historyRecords, hasItem(matches(history(secondProfileItem, thirdEntity, 201, INSERT))));
+
+    }
+
+    @Test
+    public void testWithUnexpectedErrorForMissingOrcid() throws Exception {
+
+        Item firstProfileItem = createProfileItemItem("0000-1111-2222-3333", eperson, BATCH);
+        Item secondProfileItem = createProfileItemItem("", admin, BATCH);
+
+        Item firstEntity = createPublication("First publication");
+        Item secondEntity = createPublication("Second publication");
+
+        when(orcidClientMock.push(any(), eq("0000-1111-2222-3333"), any()))
+            .thenReturn(createdResponse("12345"));
+
+        createOrcidQueue(context, secondProfileItem, secondEntity);
+        createOrcidQueue(context, firstProfileItem, firstEntity);
+
+        context.commit();
+
+        TestDSpaceRunnableHandler handler = runBulkSynchronization(false);
+
+        assertThat(handler.getInfoMessages(), hasSize(4));
+        assertThat(handler.getInfoMessages(), containsInAnyOrder(
+            "Found 2 queue records to synchronize with ORCID",
+            "Addition of Publication for profile with ID: " + secondProfileItem.getID().toString(),
+            "Addition of Publication for profile with ID: " + firstProfileItem.getID().toString(),
+            "History record created with status 201. The operation was completed successfully"));
+
+        assertThat(handler.getErrorMessages(), hasSize(1));
+        assertThat(handler.getErrorMessages(), contains("An unexpected error occurs during the synchronization: "
+            + "The related profileItem item (id = " + secondProfileItem.getID() + ") does not have an orcid"));
+
+        assertThat(handler.getWarningMessages(), empty());
+
+        verify(orcidClientMock).push(any(), eq("0000-1111-2222-3333"), any());
+        verifyNoMoreInteractions(orcidClientMock);
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords, hasItem(matches(secondProfileItem, secondEntity, "Publication", INSERT, 1)));
+
+        List<OrcidHistory> historyRecords = orcidHistoryService.findAll(context);
+        assertThat(historyRecords, hasSize(1));
+        assertThat(historyRecords, hasItem(matches(history(firstProfileItem, firstEntity, 201, INSERT))));
+
+    }
+
+    @Test
+    public void testWithOrcidClientException() throws Exception {
+
+        Item firstProfileItem = createProfileItemItem("0000-1111-2222-3333", eperson, BATCH);
+        Item secondProfileItem = createProfileItemItem("1111-2222-3333-4444", admin, BATCH);
+
+        Item firstEntity = createPublication("First publication");
+        Item secondEntity = createPublication("Second publication");
+
+        when(orcidClientMock.push(any(), eq("0000-1111-2222-3333"), any()))
+            .thenThrow(new OrcidClientException(400, "Bad request"));
+
+        when(orcidClientMock.push(any(), eq("1111-2222-3333-4444"), any()))
+            .thenReturn(createdResponse("55555"));
+
+        createOrcidQueue(context, firstProfileItem, firstEntity);
+        createOrcidQueue(context, secondProfileItem, secondEntity);
+
+        context.commit();
+
+        TestDSpaceRunnableHandler handler = runBulkSynchronization(false);
+
+        assertThat(handler.getInfoMessages(), hasSize(5));
+        assertThat(handler.getInfoMessages(), containsInAnyOrder(
+            "Found 2 queue records to synchronize with ORCID",
+            "Addition of Publication for profile with ID: " + firstProfileItem.getID().toString(),
+            "History record created with status 400. The resource sent to ORCID registry is not valid",
+            "Addition of Publication for profile with ID: " + secondProfileItem.getID().toString(),
+            "History record created with status 201. The operation was completed successfully"));
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+
+        verify(orcidClientMock).push(any(), eq("0000-1111-2222-3333"), any());
+        verify(orcidClientMock).push(any(), eq("1111-2222-3333-4444"), any());
+        verifyNoMoreInteractions(orcidClientMock);
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords, hasItem(matches(firstProfileItem, firstEntity, "Publication", INSERT, 1)));
+
+        List<OrcidHistory> historyRecords = orcidHistoryService.findAll(context);
+        assertThat(historyRecords, hasSize(2));
+        assertThat(historyRecords, hasItem(matches(history(firstProfileItem, firstEntity, 400, INSERT))));
+        assertThat(historyRecords, hasItem(matches(history(secondProfileItem, secondEntity, 201, INSERT))));
+
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testWithTooManyAttempts() throws Exception {
+
+        configurationService.setProperty("orcid.bulk-synchronization.max-attempts", 2);
+
+        Item profileItem = createProfileItemItem("0000-1111-2222-3333", eperson, BATCH);
+        Item entity = createPublication("First publication");
+
+        when(orcidClientMock.push(any(), eq("0000-1111-2222-3333"), any()))
+            .thenThrow(new OrcidClientException(400, "Bad request"));
+
+        createOrcidQueue(context, profileItem, entity);
+
+        // First attempt
+
+        TestDSpaceRunnableHandler handler = runBulkSynchronization(false);
+        assertThat(handler.getInfoMessages(), hasItem("Found 1 queue records to synchronize with ORCID"));
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords, hasItem(matches(profileItem, entity, "Publication", INSERT, 1)));
+
+        List<OrcidHistory> historyRecords = orcidHistoryService.findAll(context);
+        assertThat(historyRecords, hasSize(1));
+        assertThat(historyRecords, hasItem(matches(history(profileItem, entity, 400, INSERT))));
+
+        // Second attempt
+
+        handler = runBulkSynchronization(false);
+        assertThat(handler.getInfoMessages(), hasItem("Found 1 queue records to synchronize with ORCID"));
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+
+        queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords, hasItem(matches(profileItem, entity, "Publication", INSERT, 2)));
+
+        historyRecords = orcidHistoryService.findAll(context);
+        assertThat(historyRecords, hasSize(2));
+        assertThat(historyRecords, contains(matches(history(profileItem, entity, 400, INSERT)),
+            matches(history(profileItem, entity, 400, INSERT))));
+
+        // Third attempt
+
+        handler = runBulkSynchronization(false);
+        assertThat(handler.getInfoMessages(), hasItem("Found 0 queue records to synchronize with ORCID"));
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+
+        queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords, hasItem(matches(profileItem, entity, "Publication", INSERT, 2)));
+
+        historyRecords = orcidHistoryService.findAll(context);
+        assertThat(historyRecords, hasSize(2));
+        assertThat(historyRecords, contains(matches(history(profileItem, entity, 400, INSERT)),
+            matches(history(profileItem, entity, 400, INSERT))));
+
+        // Fourth attempt forcing synchronization
+
+        handler = runBulkSynchronization(true);
+        assertThat(handler.getInfoMessages(), hasItem("Found 1 queue records to synchronize with ORCID"));
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+
+        queueRecords = orcidQueueService.findAll(context);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords, hasItem(matches(profileItem, entity, "Publication", INSERT, 3)));
+
+        historyRecords = orcidHistoryService.findAll(context);
+        assertThat(historyRecords, hasSize(3));
+        assertThat(historyRecords, contains(matches(history(profileItem, entity, 400, INSERT)),
+            matches(history(profileItem, entity, 400, INSERT)),
+            matches(history(profileItem, entity, 400, INSERT))));
+    }
+
+    private Predicate<OrcidHistory> history(Item profileItem, Item entity, int status, OrcidOperation operation) {
+        return history -> profileItem.equals(history.getProfileItem())
+            && entity.equals(history.getEntity())
+            && history.getStatus().equals(status)
+            && operation == history.getOperation();
+    }
+
+    private Predicate<OrcidHistory> history(Item profileItem, int status, OrcidOperation operation) {
+        return history -> profileItem.equals(history.getProfileItem())
+            && history.getStatus().equals(status)
+            && operation == history.getOperation();
+    }
+
+    private TestDSpaceRunnableHandler runBulkSynchronization(boolean forceSynchronization) throws Exception {
+        String[] args = new String[] { "orcid-bulk-push" };
+        args = forceSynchronization ? ArrayUtils.add(args, "-f") : args;
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+        handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+        return handler;
+    }
+
+    private Item createProfileItemItem(String orcid, EPerson owner, OrcidSynchronizationMode mode)
+        throws Exception {
+
+        Item item = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test user")
+            .withOrcidIdentifier(orcid)
+            .withOrcidSynchronizationMode(mode)
+            .withDspaceObjectOwner(owner.getFullName(), owner.getID().toString())
+            .build();
+
+        OrcidTokenBuilder.create(context, owner, "9c913f57-961e-48af-9223-cfad6562c925")
+            .withProfileItem(item)
+            .build();
+
+        return item;
+    }
+
+    private Item createPublication(String title) {
+        return ItemBuilder.createItem(context, publicationCollection)
+            .withTitle(title)
+            .withType("Controlled Vocabulary for Resource Type Genres::dataset")
+            .build();
+    }
+
+    private OrcidResponse createdResponse(String putCode) {
+        return new OrcidResponse(201, putCode, null);
+    }
+
+    private OrcidResponse updatedResponse(String putCode) {
+        return new OrcidResponse(200, putCode, null);
+    }
+
+    private OrcidResponse deletedResponse() {
+        return new OrcidResponse(204, null, null);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
new file mode 100644
index 0000000000..17bc6ee531
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
@@ -0,0 +1,296 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import static org.apache.commons.lang.StringUtils.endsWith;
+import static org.dspace.app.matcher.LambdaMatcher.has;
+import static org.dspace.app.matcher.LambdaMatcher.matches;
+import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.orcid.jaxb.model.common.ContributorRole.AUTHOR;
+import static org.orcid.jaxb.model.common.ContributorRole.EDITOR;
+import static org.orcid.jaxb.model.common.FundingContributorRole.LEAD;
+import static org.orcid.jaxb.model.common.SequenceType.ADDITIONAL;
+import static org.orcid.jaxb.model.common.SequenceType.FIRST;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.RelationshipBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.RelationshipType;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.orcid.jaxb.model.common.ContributorRole;
+import org.orcid.jaxb.model.common.FundingContributorRole;
+import org.orcid.jaxb.model.common.Iso3166Country;
+import org.orcid.jaxb.model.common.Relationship;
+import org.orcid.jaxb.model.common.SequenceType;
+import org.orcid.jaxb.model.common.WorkType;
+import org.orcid.jaxb.model.v3.release.common.Contributor;
+import org.orcid.jaxb.model.v3.release.common.FuzzyDate;
+import org.orcid.jaxb.model.v3.release.common.Organization;
+import org.orcid.jaxb.model.v3.release.common.Url;
+import org.orcid.jaxb.model.v3.release.record.Activity;
+import org.orcid.jaxb.model.v3.release.record.ExternalID;
+import org.orcid.jaxb.model.v3.release.record.Funding;
+import org.orcid.jaxb.model.v3.release.record.FundingContributor;
+import org.orcid.jaxb.model.v3.release.record.FundingContributors;
+import org.orcid.jaxb.model.v3.release.record.Work;
+
+/**
+ * Integration tests for {@link OrcidEntityFactoryService}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidEntityFactoryServiceIT extends AbstractIntegrationTestWithDatabase {
+
+    private OrcidEntityFactoryService entityFactoryService;
+
+    private Collection orgUnits;
+
+    private Collection publications;
+
+    private Collection projects;
+
+    @Before
+    public void setup() {
+
+        entityFactoryService = OrcidServiceFactory.getInstance().getOrcidEntityFactoryService();
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withTitle("Parent community")
+            .build();
+
+        orgUnits = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection")
+            .withEntityType("OrgUnit")
+            .build();
+
+        publications = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection")
+            .withEntityType("Publication")
+            .build();
+
+        projects = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection")
+            .withEntityType("Project")
+            .build();
+
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testWorkCreation() {
+
+        context.turnOffAuthorisationSystem();
+
+        Item publication = ItemBuilder.createItem(context, publications)
+            .withTitle("Test publication")
+            .withAuthor("Walter White")
+            .withAuthor("Jesse Pinkman")
+            .withEditor("Editor")
+            .withIssueDate("2021-04-30")
+            .withDescriptionAbstract("Publication description")
+            .withLanguage("en_US")
+            .withType("Book")
+            .withIsPartOf("Journal")
+            .withDoiIdentifier("doi-id")
+            .withScopusIdentifier("scopus-id")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        Activity activity = entityFactoryService.createOrcidObject(context, publication);
+        assertThat(activity, instanceOf(Work.class));
+
+        Work work = (Work) activity;
+        assertThat(work.getJournalTitle(), notNullValue());
+        assertThat(work.getJournalTitle().getContent(), is("Journal"));
+        assertThat(work.getLanguageCode(), is("en"));
+        assertThat(work.getPublicationDate(), matches(date("2021", "04", "30")));
+        assertThat(work.getShortDescription(), is("Publication description"));
+        assertThat(work.getPutCode(), nullValue());
+        assertThat(work.getWorkType(), is(WorkType.BOOK));
+        assertThat(work.getWorkTitle(), notNullValue());
+        assertThat(work.getWorkTitle().getTitle(), notNullValue());
+        assertThat(work.getWorkTitle().getTitle().getContent(), is("Test publication"));
+        assertThat(work.getWorkContributors(), notNullValue());
+        assertThat(work.getUrl(), matches(urlEndsWith(publication.getHandle())));
+
+        List<Contributor> contributors = work.getWorkContributors().getContributor();
+        assertThat(contributors, hasSize(3));
+        assertThat(contributors, has(contributor("Walter White", AUTHOR, FIRST)));
+        assertThat(contributors, has(contributor("Editor", EDITOR, FIRST)));
+        assertThat(contributors, has(contributor("Jesse Pinkman", AUTHOR, ADDITIONAL)));
+
+        assertThat(work.getExternalIdentifiers(), notNullValue());
+
+        List<ExternalID> externalIds = work.getExternalIdentifiers().getExternalIdentifier();
+        assertThat(externalIds, hasSize(3));
+        assertThat(externalIds, has(selfExternalId("doi", "doi-id")));
+        assertThat(externalIds, has(selfExternalId("eid", "scopus-id")));
+        assertThat(externalIds, has(selfExternalId("handle", publication.getHandle())));
+
+    }
+
+    @Test
+    public void testEmptyWorkWithUnknownTypeCreation() {
+
+        context.turnOffAuthorisationSystem();
+
+        Item publication = ItemBuilder.createItem(context, publications)
+            .withType("TYPE")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        Activity activity = entityFactoryService.createOrcidObject(context, publication);
+        assertThat(activity, instanceOf(Work.class));
+
+        Work work = (Work) activity;
+        assertThat(work.getJournalTitle(), nullValue());
+        assertThat(work.getLanguageCode(), nullValue());
+        assertThat(work.getPublicationDate(), nullValue());
+        assertThat(work.getShortDescription(), nullValue());
+        assertThat(work.getPutCode(), nullValue());
+        assertThat(work.getWorkType(), is(WorkType.OTHER));
+        assertThat(work.getWorkTitle(), nullValue());
+        assertThat(work.getWorkContributors(), notNullValue());
+        assertThat(work.getWorkContributors().getContributor(), empty());
+        assertThat(work.getExternalIdentifiers(), notNullValue());
+
+        List<ExternalID> externalIds = work.getExternalIdentifiers().getExternalIdentifier();
+        assertThat(externalIds, hasSize(1));
+        assertThat(externalIds, has(selfExternalId("handle", publication.getHandle())));
+    }
+
+    @Test
+    public void testFundingCreation() {
+        context.turnOffAuthorisationSystem();
+
+        Item orgUnit = ItemBuilder.createItem(context, orgUnits)
+            .withOrgUnitLegalName("4Science")
+            .withOrgUnitCountry("IT")
+            .withOrgUnitLocality("Milan")
+            .withOrgUnitCrossrefIdentifier("12345")
+            .build();
+
+        Item projectItem = ItemBuilder.createItem(context, projects)
+            .withTitle("Test funding")
+            .withProjectStartDate("2001-03")
+            .withProjectEndDate("2010-03-25")
+            .withProjectInvestigator("Walter White")
+            .withProjectInvestigator("Jesse Pinkman")
+            .withProjectAmount("123")
+            .withProjectAmountCurrency("EUR")
+            .withOtherIdentifier("888-666-444")
+            .withIdentifier("000-111-333")
+            .withDescription("This is a funding to test orcid mapping")
+            .build();
+
+        EntityType projectType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        EntityType orgUnitType = EntityTypeBuilder.createEntityTypeBuilder(context, "OrgUnit").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, orgUnitType, projectType,
+            "isOrgUnitOfProject", "isProjectOfOrgUnit", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, orgUnit, projectItem, isAuthorOfPublication).build();
+
+        context.restoreAuthSystemState();
+
+        Activity activity = entityFactoryService.createOrcidObject(context, projectItem);
+        assertThat(activity, instanceOf(Funding.class));
+
+        Funding funding = (Funding) activity;
+        assertThat(funding.getTitle(), notNullValue());
+        assertThat(funding.getTitle().getTitle(), notNullValue());
+        assertThat(funding.getTitle().getTitle().getContent(), is("Test funding"));
+        assertThat(funding.getStartDate(), matches(date("2001", "03", "01")));
+        assertThat(funding.getEndDate(), matches(date("2010", "03", "25")));
+        assertThat(funding.getDescription(), is("This is a funding to test orcid mapping"));
+        assertThat(funding.getUrl(), matches(urlEndsWith(projectItem.getHandle())));
+        assertThat(funding.getAmount(), notNullValue());
+        assertThat(funding.getAmount().getContent(), is("123"));
+        assertThat(funding.getAmount().getCurrencyCode(), is("EUR"));
+
+        Organization organization = funding.getOrganization();
+        assertThat(organization, notNullValue());
+        assertThat(organization.getName(), is("4Science"));
+        assertThat(organization.getAddress(), notNullValue());
+        assertThat(organization.getAddress().getCountry(), is(Iso3166Country.IT));
+        assertThat(organization.getAddress().getCity(), is("Milan"));
+        assertThat(organization.getDisambiguatedOrganization(), notNullValue());
+        assertThat(organization.getDisambiguatedOrganization().getDisambiguatedOrganizationIdentifier(), is("12345"));
+        assertThat(organization.getDisambiguatedOrganization().getDisambiguationSource(), is("FUNDREF"));
+
+        FundingContributors fundingContributors = funding.getContributors();
+        assertThat(fundingContributors, notNullValue());
+
+        List<FundingContributor> contributors = fundingContributors.getContributor();
+        assertThat(contributors, hasSize(2));
+        assertThat(contributors, has(fundingContributor("Walter White", LEAD)));
+        assertThat(contributors, has(fundingContributor("Jesse Pinkman", LEAD)));
+
+        assertThat(funding.getExternalIdentifiers(), notNullValue());
+
+        List<ExternalID> externalIds = funding.getExternalIdentifiers().getExternalIdentifier();
+        assertThat(externalIds, hasSize(2));
+        assertThat(externalIds, has(selfExternalId("other-id", "888-666-444")));
+        assertThat(externalIds, has(selfExternalId("grant_number", "000-111-333")));
+    }
+
+    private Predicate<ExternalID> selfExternalId(String type, String value) {
+        return externalId(type, value, Relationship.SELF);
+    }
+
+    private Predicate<ExternalID> externalId(String type, String value, Relationship relationship) {
+        return externalId -> externalId.getRelationship() == relationship
+            && type.equals(externalId.getType())
+            && value.equals(externalId.getValue());
+    }
+
+    private Predicate<Contributor> contributor(String name, ContributorRole role, SequenceType sequence) {
+        return contributor -> contributor.getCreditName().getContent().equals(name)
+            && role.equals(contributor.getContributorAttributes().getContributorRole())
+            && contributor.getContributorAttributes().getContributorSequence() == sequence;
+    }
+
+    private Predicate<FundingContributor> fundingContributor(String name, FundingContributorRole role) {
+        return contributor -> contributor.getCreditName().getContent().equals(name)
+            && role.equals(contributor.getContributorAttributes().getContributorRole());
+    }
+
+    private Predicate<? super FuzzyDate> date(String year, String month, String days) {
+        return date -> date != null
+            && year.equals(date.getYear().getValue())
+            && month.equals(date.getMonth().getValue())
+            && days.equals(date.getDay().getValue());
+    }
+
+    private Predicate<Url> urlEndsWith(String handle) {
+        return url -> url != null && url.getValue() != null && endsWith(url.getValue(), handle);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
new file mode 100644
index 0000000000..894029f54e
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
@@ -0,0 +1,244 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import static org.dspace.app.matcher.LambdaMatcher.matches;
+import static org.dspace.orcid.model.OrcidProfileSectionType.COUNTRY;
+import static org.dspace.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
+import static org.dspace.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
+import static org.dspace.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.model.OrcidProfileSectionType;
+import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.orcid.jaxb.model.common.Iso3166Country;
+import org.orcid.jaxb.model.common.Relationship;
+import org.orcid.jaxb.model.v3.release.record.Address;
+import org.orcid.jaxb.model.v3.release.record.Keyword;
+import org.orcid.jaxb.model.v3.release.record.OtherName;
+import org.orcid.jaxb.model.v3.release.record.PersonExternalIdentifier;
+import org.orcid.jaxb.model.v3.release.record.ResearcherUrl;
+
+/**
+ * Integration tests for {@link OrcidProfileSectionFactoryService}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidProfileSectionFactoryServiceIT extends AbstractIntegrationTestWithDatabase {
+
+    private OrcidProfileSectionFactoryService profileSectionFactoryService;
+
+    private ItemService itemService;
+
+    private Collection collection;
+
+    @Before
+    public void setup() {
+
+        profileSectionFactoryService = OrcidServiceFactory.getInstance().getOrcidProfileSectionFactoryService();
+        itemService = ContentServiceFactory.getInstance().getItemService();
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withTitle("Parent community")
+            .build();
+
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection")
+            .withEntityType("Person")
+            .build();
+
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testAddressCreation() {
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Test profile")
+            .withPersonCountry("IT")
+            .build();
+        context.restoreAuthSystemState();
+
+        List<MetadataValue> values = List.of(getMetadata(item, "person.country", 0));
+
+        Object orcidObject = profileSectionFactoryService.createOrcidObject(context, values, COUNTRY);
+        assertThat(orcidObject, instanceOf(Address.class));
+        Address address = (Address) orcidObject;
+        assertThat(address.getCountry(), notNullValue());
+        assertThat(address.getCountry().getValue(), is(Iso3166Country.IT));
+
+    }
+
+    @Test
+    public void testAddressMetadataSignatureGeneration() {
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Test profile")
+            .withPersonCountry("IT")
+            .build();
+        context.restoreAuthSystemState();
+
+        OrcidProfileSectionFactory countryFactory = getFactory(item, COUNTRY);
+
+        List<String> signatures = countryFactory.getMetadataSignatures(context, item);
+        assertThat(signatures, hasSize(1));
+        assertThat(countryFactory.getDescription(context, item, signatures.get(0)), is("IT"));
+    }
+
+    @Test
+    public void testExternalIdentifiersCreation() {
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Test profile")
+            .withScopusAuthorIdentifier("SCOPUS-123456")
+            .withResearcherIdentifier("R-ID-01")
+            .build();
+        context.restoreAuthSystemState();
+
+        List<MetadataValue> values = List.of(getMetadata(item, "person.identifier.scopus-author-id", 0));
+
+        Object firstOrcidObject = profileSectionFactoryService.createOrcidObject(context, values, EXTERNAL_IDS);
+        assertThat(firstOrcidObject, instanceOf(PersonExternalIdentifier.class));
+        assertThat((PersonExternalIdentifier) firstOrcidObject, matches(hasTypeAndValue("SCOPUS", "SCOPUS-123456")));
+
+        values = List.of(getMetadata(item, "person.identifier.rid", 0));
+
+        Object secondOrcidObject = profileSectionFactoryService.createOrcidObject(context, values, EXTERNAL_IDS);
+        assertThat(secondOrcidObject, instanceOf(PersonExternalIdentifier.class));
+        assertThat((PersonExternalIdentifier) secondOrcidObject, matches(hasTypeAndValue("RID", "R-ID-01")));
+    }
+
+    @Test
+    public void testExternalIdentifiersGeneration() {
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Test profile")
+            .withScopusAuthorIdentifier("SCOPUS-123456")
+            .withResearcherIdentifier("R-ID-01")
+            .build();
+        context.restoreAuthSystemState();
+
+        OrcidProfileSectionFactory externalIdsFactory = getFactory(item, EXTERNAL_IDS);
+        List<String> signatures = externalIdsFactory.getMetadataSignatures(context, item);
+        assertThat(signatures, hasSize(2));
+
+        List<String> descriptions = signatures.stream()
+            .map(signature -> externalIdsFactory.getDescription(context, item, signature))
+            .collect(Collectors.toList());
+
+        assertThat(descriptions, containsInAnyOrder("SCOPUS-123456", "R-ID-01"));
+    }
+
+    @Test
+    public void testResearcherUrlsCreation() {
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Test profile")
+            .withUriIdentifier("www.test.com")
+            .build();
+        context.restoreAuthSystemState();
+
+        List<MetadataValue> values = List.of(getMetadata(item, "dc.identifier.uri", 0));
+
+        Object orcidObject = profileSectionFactoryService.createOrcidObject(context, values, RESEARCHER_URLS);
+        assertThat(orcidObject, instanceOf(ResearcherUrl.class));
+        assertThat((ResearcherUrl) orcidObject, matches(hasUrl("www.test.com")));
+    }
+
+    @Test
+    public void testKeywordsCreation() {
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Test profile")
+            .withSubject("Subject")
+            .build();
+        context.restoreAuthSystemState();
+
+        List<MetadataValue> values = List.of(getMetadata(item, "dc.subject", 0));
+        Object orcidObject = profileSectionFactoryService.createOrcidObject(context, values, KEYWORDS);
+        assertThat(orcidObject, instanceOf(Keyword.class));
+        assertThat((Keyword) orcidObject, matches(hasContent("Subject")));
+    }
+
+    @Test
+    public void testOtherNamesCreation() {
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Test profile")
+            .withVariantName("Variant name")
+            .withVernacularName("Vernacular name")
+            .build();
+        context.restoreAuthSystemState();
+
+        List<MetadataValue> values = List.of(getMetadata(item, "person.name.variant", 0));
+        Object orcidObject = profileSectionFactoryService.createOrcidObject(context, values, OTHER_NAMES);
+        assertThat(orcidObject, instanceOf(OtherName.class));
+        assertThat((OtherName) orcidObject, matches(hasValue("Variant name")));
+
+        values = List.of(getMetadata(item, "person.name.translated", 0));
+        orcidObject = profileSectionFactoryService.createOrcidObject(context, values, OTHER_NAMES);
+        assertThat(orcidObject, instanceOf(OtherName.class));
+        assertThat((OtherName) orcidObject, matches(hasValue("Vernacular name")));
+    }
+
+    private MetadataValue getMetadata(Item item, String metadataField, int place) {
+        List<MetadataValue> values = itemService.getMetadataByMetadataString(item, metadataField);
+        assertThat(values.size(), greaterThan(place));
+        return values.get(place);
+    }
+
+    private Predicate<PersonExternalIdentifier> hasTypeAndValue(String type, String value) {
+        return identifier -> value.equals(identifier.getValue())
+            && type.equals(identifier.getType())
+            && identifier.getRelationship() == Relationship.SELF
+            && identifier.getUrl() != null && value.equals(identifier.getUrl().getValue());
+    }
+
+    private Predicate<ResearcherUrl> hasUrl(String url) {
+        return researcherUrl -> researcherUrl.getUrl() != null && url.equals(researcherUrl.getUrl().getValue());
+    }
+
+    private Predicate<Keyword> hasContent(String value) {
+        return keyword -> value.equals(keyword.getContent());
+    }
+
+    private Predicate<OtherName> hasValue(String value) {
+        return name -> value.equals(name.getContent());
+    }
+
+    private OrcidProfileSectionFactory getFactory(Item item, OrcidProfileSectionType sectionType) {
+        return profileSectionFactoryService.findBySectionType(sectionType)
+            .orElseThrow(() -> new IllegalStateException("No profile section factory of type " + sectionType));
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/orcid/service/PlainMetadataSignatureGeneratorIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/PlainMetadataSignatureGeneratorIT.java
new file mode 100644
index 0000000000..66b9a98e72
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/PlainMetadataSignatureGeneratorIT.java
@@ -0,0 +1,166 @@
+/**
+ * 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/
+ */
+package org.dspace.orcid.service;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.util.List;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.orcid.service.impl.PlainMetadataSignatureGeneratorImpl;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration tests for {@link PlainMetadataSignatureGeneratorImpl}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class PlainMetadataSignatureGeneratorIT extends AbstractIntegrationTestWithDatabase {
+
+    private ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+
+    private Collection collection;
+
+    private MetadataSignatureGenerator generator = new PlainMetadataSignatureGeneratorImpl();
+
+    @Before
+    public void setup() {
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withTitle("Parent community")
+            .build();
+
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection")
+            .withEntityType("Person")
+            .build();
+
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testSignatureGenerationWithManyMetadataValues() {
+
+        context.turnOffAuthorisationSystem();
+
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Item title")
+            .withIssueDate("2020-01-01")
+            .withAuthor("Jesse Pinkman")
+            .withEditor("Editor")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        MetadataValue author = getMetadata(item, "dc.contributor.author", 0);
+        MetadataValue editor = getMetadata(item, "dc.contributor.editor", 0);
+
+        String signature = generator.generate(context, List.of(author, editor));
+        assertThat(signature, notNullValue());
+
+        String expectedSignature = "dc.contributor.author::Jesse Pinkman§§"
+            + "dc.contributor.editor::Editor";
+
+        assertThat(signature, equalTo(expectedSignature));
+
+        String anotherSignature = generator.generate(context, List.of(editor, author));
+        assertThat(anotherSignature, equalTo(signature));
+
+        List<MetadataValue> metadataValues = generator.findBySignature(context, item, signature);
+        assertThat(metadataValues, hasSize(2));
+        assertThat(metadataValues, containsInAnyOrder(author, editor));
+
+    }
+
+    @Test
+    public void testSignatureGenerationWithSingleMetadataValue() {
+
+        context.turnOffAuthorisationSystem();
+
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Item title")
+            .withDescription("Description")
+            .withAuthor("Jesse Pinkman")
+            .withUriIdentifier("https://www.4science.it/en")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        MetadataValue description = getMetadata(item, "dc.description", 0);
+        String signature = generator.generate(context, List.of(description));
+        assertThat(signature, notNullValue());
+        assertThat(signature, equalTo("dc.description::Description"));
+
+        List<MetadataValue> metadataValues = generator.findBySignature(context, item, signature);
+        assertThat(metadataValues, hasSize(1));
+        assertThat(metadataValues, containsInAnyOrder(description));
+
+        MetadataValue url = getMetadata(item, "dc.identifier.uri", 0);
+        signature = generator.generate(context, List.of(url));
+        assertThat(signature, equalTo("dc.identifier.uri::https://www.4science.it/en"));
+
+        metadataValues = generator.findBySignature(context, item, signature);
+        assertThat(metadataValues, hasSize(1));
+        assertThat(metadataValues, containsInAnyOrder(url));
+
+    }
+
+    @Test
+    public void testSignatureGenerationWithManyEqualsMetadataValues() {
+        context.turnOffAuthorisationSystem();
+
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Item title")
+            .withDescription("Description")
+            .withAuthor("Jesse Pinkman")
+            .withAuthor("Jesse Pinkman")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        MetadataValue firstAuthor = getMetadata(item, "dc.contributor.author", 0);
+        String firstSignature = generator.generate(context, List.of(firstAuthor));
+        assertThat(firstSignature, notNullValue());
+        assertThat(firstSignature, equalTo("dc.contributor.author::Jesse Pinkman"));
+
+        MetadataValue secondAuthor = getMetadata(item, "dc.contributor.author", 1);
+        String secondSignature = generator.generate(context, List.of(secondAuthor));
+        assertThat(secondSignature, notNullValue());
+        assertThat(secondSignature, equalTo("dc.contributor.author::Jesse Pinkman"));
+
+        List<MetadataValue> metadataValues = generator.findBySignature(context, item, firstSignature);
+        assertThat(metadataValues, hasSize(1));
+        assertThat(metadataValues, anyOf(contains(firstAuthor), contains(secondAuthor)));
+    }
+
+    private MetadataValue getMetadata(Item item, String metadataField, int place) {
+        List<MetadataValue> values = itemService.getMetadataByMetadataString(item, metadataField);
+        assertThat(values.size(), greaterThan(place));
+        return values.get(place);
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/process/ProcessIT.java b/dspace-api/src/test/java/org/dspace/process/ProcessIT.java
new file mode 100644
index 0000000000..d664065212
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/process/ProcessIT.java
@@ -0,0 +1,90 @@
+/**
+ * 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/
+ */
+package org.dspace.process;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.GroupBuilder;
+import org.dspace.builder.ProcessBuilder;
+import org.dspace.eperson.Group;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.eperson.service.GroupService;
+import org.dspace.scripts.Process;
+import org.dspace.scripts.factory.ScriptServiceFactory;
+import org.dspace.scripts.service.ProcessService;
+import org.junit.Test;
+
+/**
+ * This class will aim to test Process related use cases
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+public class ProcessIT extends AbstractIntegrationTestWithDatabase {
+
+    protected ProcessService processService = ScriptServiceFactory.getInstance().getProcessService();
+    protected GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+
+    @Test
+    public void checkProcessGroupsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Group groupA = GroupBuilder.createGroup(context)
+            .withName("Group A")
+            .addMember(admin)
+            .build();
+
+        Set<Group> groupSet = new HashSet<>();
+        groupSet.add(groupA);
+
+        Process processA = ProcessBuilder.createProcess(context, admin, "mock-script",
+                                                        new LinkedList<>(),
+                                                        groupSet).build();
+
+        context.restoreAuthSystemState();
+        Process process = processService.find(context, processA.getID());
+        List<Group> groups = process.getGroups();
+        boolean isPresent = groups.stream().anyMatch(g -> g.getID().equals(groupA.getID()));
+        assertTrue(isPresent);
+    }
+
+    @Test
+    public void removeOneGroupTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        Group groupA = GroupBuilder.createGroup(context)
+            .withName("Group A")
+            .addMember(admin).build();
+
+        Set<Group> groupSet = new HashSet<>();
+        groupSet.add(groupA);
+
+        UUID groupUuid = groupA.getID();
+        Process processA = ProcessBuilder.createProcess(context, admin, "mock-script", new LinkedList<>(),
+                                                        groupSet).build();
+
+        context.restoreAuthSystemState();
+
+        groupService.delete(context, groupA);
+        context.commit();
+        context.reloadEntity(groupA);
+        processA = context.reloadEntity(processA);
+
+        Process process = processService.find(context, processA.getID());
+        List<Group> groups = process.getGroups();
+        boolean isPresent = groups.stream().anyMatch(g -> g.getID().equals(groupUuid));
+        assertFalse(isPresent);
+
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java b/dspace-api/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java
index 1197370e32..f69c0e3af7 100644
--- a/dspace-api/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java
+++ b/dspace-api/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java
@@ -54,9 +54,7 @@ public class MockDSpaceRunnableScriptConfiguration<T extends MockDSpaceRunnableS
             Options options = new Options();
 
             options.addOption("r", "remove", true, "description r");
-            options.getOption("r").setType(String.class);
             options.addOption("i", "index", false, "description i");
-            options.getOption("i").setType(boolean.class);
             options.getOption("i").setRequired(true);
             options.addOption("f", "file", true, "source file");
             options.getOption("f").setType(InputStream.class);
diff --git a/dspace-api/src/test/java/org/dspace/service/impl/ClientInfoServiceImplTest.java b/dspace-api/src/test/java/org/dspace/service/impl/ClientInfoServiceImplTest.java
index d46aded5ac..a883176c12 100644
--- a/dspace-api/src/test/java/org/dspace/service/impl/ClientInfoServiceImplTest.java
+++ b/dspace-api/src/test/java/org/dspace/service/impl/ClientInfoServiceImplTest.java
@@ -223,4 +223,40 @@ public class ClientInfoServiceImplTest extends AbstractDSpaceTest {
 
         assertFalse(clientInfoService.isUseProxiesEnabled());
     }
+
+    @Test
+    public void testIpAnonymization() {
+        clientInfoService = new ClientInfoServiceImpl(configurationService);
+
+        String remoteIp = "192.168.1.25";
+
+        assertEquals("192.168.1.25", clientInfoService.getClientIp(remoteIp, null));
+
+        try {
+
+            configurationService.setProperty("client.ip-anonymization.parts", 1);
+
+            assertEquals("192.168.1.0", clientInfoService.getClientIp(remoteIp, null));
+
+            configurationService.setProperty("client.ip-anonymization.parts", 2);
+
+            assertEquals("192.168.0.0", clientInfoService.getClientIp(remoteIp, null));
+
+            configurationService.setProperty("client.ip-anonymization.parts", 3);
+
+            assertEquals("192.0.0.0", clientInfoService.getClientIp(remoteIp, null));
+
+            configurationService.setProperty("client.ip-anonymization.parts", 4);
+
+            assertEquals("0.0.0.0", clientInfoService.getClientIp(remoteIp, null));
+
+            configurationService.setProperty("client.ip-anonymization.parts", 5);
+
+            assertEquals("192.168.1.25", clientInfoService.getClientIp(remoteIp, null));
+
+        } finally {
+            configurationService.setProperty("client.ip-anonymization.parts", 0);
+        }
+
+    }
 }
diff --git a/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java b/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
index e80d5f8e17..aed0c088c3 100644
--- a/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
+++ b/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
@@ -171,6 +171,7 @@ public class MockSolrServer {
      * Discard the embedded Solr container.
      */
     private static synchronized void destroyContainer() {
+        container.shutdown();
         container = null;
         log.info("SOLR CoreContainer destroyed");
     }
diff --git a/dspace-api/src/test/java/org/dspace/statistics/export/service/OpenUrlServiceImplTest.java b/dspace-api/src/test/java/org/dspace/statistics/export/service/OpenUrlServiceImplTest.java
index 2d414cfcc8..d214050e6b 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/export/service/OpenUrlServiceImplTest.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/export/service/OpenUrlServiceImplTest.java
@@ -9,9 +9,10 @@ package org.dspace.statistics.export.service;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.closeTo;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -20,20 +21,23 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.sql.SQLException;
-import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
-import org.apache.http.client.config.RequestConfig;
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.client.HttpClient;
 import org.dspace.core.Context;
 import org.dspace.statistics.export.OpenURLTracker;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 
 /**
@@ -42,24 +46,64 @@ import org.mockito.junit.MockitoJUnitRunner;
 @RunWith(MockitoJUnitRunner.class)
 public class OpenUrlServiceImplTest {
 
-    @InjectMocks
-    @Spy
+    /**
+     * NOTE: Initialized as a Mockito spy in {@link #setUp()}.
+     */
     private OpenUrlServiceImpl openUrlService;
 
     @Mock
     private FailedOpenURLTrackerService failedOpenURLTrackerService;
 
+    @Mock
+    private HttpClient httpClient;
+
+    @Before
+    public void setUp() throws Exception {
+        // spy on the class under test
+        openUrlService = Mockito.spy(OpenUrlServiceImpl.class);
+
+        // manually hook up dependencies (@autowire doesn't work when creating instances using Mockito)
+        openUrlService.failedOpenUrlTrackerService = failedOpenURLTrackerService;
+
+        // IMPORTANT: mock http client to prevent making REAL http requests
+        doReturn(httpClient).when(openUrlService).getHttpClient(any());
+    }
+
+    /**
+     * Create a mock http response with the given status code.
+     * @param statusCode the http status code to use in the mock.
+     * @return a mocked http response.
+     */
+    protected HttpResponse createMockHttpResponse(int statusCode) {
+        StatusLine statusLine = mock(StatusLine.class);
+        when(statusLine.getStatusCode()).thenReturn(statusCode);
+
+        HttpResponse httpResponse = mock(HttpResponse.class);
+        when(httpResponse.getStatusLine()).thenReturn(statusLine);
+
+        return httpResponse;
+    }
+
+    /**
+     * Create a mock open url tracker with the given url.
+     * @param url the url to use in the mock.
+     * @return a mocked open url tracker.
+     */
+    protected OpenURLTracker createMockTracker(String url) {
+        OpenURLTracker tracker = mock(OpenURLTracker.class);
+        when(tracker.getUrl()).thenReturn(url);
+
+        return tracker;
+    }
+
     /**
      * Test the processUrl method
-     * @throws IOException
-     * @throws SQLException
      */
     @Test
     public void testProcessUrl() throws IOException, SQLException {
         Context context = mock(Context.class);
 
-        doReturn(HttpURLConnection.HTTP_OK).when(openUrlService)
-                                           .getResponseCodeFromUrl(anyString());
+        doReturn(createMockHttpResponse(HttpURLConnection.HTTP_OK)).when(httpClient).execute(any());
         openUrlService.processUrl(context, "test-url");
 
         verify(openUrlService, times(0)).logfailed(context, "test-url");
@@ -67,86 +111,90 @@ public class OpenUrlServiceImplTest {
 
     /**
      * Test the processUrl method when the url connection fails
-     * @throws IOException
-     * @throws SQLException
      */
     @Test
     public void testProcessUrlOnFail() throws IOException, SQLException {
         Context context = mock(Context.class);
 
-        doReturn(HttpURLConnection.HTTP_INTERNAL_ERROR).when(openUrlService)
-                                                       .getResponseCodeFromUrl(anyString());
+        doReturn(createMockHttpResponse(HttpURLConnection.HTTP_INTERNAL_ERROR)).when(httpClient).execute(any());
         doNothing().when(openUrlService).logfailed(any(Context.class), anyString());
 
         openUrlService.processUrl(context, "test-url");
 
         verify(openUrlService, times(1)).logfailed(context, "test-url");
-
     }
 
     /**
      * Test the ReprocessFailedQueue method
-     * @throws SQLException
      */
     @Test
-    public void testReprocessFailedQueue() throws SQLException {
+    public void testReprocessFailedQueue() throws IOException, SQLException {
         Context context = mock(Context.class);
 
-        List<OpenURLTracker> trackers = new ArrayList<>();
-        OpenURLTracker tracker1 = mock(OpenURLTracker.class);
-        OpenURLTracker tracker2 = mock(OpenURLTracker.class);
-        OpenURLTracker tracker3 = mock(OpenURLTracker.class);
-
-        trackers.add(tracker1);
-        trackers.add(tracker2);
-        trackers.add(tracker3);
+        List<OpenURLTracker> trackers = List.of(
+            createMockTracker("tacker1"),
+            createMockTracker("tacker2"),
+            createMockTracker("tacker3")
+        );
 
         when(failedOpenURLTrackerService.findAll(any(Context.class))).thenReturn(trackers);
-        doNothing().when(openUrlService).tryReprocessFailed(any(Context.class), any(OpenURLTracker.class));
+
+        // NOTE: first http request will return status code 500, next one 404, then 200
+        doReturn(
+            createMockHttpResponse(HttpURLConnection.HTTP_INTERNAL_ERROR),
+            createMockHttpResponse(HttpURLConnection.HTTP_NOT_FOUND),
+            createMockHttpResponse(HttpURLConnection.HTTP_OK)
+        ).when(httpClient).execute(any());
 
         openUrlService.reprocessFailedQueue(context);
 
         verify(openUrlService, times(3)).tryReprocessFailed(any(Context.class), any(OpenURLTracker.class));
 
+        // NOTE: http request for tracker 1 and 2 failed, so tracker 1 and 2 should be kept
+        //       http request for tracker 3 succeeded, so tracker 3 should be removed
+        verify(failedOpenURLTrackerService, times(0)).remove(any(Context.class), eq(trackers.get(0)));
+        verify(failedOpenURLTrackerService, times(0)).remove(any(Context.class), eq(trackers.get(1)));
+        verify(failedOpenURLTrackerService, times(1)).remove(any(Context.class), eq(trackers.get(2)));
     }
 
     /**
      * Test the method that logs the failed urls in the db
-     * @throws SQLException
      */
     @Test
     public void testLogfailed() throws SQLException {
         Context context = mock(Context.class);
         OpenURLTracker tracker1 = mock(OpenURLTracker.class);
 
-        doCallRealMethod().when(tracker1).setUrl(anyString());
-        when(tracker1.getUrl()).thenCallRealMethod();
-
         when(failedOpenURLTrackerService.create(any(Context.class))).thenReturn(tracker1);
 
         String failedUrl = "failed-url";
         openUrlService.logfailed(context, failedUrl);
 
-        assertThat(tracker1.getUrl(), is(failedUrl));
+        verify(tracker1).setUrl(failedUrl);
 
+        // NOTE: verify that setUploadDate received a timestamp whose value is no less than 5 seconds from now
+        ArgumentCaptor<Date> dateArgCaptor = ArgumentCaptor.forClass(Date.class);
+        verify(tracker1).setUploadDate(dateArgCaptor.capture());
+        assertThat(
+            new BigDecimal(dateArgCaptor.getValue().getTime()),
+            closeTo(new BigDecimal(new Date().getTime()), new BigDecimal(5000))
+        );
     }
 
     /**
      * Tests whether the timeout gets set to 10 seconds when processing a url
-     * @throws SQLException
      */
     @Test
-    public void testTimeout() throws SQLException {
+    public void testTimeout() throws IOException, SQLException {
         Context context = mock(Context.class);
-        String URL = "http://bla.com";
 
-        RequestConfig.Builder requestConfig = mock(RequestConfig.Builder.class);
-        doReturn(requestConfig).when(openUrlService).getRequestConfigBuilder();
-        doReturn(requestConfig).when(requestConfig).setConnectTimeout(10 * 1000);
-        doReturn(RequestConfig.custom().build()).when(requestConfig).build();
+        // 1. verify processUrl calls getHttpClient and getHttpClientRequestConfig once
+        doReturn(createMockHttpResponse(HttpURLConnection.HTTP_OK)).when(httpClient).execute(any());
+        openUrlService.processUrl(context, "test-url");
+        verify(openUrlService).getHttpClient(any());
+        verify(openUrlService).getHttpClientRequestConfig();
 
-        openUrlService.processUrl(context, URL);
-
-        Mockito.verify(requestConfig).setConnectTimeout(10 * 1000);
+        // 2. verify that getHttpClientRequestConfig sets the timeout
+        assertThat(openUrlService.getHttpClientRequestConfig().getConnectTimeout(), is(10 * 1000));
     }
 }
diff --git a/dspace-api/src/test/java/org/dspace/statistics/util/IPTableTest.java b/dspace-api/src/test/java/org/dspace/statistics/util/IPTableTest.java
index 320cc55a0d..1dbbdb6cd0 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/util/IPTableTest.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/util/IPTableTest.java
@@ -56,14 +56,15 @@ public class IPTableTest {
         IPTable instance = new IPTable();
         // Add IP address
         instance.add(LOCALHOST);
-        // Add IP range
+        // Add IP range (contains 256 addresses)
         instance.add("192.168.1");
 
-        // Make sure both exist
+        // Make sure it returns the addresses for all ranges
         Set<String> ipSet = instance.toSet();
-        assertEquals(2, ipSet.size());
+        assertEquals(257, ipSet.size());
         assertTrue(ipSet.contains(LOCALHOST));
-        assertTrue(ipSet.contains("192.168.1"));
+        assertTrue(ipSet.contains("192.168.1.0"));
+        assertTrue(ipSet.contains("192.168.1.255"));
     }
 
     @Test
@@ -76,13 +77,13 @@ public class IPTableTest {
         assertEquals(1, instance.toSet().size());
 
         instance = new IPTable();
-        // Add IP range & then add an IP from within that range
+        // Add IP range w/ 256 addresses & then add an IP from within that range
         instance.add("192.168.1");
         instance.add("192.168.1.1");
         // Verify only the range exists
         Set<String> ipSet = instance.toSet();
-        assertEquals(1, ipSet.size());
-        assertTrue(ipSet.contains("192.168.1"));
+        assertEquals(256, ipSet.size());
+        assertTrue(ipSet.contains("192.168.1.1"));
 
         instance = new IPTable();
         // Now, switch order. Add IP address, then add a range encompassing that IP
@@ -90,8 +91,8 @@ public class IPTableTest {
         instance.add("192.168.1");
         // Verify only the range exists
         ipSet = instance.toSet();
-        assertEquals(1, ipSet.size());
-        assertTrue(ipSet.contains("192.168.1"));
+        assertEquals(256, ipSet.size());
+        assertTrue(ipSet.contains("192.168.1.1"));
     }
 
     /**
@@ -120,6 +121,48 @@ public class IPTableTest {
         assertTrue("IP within an add()ed range should match", contains);
     }
 
+    @Test
+    public void testDashRangeContains() throws Exception {
+        IPTable instance = new IPTable();
+        instance.add("192.168.0.0 - 192.168.0.245");
+
+        assertTrue("Range should contain lower limit", instance.contains("192.168.0.0"));
+        assertTrue("Range should contain upper limit", instance.contains("192.168.0.245"));
+        assertTrue("Range should contain value in between limits", instance.contains("192.168.0.123"));
+        assertTrue("Range should contain value in between limits", instance.contains("192.168.0.234"));
+
+        assertFalse("Range should not contain value below lower limit", instance.contains("192.167.255.255"));
+        assertFalse("Range should not contain value above upper limit", instance.contains("192.168.0.246"));
+    }
+
+    @Test
+    public void testSubnetRangeContains() throws Exception {
+        IPTable instance = new IPTable();
+        instance.add("192.168.0.0/30");  // translates to 192.168.0.0 - 192.168.0.3
+
+        assertTrue("Range should contain lower limit", instance.contains("192.168.0.0"));
+        assertTrue("Range should contain upper limit", instance.contains("192.168.0.3"));
+        assertTrue("Range should contain values in between limits", instance.contains("192.168.0.1"));
+        assertTrue("Range should contain values in between limits", instance.contains("192.168.0.2"));
+
+        assertFalse("Range should not contain value below lower limit", instance.contains("192.167.255.255"));
+        assertFalse("Range should not contain value above upper limit", instance.contains("192.168.0.4"));
+    }
+
+    @Test
+    public void testImplicitRangeContains() throws Exception {
+        IPTable instance = new IPTable();
+        instance.add("192.168.1");
+
+        assertTrue("Range should contain lower limit", instance.contains("192.168.1.0"));
+        assertTrue("Range should contain upper limit", instance.contains("192.168.1.255"));
+        assertTrue("Range should contain values in between limits", instance.contains("192.168.1.123"));
+        assertTrue("Range should contain values in between limits", instance.contains("192.168.1.234"));
+
+        assertFalse("Range should not contain value below lower limit", instance.contains("192.168.0.0"));
+        assertFalse("Range should not contain value above upper limit", instance.contains("192.168.2.0"));
+    }
+
     /**
      * Test of isEmpty method, of class IPTable.
      * @throws java.lang.Exception passed through.
diff --git a/dspace-api/src/test/java/org/dspace/storage/bitstore/S3BitStoreServiceTest.java b/dspace-api/src/test/java/org/dspace/storage/bitstore/S3BitStoreServiceTest.java
new file mode 100644
index 0000000000..920fb9316c
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/storage/bitstore/S3BitStoreServiceTest.java
@@ -0,0 +1,480 @@
+/**
+ * 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/
+ */
+package org.dspace.storage.bitstore;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.startsWith;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.function.Supplier;
+
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.GetObjectRequest;
+import com.amazonaws.services.s3.model.PutObjectRequest;
+import com.amazonaws.services.s3.model.PutObjectResult;
+import com.amazonaws.services.s3.model.S3Object;
+import com.amazonaws.services.s3.model.S3ObjectInputStream;
+import com.amazonaws.services.s3.transfer.TransferManager;
+import com.amazonaws.services.s3.transfer.Upload;
+import com.amazonaws.services.s3.transfer.model.UploadResult;
+import org.apache.commons.io.FileUtils;
+import org.dspace.AbstractUnitTest;
+import org.dspace.content.Bitstream;
+import org.dspace.curate.Utils;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+
+
+
+/**
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ *
+ */
+public class S3BitStoreServiceTest extends AbstractUnitTest {
+
+    private S3BitStoreService s3BitStoreService;
+
+    @Mock
+    private AmazonS3Client s3Service;
+
+    @Mock
+    private TransferManager tm;
+
+    @Mock
+    private Bitstream bitstream;
+
+    @Mock
+    private Bitstream externalBitstream;
+
+    @Before
+    public void setUp() throws Exception {
+        this.s3BitStoreService = new S3BitStoreService(s3Service, tm);
+    }
+
+    private Supplier<AmazonS3> mockedServiceSupplier() {
+        return () -> this.s3Service;
+    }
+
+    @Test
+    public void givenBucketWhenInitThenUsesSameBucket() throws IOException {
+        String bucketName = "Bucket0";
+        s3BitStoreService.setBucketName(bucketName);
+        when(this.s3Service.doesBucketExist(bucketName)).thenReturn(false);
+
+        assertThat(s3BitStoreService.getAwsRegionName(), isEmptyOrNullString());
+
+        this.s3BitStoreService.init();
+
+        verify(this.s3Service).doesBucketExist(bucketName);
+        verify(this.s3Service, Mockito.times(1)).createBucket(bucketName);
+        assertThat(s3BitStoreService.getAwsAccessKey(), isEmptyOrNullString());
+        assertThat(s3BitStoreService.getAwsSecretKey(), isEmptyOrNullString());
+        assertThat(s3BitStoreService.getAwsRegionName(), isEmptyOrNullString());
+    }
+
+    @Test
+    public void givenEmptyBucketWhenInitThenUsesDefaultBucket() throws IOException {
+        assertThat(s3BitStoreService.getBucketName(), isEmptyOrNullString());
+        when(this.s3Service.doesBucketExist(startsWith(S3BitStoreService.DEFAULT_BUCKET_PREFIX))).thenReturn(false);
+        assertThat(s3BitStoreService.getAwsRegionName(), isEmptyOrNullString());
+
+        this.s3BitStoreService.init();
+
+        verify(this.s3Service, Mockito.times(1)).createBucket(startsWith(S3BitStoreService.DEFAULT_BUCKET_PREFIX));
+        assertThat(s3BitStoreService.getBucketName(), Matchers.startsWith(S3BitStoreService.DEFAULT_BUCKET_PREFIX));
+        assertThat(s3BitStoreService.getAwsAccessKey(), isEmptyOrNullString());
+        assertThat(s3BitStoreService.getAwsSecretKey(), isEmptyOrNullString());
+        assertThat(s3BitStoreService.getAwsRegionName(), isEmptyOrNullString());
+    }
+
+    @Test
+    public void givenAccessKeysWhenInitThenVerifiesCorrectBuilderCreation() throws IOException {
+        assertThat(s3BitStoreService.getAwsAccessKey(), isEmptyOrNullString());
+        assertThat(s3BitStoreService.getAwsSecretKey(), isEmptyOrNullString());
+        assertThat(s3BitStoreService.getBucketName(), isEmptyOrNullString());
+        assertThat(s3BitStoreService.getAwsRegionName(), isEmptyOrNullString());
+        when(this.s3Service.doesBucketExist(startsWith(S3BitStoreService.DEFAULT_BUCKET_PREFIX))).thenReturn(false);
+
+        final String awsAccessKey = "ACCESS_KEY";
+        final String awsSecretKey = "SECRET_KEY";
+
+        this.s3BitStoreService.setAwsAccessKey(awsAccessKey);
+        this.s3BitStoreService.setAwsSecretKey(awsSecretKey);
+
+        try (MockedStatic<S3BitStoreService> mockedS3BitStore = Mockito.mockStatic(S3BitStoreService.class)) {
+            mockedS3BitStore
+                .when(() ->
+                    S3BitStoreService.amazonClientBuilderBy(
+                            ArgumentMatchers.any(Regions.class),
+                            ArgumentMatchers.argThat(
+                                    credentials ->
+                                        awsAccessKey.equals(credentials.getAWSAccessKeyId()) &&
+                                        awsSecretKey.equals(credentials.getAWSSecretKey())
+                            )
+                     )
+                 )
+                .thenReturn(this.mockedServiceSupplier());
+
+            this.s3BitStoreService.init();
+
+            mockedS3BitStore.verify(
+                    () ->
+                    S3BitStoreService.amazonClientBuilderBy(
+                            ArgumentMatchers.any(Regions.class),
+                            ArgumentMatchers.argThat(
+                                    credentials ->
+                                        awsAccessKey.equals(credentials.getAWSAccessKeyId()) &&
+                                        awsSecretKey.equals(credentials.getAWSSecretKey())
+                            )
+                    )
+            );
+        }
+
+
+        verify(this.s3Service, Mockito.times(1)).createBucket(startsWith(S3BitStoreService.DEFAULT_BUCKET_PREFIX));
+        assertThat(s3BitStoreService.getBucketName(), Matchers.startsWith(S3BitStoreService.DEFAULT_BUCKET_PREFIX));
+        assertThat(s3BitStoreService.getAwsAccessKey(), Matchers.equalTo(awsAccessKey));
+        assertThat(s3BitStoreService.getAwsSecretKey(), Matchers.equalTo(awsSecretKey));
+        assertThat(s3BitStoreService.getAwsRegionName(), isEmptyOrNullString());
+    }
+
+    @Test
+    public void givenBucketBitStreamIdInputStreamWhenRetrievingFromS3ThenUsesBucketBitStreamId() throws IOException {
+        String bucketName = "BucketTest";
+        String bitStreamId = "BitStreamId";
+        this.s3BitStoreService.setBucketName(bucketName);
+        this.s3BitStoreService.setUseRelativePath(false);
+        when(bitstream.getInternalId()).thenReturn(bitStreamId);
+
+        S3Object object = Mockito.mock(S3Object.class);
+        S3ObjectInputStream inputStream = Mockito.mock(S3ObjectInputStream.class);
+        when(object.getObjectContent()).thenReturn(inputStream);
+        when(this.s3Service.getObject(ArgumentMatchers.any(GetObjectRequest.class))).thenReturn(object);
+
+        this.s3BitStoreService.init();
+        assertThat(this.s3BitStoreService.get(bitstream), Matchers.equalTo(inputStream));
+
+        verify(this.s3Service).getObject(
+                ArgumentMatchers.argThat(
+                    request ->
+                    bucketName.contentEquals(request.getBucketName()) &&
+                    bitStreamId.contentEquals(request.getKey())
+                )
+        );
+
+    }
+
+    @Test
+    public void givenBucketBitStreamIdWhenNothingFoundOnS3ThenReturnsNull() throws IOException {
+        String bucketName = "BucketTest";
+        String bitStreamId = "BitStreamId";
+        this.s3BitStoreService.setBucketName(bucketName);
+        this.s3BitStoreService.setUseRelativePath(false);
+        when(bitstream.getInternalId()).thenReturn(bitStreamId);
+
+        when(this.s3Service.getObject(ArgumentMatchers.any(GetObjectRequest.class))).thenReturn(null);
+
+        this.s3BitStoreService.init();
+        assertThat(this.s3BitStoreService.get(bitstream), Matchers.nullValue());
+
+        verify(this.s3Service).getObject(
+                ArgumentMatchers.argThat(
+                        request ->
+                        bucketName.contentEquals(request.getBucketName()) &&
+                        bitStreamId.contentEquals(request.getKey())
+                )
+         );
+
+    }
+
+    @Test
+    public void givenSubFolderWhenRequestsItemFromS3ThenTheIdentifierShouldHaveProperPath() throws IOException {
+        String bucketName = "BucketTest";
+        String bitStreamId = "012345";
+        String subfolder = "/test/DSpace7/";
+        this.s3BitStoreService.setBucketName(bucketName);
+        this.s3BitStoreService.setUseRelativePath(false);
+        this.s3BitStoreService.setSubfolder(subfolder);
+        when(bitstream.getInternalId()).thenReturn(bitStreamId);
+
+        S3Object object = Mockito.mock(S3Object.class);
+        S3ObjectInputStream inputStream = Mockito.mock(S3ObjectInputStream.class);
+        when(object.getObjectContent()).thenReturn(inputStream);
+        when(this.s3Service.getObject(ArgumentMatchers.any(GetObjectRequest.class))).thenReturn(object);
+
+        this.s3BitStoreService.init();
+        assertThat(this.s3BitStoreService.get(bitstream), Matchers.equalTo(inputStream));
+
+        verify(this.s3Service).getObject(
+                ArgumentMatchers.argThat(
+                    request ->
+                    bucketName.equals(request.getBucketName()) &&
+                    request.getKey().startsWith(subfolder) &&
+                    request.getKey().contains(bitStreamId) &&
+                    !request.getKey().contains(File.separator + File.separator)
+                )
+        );
+
+    }
+
+    @Test
+    public void handleRegisteredIdentifierPrefixInS3() {
+        String trueBitStreamId = "012345";
+        String registeredBitstreamId = s3BitStoreService.REGISTERED_FLAG + trueBitStreamId;
+        // Should be detected as registered bitstream
+        assertTrue(this.s3BitStoreService.isRegisteredBitstream(registeredBitstreamId));
+    }
+
+    @Test
+    public void stripRegisteredBitstreamPrefixWhenCalculatingPath() {
+        // Set paths and IDs
+        String s3Path = "UNIQUE_S3_PATH/test/bitstream.pdf";
+        String registeredBitstreamId = s3BitStoreService.REGISTERED_FLAG + s3Path;
+        // Paths should be equal, since the getRelativePath method should strip the registered -R prefix
+        String relativeRegisteredPath = this.s3BitStoreService.getRelativePath(registeredBitstreamId);
+        assertEquals(s3Path, relativeRegisteredPath);
+    }
+
+    @Test
+    public void givenBitStreamIdentifierLongerThanPossibleWhenIntermediatePathIsComputedThenIsSplittedAndTruncated() {
+        String path = "01234567890123456789";
+        String computedPath = this.s3BitStoreService.getIntermediatePath(path);
+        String expectedPath = "01" + File.separator + "23" + File.separator + "45" + File.separator;
+        assertThat(computedPath, equalTo(expectedPath));
+    }
+
+    @Test
+    public void givenBitStreamIdentifierShorterThanAFolderLengthWhenIntermediatePathIsComputedThenIsSingleFolder() {
+        String path = "0";
+        String computedPath = this.s3BitStoreService.getIntermediatePath(path);
+        String expectedPath = "0" + File.separator;
+        assertThat(computedPath, equalTo(expectedPath));
+    }
+
+    @Test
+    public void givenPartialBitStreamIdentifierWhenIntermediatePathIsComputedThenIsCompletlySplitted() {
+        String path = "01234";
+        String computedPath = this.s3BitStoreService.getIntermediatePath(path);
+        String expectedPath = "01" + File.separator + "23" + File.separator + "4" + File.separator;
+        assertThat(computedPath, equalTo(expectedPath));
+    }
+
+    @Test
+    public void givenMaxLengthBitStreamIdentifierWhenIntermediatePathIsComputedThenIsSplittedAllAsSubfolder() {
+        String path = "012345";
+        String computedPath = this.s3BitStoreService.getIntermediatePath(path);
+        String expectedPath = "01" + File.separator + "23" + File.separator + "45" + File.separator;
+        assertThat(computedPath, equalTo(expectedPath));
+    }
+
+    @Test
+    public void givenBitStreamIdentifierWhenIntermediatePathIsComputedThenNotEndingDoubleSlash() throws IOException {
+        StringBuilder path = new StringBuilder("01");
+        String computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        int slashes = computeSlashes(path.toString());
+        assertThat(computedPath, Matchers.endsWith(File.separator));
+        assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes));
+
+        path.append("2");
+        computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        assertThat(computedPath, Matchers.not(Matchers.endsWith(File.separator + File.separator)));
+
+        path.append("3");
+        computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        assertThat(computedPath, Matchers.not(Matchers.endsWith(File.separator + File.separator)));
+
+        path.append("4");
+        computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        assertThat(computedPath, Matchers.not(Matchers.endsWith(File.separator + File.separator)));
+
+        path.append("56789");
+        computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        assertThat(computedPath, Matchers.not(Matchers.endsWith(File.separator + File.separator)));
+    }
+
+    @Test
+    public void givenBitStreamIdentidierWhenIntermediatePathIsComputedThenMustBeSplitted() throws IOException {
+        StringBuilder path = new StringBuilder("01");
+        String computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        int slashes = computeSlashes(path.toString());
+        assertThat(computedPath, Matchers.endsWith(File.separator));
+        assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes));
+
+        path.append("2");
+        computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        slashes = computeSlashes(path.toString());
+        assertThat(computedPath, Matchers.endsWith(File.separator));
+        assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes));
+
+        path.append("3");
+        computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        slashes = computeSlashes(path.toString());
+        assertThat(computedPath, Matchers.endsWith(File.separator));
+        assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes));
+
+        path.append("4");
+        computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        slashes = computeSlashes(path.toString());
+        assertThat(computedPath, Matchers.endsWith(File.separator));
+        assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes));
+
+        path.append("56789");
+        computedPath = this.s3BitStoreService.getIntermediatePath(path.toString());
+        slashes = computeSlashes(path.toString());
+        assertThat(computedPath, Matchers.endsWith(File.separator));
+        assertThat(computedPath.split(File.separator).length, Matchers.equalTo(slashes));
+    }
+
+    @Test
+    public void givenBitStreamIdentifierWithSlashesWhenSanitizedThenSlashesMustBeRemoved() {
+        String sInternalId = new StringBuilder("01")
+                                .append(File.separator)
+                                .append("22")
+                                .append(File.separator)
+                                .append("33")
+                                .append(File.separator)
+                                .append("4455")
+                                .toString();
+        String computedPath = this.s3BitStoreService.sanitizeIdentifier(sInternalId);
+        assertThat(computedPath, Matchers.not(Matchers.startsWith(File.separator)));
+        assertThat(computedPath, Matchers.not(Matchers.endsWith(File.separator)));
+        assertThat(computedPath, Matchers.not(Matchers.containsString(File.separator)));
+    }
+
+    @Test
+    public void givenBitStreamWhenRemoveThenCallS3DeleteMethod() throws Exception {
+        String bucketName = "BucketTest";
+        String bitStreamId = "BitStreamId";
+        this.s3BitStoreService.setBucketName(bucketName);
+        this.s3BitStoreService.setUseRelativePath(false);
+        when(bitstream.getInternalId()).thenReturn(bitStreamId);
+
+        this.s3BitStoreService.init();
+        this.s3BitStoreService.remove(bitstream);
+
+        verify(this.s3Service, Mockito.times(1)).deleteObject(ArgumentMatchers.eq(bucketName),
+                ArgumentMatchers.eq(bitStreamId));
+
+    }
+
+    @Test
+    public void givenBitStreamWhenPutThenCallS3PutMethodAndStoresInBitStream() throws Exception {
+        String bucketName = "BucketTest";
+        String bitStreamId = "BitStreamId";
+        this.s3BitStoreService.setBucketName(bucketName);
+        this.s3BitStoreService.setUseRelativePath(false);
+        when(bitstream.getInternalId()).thenReturn(bitStreamId);
+
+        File file = Mockito.mock(File.class);
+        InputStream in = Mockito.mock(InputStream.class);
+        PutObjectResult putObjectResult = Mockito.mock(PutObjectResult.class);
+        Upload upload = Mockito.mock(Upload.class);
+        UploadResult uploadResult = Mockito.mock(UploadResult.class);
+        when(upload.waitForUploadResult()).thenReturn(uploadResult);
+        String mockedTag = "1a7771d5fdd7bfdfc84033c70b1ba555";
+        when(file.length()).thenReturn(8L);
+        try (MockedStatic<File> fileMock = Mockito.mockStatic(File.class)) {
+            try (MockedStatic<FileUtils> fileUtilsMock = Mockito.mockStatic(FileUtils.class)) {
+                try (MockedStatic<Utils> curateUtils = Mockito.mockStatic(Utils.class)) {
+                    curateUtils.when(() -> Utils.checksum((File) ArgumentMatchers.any(), ArgumentMatchers.any()))
+                            .thenReturn(mockedTag);
+
+                fileMock
+                    .when(() -> File.createTempFile(ArgumentMatchers.any(), ArgumentMatchers.any()))
+                    .thenReturn(file);
+
+                when(this.tm.upload(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any()))
+                        .thenReturn(upload);
+
+                this.s3BitStoreService.init();
+                this.s3BitStoreService.put(bitstream, in);
+                }
+            }
+
+        }
+
+        verify(this.bitstream, Mockito.times(1)).setSizeBytes(
+                ArgumentMatchers.eq(8L)
+         );
+
+        verify(this.bitstream, Mockito.times(1)).setChecksum(
+                ArgumentMatchers.eq(mockedTag)
+         );
+
+        verify(this.tm, Mockito.times(1)).upload(
+            ArgumentMatchers.eq(bucketName),
+            ArgumentMatchers.eq(bitStreamId),
+            ArgumentMatchers.eq(file)
+         );
+
+        verify(file, Mockito.times(1)).delete();
+
+    }
+
+    @Test
+    public void givenBitStreamWhenCallingPutFileCopyingThrowsIOExceptionPutThenFileIsRemovedAndStreamClosed()
+            throws Exception {
+        String bucketName = "BucketTest";
+        String bitStreamId = "BitStreamId";
+        this.s3BitStoreService.setBucketName(bucketName);
+        this.s3BitStoreService.setUseRelativePath(false);
+        when(bitstream.getInternalId()).thenReturn(bitStreamId);
+
+        File file = Mockito.mock(File.class);
+        InputStream in = Mockito.mock(InputStream.class);
+        try (MockedStatic<File> fileMock = Mockito.mockStatic(File.class)) {
+            try (MockedStatic<FileUtils> fileUtilsMock = Mockito.mockStatic(FileUtils.class)) {
+                fileUtilsMock
+                    .when(() -> FileUtils.copyInputStreamToFile(ArgumentMatchers.any(), ArgumentMatchers.any()))
+                    .thenThrow(IOException.class);
+                fileMock
+                    .when(() -> File.createTempFile(ArgumentMatchers.any(), ArgumentMatchers.any()))
+                    .thenReturn(file);
+
+                this.s3BitStoreService.init();
+                assertThrows(IOException.class, () -> this.s3BitStoreService.put(bitstream, in));
+            }
+
+        }
+
+        verify(this.bitstream, Mockito.never()).setSizeBytes(ArgumentMatchers.any(Long.class));
+
+        verify(this.bitstream, Mockito.never()).setChecksum(ArgumentMatchers.any(String.class));
+
+        verify(this.s3Service, Mockito.never()).putObject(ArgumentMatchers.any(PutObjectRequest.class));
+
+        verify(file, Mockito.times(1)).delete();
+
+    }
+
+    private int computeSlashes(String internalId) {
+        int minimum = internalId.length();
+        int slashesPerLevel = minimum / S3BitStoreService.digitsPerLevel;
+        int odd = Math.min(1, minimum % S3BitStoreService.digitsPerLevel);
+        int slashes = slashesPerLevel + odd;
+        return Math.min(slashes, S3BitStoreService.directoryLevels);
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/util/DoiCheckTest.java b/dspace-api/src/test/java/org/dspace/util/DoiCheckTest.java
new file mode 100644
index 0000000000..17e21779d4
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/util/DoiCheckTest.java
@@ -0,0 +1,65 @@
+/**
+ * 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/
+ */
+package org.dspace.util;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.dspace.importer.external.service.DoiCheck;
+import org.junit.Test;
+
+/**
+ * Test class for the DoiCheck
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class DoiCheckTest {
+
+    @Test
+    public void checkDOIsTest() throws ParseException {
+        for (String doi : DOIsToTest()) {
+            assertTrue("The: " + doi + "  is a doi!", DoiCheck.isDoi(doi));
+        }
+    }
+
+    @Test
+    public void checkWrongDOIsTest() throws ParseException {
+        for (String key : wrongDOIsToTest()) {
+            assertFalse("This : " + key + "  isn't a doi!", DoiCheck.isDoi(key));
+        }
+    }
+
+    private List<String> DOIsToTest() {
+        return Arrays.asList(
+            "10.1430/8105",
+            "10.1038/nphys1170",
+            "10.1002/0470841559.ch1",
+            "10.1594/PANGAEA.726855",
+            "10.1594/GFZ.GEOFON.gfz2009kciu",
+            "10.3866/PKU.WHXB201112303",
+            "10.11467/isss2003.7.1_11",
+            "10.3972/water973.0145.db"
+        );
+    }
+
+    private List<String> wrongDOIsToTest() {
+        return Arrays.asList(
+            StringUtils.EMPTY,
+            "123456789",
+            "nphys1170/10.1038",
+            "10.", "10",
+            "10.1038/"
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/util/RelationshipVersioningTestUtils.java b/dspace-api/src/test/java/org/dspace/util/RelationshipVersioningTestUtils.java
new file mode 100644
index 0000000000..68f73734af
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/util/RelationshipVersioningTestUtils.java
@@ -0,0 +1,53 @@
+/**
+ * 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/
+ */
+package org.dspace.util;
+
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import org.dspace.content.Item;
+import org.dspace.content.Relationship.LatestVersionStatus;
+import org.dspace.content.RelationshipType;
+import org.hamcrest.Matcher;
+
+/**
+ * Methods for testing relationships and their behavior with versioned items.
+ */
+public class RelationshipVersioningTestUtils {
+
+    private RelationshipVersioningTestUtils() {}
+
+    public static Matcher<Object> isRel(
+        Item leftItem, RelationshipType relationshipType, Item rightItem, LatestVersionStatus latestVersionStatus,
+        int leftPlace, int rightPlace
+    ) {
+        return isRel(leftItem, relationshipType, rightItem, latestVersionStatus, null, null, leftPlace, rightPlace);
+    }
+
+    public static Matcher<Object> isRel(
+        Item leftItem, RelationshipType relationshipType, Item rightItem, LatestVersionStatus latestVersionStatus,
+        String leftwardValue, String rightwardValue, int leftPlace, int rightPlace
+    ) {
+        return allOf(
+            hasProperty("leftItem", is(leftItem)),
+            // NOTE: this is a painful one... class RelationshipType does not implement the equals method, so we cannot
+            //       rely on object equality and have to compare ids instead. It has to be in capital letters,
+            //       because the getter has been implemented inconsistently (#id vs #setId() vs #getID()).
+            hasProperty("relationshipType", hasProperty("ID", is(relationshipType.getID()))),
+            hasProperty("rightItem", is(rightItem)),
+            hasProperty("leftPlace", is(leftPlace)),
+            hasProperty("rightPlace", is(rightPlace)),
+            hasProperty("leftwardValue", leftwardValue == null ? nullValue() : is(leftwardValue)),
+            hasProperty("rightwardValue", rightwardValue == null ? nullValue() : is(rightwardValue)),
+            hasProperty("latestVersionStatus", is(latestVersionStatus))
+        );
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/util/SimpleMapConverterTest.java b/dspace-api/src/test/java/org/dspace/util/SimpleMapConverterTest.java
new file mode 100644
index 0000000000..b380c4e7ba
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/util/SimpleMapConverterTest.java
@@ -0,0 +1,171 @@
+/**
+ * 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/
+ */
+package org.dspace.util;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.FileUtils;
+import org.dspace.services.ConfigurationService;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+/**
+ * Unit tests for {@link SimpleMapConverter}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SimpleMapConverterTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Mock
+    private ConfigurationService configurationService;
+
+    private File dspaceDir;
+
+    private File crosswalksDir;
+
+    @Before
+    public void before() throws IOException {
+        dspaceDir = folder.getRoot();
+        crosswalksDir = folder.newFolder("config", "crosswalks");
+    }
+
+    @Test
+    public void testPropertiesParsing() throws IOException {
+
+        when(configurationService.getProperty("dspace.dir")).thenReturn(dspaceDir.getAbsolutePath());
+        createFileInFolder(crosswalksDir, "test.properties", "key1=value1\nkey2=value2\nkey3=value3");
+
+        SimpleMapConverter simpleMapConverter = new SimpleMapConverter();
+        simpleMapConverter.setConfigurationService(configurationService);
+        simpleMapConverter.setConverterNameFile("test.properties");
+
+        simpleMapConverter.init();
+
+        assertThat(simpleMapConverter.getValue("key1"), is("value1"));
+        assertThat(simpleMapConverter.getValue("key2"), is("value2"));
+        assertThat(simpleMapConverter.getValue("key3"), is("value3"));
+        assertThat(simpleMapConverter.getValue(""), is(""));
+        assertThat(simpleMapConverter.getValue(null), nullValue());
+
+        assertThat(simpleMapConverter.getValue("key4"), is("key4"));
+
+    }
+
+    @Test
+    public void testPropertiesParsingWithDefaultValue() throws IOException {
+
+        when(configurationService.getProperty("dspace.dir")).thenReturn(dspaceDir.getAbsolutePath());
+        createFileInFolder(crosswalksDir, "test.properties", "key1=value1\nkey2=value2\nkey3=value3");
+
+        SimpleMapConverter simpleMapConverter = new SimpleMapConverter();
+        simpleMapConverter.setConfigurationService(configurationService);
+        simpleMapConverter.setConverterNameFile("test.properties");
+        simpleMapConverter.setDefaultValue("default");
+
+        simpleMapConverter.init();
+
+        assertThat(simpleMapConverter.getValue("key1"), is("value1"));
+        assertThat(simpleMapConverter.getValue("key2"), is("value2"));
+        assertThat(simpleMapConverter.getValue("key3"), is("value3"));
+        assertThat(simpleMapConverter.getValue(""), is("default"));
+        assertThat(simpleMapConverter.getValue(null), is("default"));
+
+        assertThat(simpleMapConverter.getValue("key4"), is("default"));
+
+    }
+
+    @Test
+    public void testPropertiesParsingWithAnUnexistingFile() throws IOException {
+
+        when(configurationService.getProperty("dspace.dir")).thenReturn(dspaceDir.getAbsolutePath());
+
+        SimpleMapConverter simpleMapConverter = new SimpleMapConverter();
+        simpleMapConverter.setConfigurationService(configurationService);
+        simpleMapConverter.setConverterNameFile("test.properties");
+
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+            () -> simpleMapConverter.init());
+
+        // Get path separator used for this platform (eg. / for Linux, \ for Windows)
+        String separator = File.separator;
+
+        assertThat(exception.getMessage(),
+            is("An error occurs parsing " + dspaceDir.getAbsolutePath() + separator + "config" + separator
+                    + "crosswalks" + separator + "test.properties"));
+
+        Throwable cause = exception.getCause();
+        assertThat(cause, notNullValue());
+        assertThat(cause, instanceOf(FileNotFoundException.class));
+
+    }
+
+    @Test
+    public void testPropertiesParsingWithCorruptedFile() throws IOException {
+
+        when(configurationService.getProperty("dspace.dir")).thenReturn(dspaceDir.getAbsolutePath());
+        createFileInFolder(crosswalksDir, "test.properties", "key1=value1\nkey2\nkey3=value3");
+
+        SimpleMapConverter simpleMapConverter = new SimpleMapConverter();
+        simpleMapConverter.setConfigurationService(configurationService);
+        simpleMapConverter.setConverterNameFile("test.properties");
+
+        simpleMapConverter.init();
+
+        assertThat(simpleMapConverter.getValue("key1"), is("value1"));
+        assertThat(simpleMapConverter.getValue("key2"), is("key2"));
+        assertThat(simpleMapConverter.getValue("key3"), is("value3"));
+
+        assertThat(simpleMapConverter.getValue("key4"), is("key4"));
+
+
+    }
+
+    @Test
+    public void testPropertiesParsingWithEmptyFile() throws IOException {
+
+        when(configurationService.getProperty("dspace.dir")).thenReturn(dspaceDir.getAbsolutePath());
+        createFileInFolder(crosswalksDir, "test.properties", "");
+
+        SimpleMapConverter simpleMapConverter = new SimpleMapConverter();
+        simpleMapConverter.setConfigurationService(configurationService);
+        simpleMapConverter.setConverterNameFile("test.properties");
+
+        simpleMapConverter.init();
+
+        assertThat(simpleMapConverter.getValue("key1"), is("key1"));
+        assertThat(simpleMapConverter.getValue("key2"), is("key2"));
+
+    }
+
+    private void createFileInFolder(File folder, String name, String content) throws IOException {
+        File file = new File(folder, name);
+        FileUtils.write(file, content, StandardCharsets.UTF_8);
+    }
+
+}
diff --git a/dspace-api/src/test/resources/org/dspace/app/itemimport/dublin_core-person.xml b/dspace-api/src/test/resources/org/dspace/app/itemimport/dublin_core-person.xml
new file mode 100644
index 0000000000..4d530630ba
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/itemimport/dublin_core-person.xml
@@ -0,0 +1,3 @@
+<dublin_core>
+    <dcvalue element="title" qualifier="none">Person Test</dcvalue>
+</dublin_core>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/itemimport/dublin_core.xml b/dspace-api/src/test/resources/org/dspace/app/itemimport/dublin_core.xml
new file mode 100644
index 0000000000..a1afbb417a
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/itemimport/dublin_core.xml
@@ -0,0 +1,5 @@
+<dublin_core>
+    <dcvalue element="title" qualifier="none">A Tale of Two Cities</dcvalue>
+    <dcvalue element="date" qualifier="issued">1990</dcvalue>
+    <dcvalue element="title" qualifier="alternative" language="fr">J'aime les Printemps</dcvalue>
+</dublin_core>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/itemimport/metadata_dcterms.xml b/dspace-api/src/test/resources/org/dspace/app/itemimport/metadata_dcterms.xml
new file mode 100644
index 0000000000..8d8e3a8d54
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/itemimport/metadata_dcterms.xml
@@ -0,0 +1,3 @@
+<dublin_core schema="dcterms">
+    <dcvalue element="title" qualifier="none">A Tale of Two Cities</dcvalue>
+</dublin_core>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/itemimport/relationships b/dspace-api/src/test/resources/org/dspace/app/itemimport/relationships
new file mode 100644
index 0000000000..e8ec1985ce
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/itemimport/relationships
@@ -0,0 +1 @@
+relation.isAuthorOfPublication folderName:item_001
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/itemimport/saf-bitstreams.zip b/dspace-api/src/test/resources/org/dspace/app/itemimport/saf-bitstreams.zip
new file mode 100755
index 0000000000..35be57e897
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/itemimport/saf-bitstreams.zip differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/itemimport/saf-relationships.zip b/dspace-api/src/test/resources/org/dspace/app/itemimport/saf-relationships.zip
new file mode 100755
index 0000000000..d41e7c6eb8
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/itemimport/saf-relationships.zip differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.csv b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.csv
new file mode 100644
index 0000000000..07c22ff0bf
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.csv
@@ -0,0 +1,4 @@
+row1,row2,row3,row4
+"data1,2","data 2,2","data3,2","data4,2"
+"data1,3","data 2,3","data3,3","data4,3"
+"data1,4","data2,4","data3,4","data4,4"
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/wordtest.doc b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.doc
similarity index 100%
rename from dspace-api/src/test/resources/org/dspace/app/mediafilter/wordtest.doc
rename to dspace-api/src/test/resources/org/dspace/app/mediafilter/test.doc
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/wordtest.docx b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.docx
similarity index 100%
rename from dspace-api/src/test/resources/org/dspace/app/mediafilter/wordtest.docx
rename to dspace-api/src/test/resources/org/dspace/app/mediafilter/test.docx
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.html b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.html
new file mode 100644
index 0000000000..7655f566cc
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.html
@@ -0,0 +1,53 @@
+<html>
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=UTF-8">
+<title>A Text Extraction Test Document for DSpace</title>
+</head>
+
+<body>
+
+<div>
+
+<p style='text-align:center'><span
+style='font-size:15.0pt'>A Text Extraction Test Document</span></p>
+
+<p style='text-align:center'><span
+style='font-size:10.0pt'>for</span></p>
+
+<p style='text-align:center'><span
+style='font-size:15.0pt'>DSpace</span></p>
+
+<p></p>
+
+<p>This is a text. For the next sixty seconds this software
+will conduct a test of the DSpace text extraction facility. This is only a
+text.</p>
+
+<p>This is a paragraph that followed the first that lived in
+the document that Jack built.</p>
+
+<p>Lorem ipsum dolor sit amet. The quick brown fox jumped over
+the lazy dog. Yow! Are we having fun yet?</p>
+
+<p>This has been a test of the DSpace text extraction system.
+In the event of actual content you would care what is written here.</p>
+
+</div>
+
+<br/>
+
+<hr/>
+
+<div>
+
+<p>Tip o’ the hat to the U.S. Emergency Broadcast System for the format that I have
+irreverently borrowed.</p>
+
+</div>
+
+</div>
+
+</body>
+
+</html>
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.odp b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.odp
new file mode 100644
index 0000000000..4701884a8a
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.odp differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.ods b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.ods
new file mode 100644
index 0000000000..94ad873c1a
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.ods differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.odt b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.odt
new file mode 100644
index 0000000000..3c996a1f46
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.odt differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.pdf b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.pdf
new file mode 100644
index 0000000000..5b3749cbff
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.pdf differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.ppt b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.ppt
new file mode 100644
index 0000000000..bb3a3d6b41
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.ppt differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.pptx b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.pptx
new file mode 100644
index 0000000000..2c27ad1630
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.pptx differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.rtf b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.rtf
new file mode 100644
index 0000000000..3b841917b2
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.rtf
@@ -0,0 +1,239 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff46\deff0\stshfdbch45\stshfloch43\stshfhich43\stshfbi46\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f43\fbidi \froman\fcharset0\fprq2 Liberation Serif{\*\falt Times New Roman};}
+{\f44\fbidi \fswiss\fcharset0\fprq2 Liberation Sans{\*\falt Arial};}{\f45\fbidi \froman\fcharset0\fprq0{\*\panose 00000000000000000000}AR PL SungtiL GB;}{\f46\fbidi \froman\fcharset0\fprq0{\*\panose 00000000000000000000}Lohit Hindi;}
+{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1504\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}
+{\f1505\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f1507\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f1508\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f1511\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}
+{\f1512\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}
+{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}
+{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}
+{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}
+{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}
+{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}
+{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f1164\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\f1165\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f1167\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f1168\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f1169\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f1170\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f1171\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f1172\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;
+\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;
+\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af45\langfenp2052 }{\*\defpap 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 
+\fs24\lang1033\langfe2052\loch\f43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 \fs24\lang1033\langfe2052\loch\f43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 \snext11 \ssemihidden \sunhideused 
+Normal Table;}{\*\cs15 \additive \sqformat \spriority0 Footnote Characters;}{\*\cs16 \additive \super \spriority0 Footnote Anchor;}{\*\cs17 \additive \super \spriority0 Endnote Anchor;}{\*\cs18 \additive \sqformat \spriority0 Endnote Characters;}{
+\s19\ql \li0\ri0\sb240\sa120\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs28\alang1081 \ltrch\fcs0 \fs28\lang1033\langfe2052\loch\f44\hich\af44\dbch\af45\cgrid\langnp1033\langfenp2052 
+\sbasedon0 \snext20 \sqformat \spriority0 Heading;}{\s20\ql \li0\ri0\sa140\sl288\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 
+\fs24\lang1033\langfe2052\loch\f43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 \sbasedon0 \snext20 \spriority0 Body Text;}{\s21\ql \li0\ri0\sa140\sl288\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 
+\af46\afs24\alang1081 \ltrch\fcs0 \fs24\lang1033\langfe2052\loch\f43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 \sbasedon20 \snext21 \spriority0 List;}{
+\s22\ql \li0\ri0\sb120\sa120\widctlpar\noline\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ai\af46\afs24\alang1081 \ltrch\fcs0 \i\fs24\lang1033\langfe2052\loch\f43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 
+\sbasedon0 \snext22 \sqformat \spriority0 caption;}{\s23\ql \li0\ri0\widctlpar\noline\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 
+\fs24\lang1033\langfe2052\loch\f43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 \sbasedon0 \snext23 \sqformat \spriority0 Index;}{\s24\ql \fi-339\li339\ri0\widctlpar\noline\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin339\itap0 \rtlch\fcs1 
+\af46\afs20\alang1081 \ltrch\fcs0 \fs20\lang1033\langfe2052\loch\f43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 \sbasedon0 \snext24 \spriority0 footnote text;}}{\*\rsidtbl \rsid6097384\rsid16590483\rsid16671749}{\mmathPr\mmathFont34\mbrkBin0
+\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title A Text Extraction Test Document for DSpace}{\author Mark Wood}{\operator Tim Donohue}{\creatim\yr2022\mo3\dy30\hr13\min54}
+{\revtim\yr2022\mo3\dy30\hr13\min54}{\version2}{\edmins0}{\nofpages1}{\nofwords75}{\nofchars433}{\nofcharsws507}{\vern43}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
+\paperw12240\paperh15840\margl1134\margr1134\margt1134\margb1134\gutter0\ltrsect 
+\deftab709\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1
+\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin450\dgvorigin0\dghshow1\dgvshow1
+\jexpand\viewkind5\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\rsidroot6097384\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0
+{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0{\*\ftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 
+\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \chftnsep 
+\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 
+\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \chftnsepc 
+\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 
+\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \chftnsep 
+\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 
+\fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \chftnsepc 
+\par }}\ltrpar \sectd \ltrsect\linex0\headery0\footery0\endnhere\sectunlocked1\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3
+\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
+{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar
+\qc \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af46\afs24\alang1081 \ltrch\fcs0 \fs24\lang1033\langfe2052\loch\af43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af46\afs30 \ltrch\fcs0 
+\fs30\insrsid16671749 \hich\af43\dbch\af45\loch\f43 A Text Extraction Test Document}{\rtlch\fcs1 \af46\afs30 \ltrch\fcs0 \fs30\insrsid6097384 
+\par }{\rtlch\fcs1 \af46\afs20 \ltrch\fcs0 \fs20\insrsid16671749 \hich\af43\dbch\af45\loch\f43 for}{\rtlch\fcs1 \af46\afs20 \ltrch\fcs0 \fs20\insrsid6097384 
+\par }{\rtlch\fcs1 \af46\afs30 \ltrch\fcs0 \fs30\insrsid16671749 \hich\af43\dbch\af45\loch\f43 DSpace}{\rtlch\fcs1 \af46\afs30 \ltrch\fcs0 \fs30\insrsid6097384 
+\par 
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \hich\af43\dbch\af45\loch\f43 
+This is a text.  For the next sixty seconds this software will conduct a test of the DSpace text extraction facility.  This is only a text.}{\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid6097384 
+\par 
+\par }{\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \hich\af43\dbch\af45\loch\f43 This is a paragraph that followed the first that lived in the \hich\af43\dbch\af45\loch\f43 document that Jack built.}{\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid6097384 
+\par 
+\par }{\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \hich\af43\dbch\af45\loch\f43 Lorem ipsum dolor sit amet.  The quick brown fox jumped over the lazy dog.  Yow! Are we having fun yet?}{\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid6097384 
+\par 
+\par }{\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \hich\af43\dbch\af45\loch\f43 This has been a test of the DSpace text extraction system.  In the event of actual content you would care what is written he\hich\af43\dbch\af45\loch\f43 re.}{\rtlch\fcs1 
+\af46 \ltrch\fcs0 \cs16\super\insrsid16671749 \chftn {\footnote \ltrpar \pard\plain \ltrpar\s24\ql \fi-339\li339\ri0\widctlpar\noline\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin339\itap0 \rtlch\fcs1 \af46\afs20\alang1081 \ltrch\fcs0 
+\fs20\lang1033\langfe2052\loch\af43\hich\af43\dbch\af45\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid16671749 \chftn \tab \hich\af43\dbch\af45\loch\f43 Tip o\hich\f43 \rquote \loch\f43 
+ the hat to the U.S. Emergency Broadcast System for the format that I have irreverently borrowed.}}}{\rtlch\fcs1 \af46 \ltrch\fcs0 \insrsid6097384 
+\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
+9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
+5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
+b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
+0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
+a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
+c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
+0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
+a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
+6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
+4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
+4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f
+7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd
+ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d
+7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b
+d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52
+fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71
+b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b
+fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567
+9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd
+79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf
+5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2
+d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1
+738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68
+2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac
+5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a
+b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9
+493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2
+be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f
+f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64
+7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e
+b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4
+6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd
+f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d
+7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39
+4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf
+1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a
+faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2
+67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9
+416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27
+1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b
+8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4
+8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65
+2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36
+3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e
+3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985
+0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000
+0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000
+000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000
+7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000
+000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000
+000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
+\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text;
+\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;
+\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;
+\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision;
+\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;
+\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1;
+\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;
+\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;
+\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;
+\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;
+\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;
+\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;
+\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;
+\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;
+\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
+\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
+\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
+\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
+\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
+\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
+\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
+\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
+\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000
+02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
+d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000d0af
+77916744d801feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.txt b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.txt
new file mode 100644
index 0000000000..edd9160b1d
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.txt
@@ -0,0 +1,13 @@
+A Text Extraction Test Document
+for
+DSpace
+
+This is a text.  For the next sixty seconds this software will conduct a test of the DSpace text extraction facility.  This is only a text.
+
+This is a paragraph that followed the first that lived in the document that Jack built.
+
+Lorem ipsum dolor sit amet.  The quick brown fox jumped over the lazy dog.  Yow! Are we having fun yet?
+
+This has been a test of the DSpace text extraction system.  In the event of actual content you would care what is written here.
+
+Tip o’ the hat to the U.S. Emergency Broadcast System for the format that I have irreverently borrowed.
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.xls b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.xls
new file mode 100644
index 0000000000..1ebc20bc38
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.xls differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.xlsx b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.xlsx
new file mode 100644
index 0000000000..47e0f7387f
Binary files /dev/null and b/dspace-api/src/test/resources/org/dspace/app/mediafilter/test.xlsx differ
diff --git a/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277871.xml b/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277871.xml
new file mode 100644
index 0000000000..f5fd30fa13
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277871.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<work:work put-code="277871" path="/0000-0001-9227-636X/work/277871" visibility="public" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+    <common:created-date>2014-01-22T19:11:57.151Z</common:created-date>
+    <common:last-modified-date>2015-06-19T19:14:25.924Z</common:last-modified-date>
+    <common:source>
+        <common:source-orcid>
+            <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+            <common:path>0000-0002-4105-0763</common:path>
+            <common:host>sandbox.orcid.org</common:host>
+        </common:source-orcid>
+        <common:source-client-id>
+            <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+            <common:path>0000-0002-4105-0763</common:path>
+            <common:host>sandbox.orcid.org</common:host>
+        </common:source-client-id>
+        <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+    </common:source>
+    <work:title>
+        <common:title>Branch artery occlusion in a young woman.</common:title>
+    </work:title>
+    <work:citation>
+        <work:citation-type>formatted-unspecified</work:citation-type>
+        <work:citation-value>Gittinger JW, Miller NR, Keltner JL, Burde RM. Branch artery occlusion in a young woman. Surv Ophthalmol. 1985 Jul-Aug; 30(1):52-8.</work:citation-value>
+    </work:citation>
+    <work:type>journal-article</work:type>
+    <common:publication-date>
+        <common:year>1985</common:year>
+        <common:month>07</common:month>
+        <common:day>01</common:day>
+    </common:publication-date>
+</work:work>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277902.xml b/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277902.xml
new file mode 100644
index 0000000000..aeab728543
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277902.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<work:work put-code="277902" path="/0000-0001-9227-636X/work/277902" visibility="public" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+    <common:created-date>2014-01-22T19:11:57.159Z</common:created-date>
+    <common:last-modified-date>2015-06-19T19:14:26.327Z</common:last-modified-date>
+    <common:source>
+        <common:source-orcid>
+            <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+            <common:path>0000-0002-4105-0763</common:path>
+            <common:host>sandbox.orcid.org</common:host>
+        </common:source-orcid>
+        <common:source-client-id>
+            <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+            <common:path>0000-0002-4105-0763</common:path>
+            <common:host>sandbox.orcid.org</common:host>
+        </common:source-client-id>
+        <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+    </common:source>
+    <work:title>
+        <common:title>Another cautionary tale.</common:title>
+    </work:title>
+	<work:journal-title>Journal title</work:journal-title>
+	<work:short-description>Short description</work:short-description>
+    <work:type>journal-article</work:type>
+    <common:publication-date>
+        <common:year>2011</common:year>
+        <common:month>05</common:month>
+        <common:day>01</common:day>
+    </common:publication-date>
+	<work:contributors>
+		<work:contributor>
+			<work:credit-name>Walter White</work:credit-name>
+			<work:contributor-email>walter@test.com</work:contributor-email>
+			<work:contributor-attributes>
+				<work:contributor-sequence>first</work:contributor-sequence>
+				<work:contributor-role>author</work:contributor-role>
+			</work:contributor-attributes>
+		</work:contributor>
+		<work:contributor>
+			<work:credit-name>John White</work:credit-name>
+			<work:contributor-email>john@test.com</work:contributor-email>
+			<work:contributor-attributes>
+				<work:contributor-sequence>additional</work:contributor-sequence>
+				<work:contributor-role>author</work:contributor-role>
+			</work:contributor-attributes>
+		</work:contributor>
+		<work:contributor>
+			<work:credit-name>Jesse Pinkman</work:credit-name>
+			<work:contributor-attributes>
+				<work:contributor-sequence>first</work:contributor-sequence>
+				<work:contributor-role>editor</work:contributor-role>
+			</work:contributor-attributes>
+		</work:contributor>
+	</work:contributors>
+</work:work>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277904.xml b/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277904.xml
new file mode 100644
index 0000000000..980daa490e
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/orcid-works/work-277904.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<work:work put-code="277904" path="/0000-0001-9227-636X/work/277904" visibility="public" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+    <common:created-date>2014-01-22T19:11:57.160Z</common:created-date>
+    <common:last-modified-date>2015-06-19T19:14:26.350Z</common:last-modified-date>
+    <common:source>
+        <common:source-orcid>
+            <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+            <common:path>0000-0002-4105-0763</common:path>
+            <common:host>sandbox.orcid.org</common:host>
+        </common:source-orcid>
+        <common:source-client-id>
+            <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+            <common:path>0000-0002-4105-0763</common:path>
+            <common:host>sandbox.orcid.org</common:host>
+        </common:source-client-id>
+        <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+    </common:source>
+    <work:title>
+        <common:title>The elements of style and the survey of ophthalmology.</common:title>
+    </work:title>
+    <work:citation>
+        <work:citation-type>bibtex</work:citation-type>
+        <work:citation-value>@article{Test,
+				doi = {10.11234.12},
+				year = 2011,
+				month = {nov},
+				publisher = {Elsevier {BV}},
+				volume = {110},
+				pages = {71--83},
+				author = {Walter White},
+				title = {Title from Bibtex: The elements of style and the survey of ophthalmology.},
+				journal = {Test Journal}
+			}
+		</work:citation-value>
+    </work:citation>
+    <work:type>invention</work:type>
+    <common:external-ids>
+		<common:external-id>
+			<common:external-id-type>agr</common:external-id-type>
+			<common:external-id-value>work:external-identifier-id</common:external-id-value>			
+			<common:external-id-url>http://orcid.org</common:external-id-url>
+			<common:external-id-relationship>version-of</common:external-id-relationship>
+		</common:external-id>
+		<common:external-id>
+			<common:external-id-type>doi</common:external-id-type>
+			<common:external-id-value>10.11234.12</common:external-id-value>			
+			<common:external-id-url>http://orcid.org</common:external-id-url>
+			<common:external-id-relationship>self</common:external-id-relationship>
+		</common:external-id>
+	</common:external-ids>
+	<work:contributors>
+		<work:contributor>
+			<work:credit-name>Walter White</work:credit-name>
+			<work:contributor-email>walter@test.com</work:contributor-email>
+			<work:contributor-attributes>
+				<work:contributor-sequence>first</work:contributor-sequence>
+				<work:contributor-role>author</work:contributor-role>
+			</work:contributor-attributes>
+		</work:contributor>
+	</work:contributors>
+	<common:language-code>it</common:language-code>
+</work:work>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/orcid-works/workBulk-277904-277902-277871.xml b/dspace-api/src/test/resources/org/dspace/app/orcid-works/workBulk-277904-277902-277871.xml
new file mode 100644
index 0000000000..97d39dcf41
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/orcid-works/workBulk-277904-277902-277871.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bulk:bulk xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+	<work:work put-code="277904" path="/0000-0001-9227-636X/work/277904" visibility="public" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+	    <common:created-date>2014-01-22T19:11:57.160Z</common:created-date>
+	    <common:last-modified-date>2015-06-19T19:14:26.350Z</common:last-modified-date>
+	    <common:source>
+	        <common:source-orcid>
+	            <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-orcid>
+	        <common:source-client-id>
+	            <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-client-id>
+	        <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+	    </common:source>
+	    <work:title>
+	        <common:title>The elements of style and the survey of ophthalmology.</common:title>
+	    </work:title>
+	    <work:citation>
+	        <work:citation-type>bibtex</work:citation-type>
+	        <work:citation-value>@article{Test,
+					doi = {10.11234.12},
+					year = 2011,
+					month = {nov},
+					publisher = {Elsevier {BV}},
+					volume = {110},
+					pages = {71--83},
+					author = {Walter White},
+					title = {Title from Bibtex: The elements of style and the survey of ophthalmology.},
+					journal = {Test Journal}
+				}
+			</work:citation-value>
+	    </work:citation>
+	    <work:type>invention</work:type>
+	    <common:external-ids>
+			<common:external-id>
+				<common:external-id-type>agr</common:external-id-type>
+				<common:external-id-value>work:external-identifier-id</common:external-id-value>			
+				<common:external-id-url>http://orcid.org</common:external-id-url>
+				<common:external-id-relationship>version-of</common:external-id-relationship>
+			</common:external-id>
+			<common:external-id>
+				<common:external-id-type>doi</common:external-id-type>
+				<common:external-id-value>10.11234.12</common:external-id-value>			
+				<common:external-id-url>http://orcid.org</common:external-id-url>
+				<common:external-id-relationship>self</common:external-id-relationship>
+			</common:external-id>
+		</common:external-ids>
+		<work:contributors>
+			<work:contributor>
+				<work:credit-name>Walter White</work:credit-name>
+				<work:contributor-email>walter@test.com</work:contributor-email>
+				<work:contributor-attributes>
+					<work:contributor-sequence>first</work:contributor-sequence>
+					<work:contributor-role>author</work:contributor-role>
+				</work:contributor-attributes>
+			</work:contributor>
+		</work:contributors>
+		<common:language-code>it</common:language-code>
+	</work:work>
+	<work:work put-code="277902" path="/0000-0001-9227-636X/work/277902" visibility="public" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+	    <common:created-date>2014-01-22T19:11:57.159Z</common:created-date>
+	    <common:last-modified-date>2015-06-19T19:14:26.327Z</common:last-modified-date>
+	    <common:source>
+	        <common:source-orcid>
+	            <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-orcid>
+	        <common:source-client-id>
+	            <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-client-id>
+	        <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+	    </common:source>
+	    <work:title>
+	        <common:title>Another cautionary tale.</common:title>
+	    </work:title>
+		<work:journal-title>Journal title</work:journal-title>
+		<work:short-description>Short description</work:short-description>
+	    <work:type>journal-article</work:type>
+	    <common:publication-date>
+	        <common:year>2011</common:year>
+	        <common:month>05</common:month>
+	        <common:day>01</common:day>
+	    </common:publication-date>
+		<work:contributors>
+			<work:contributor>
+				<work:credit-name>Walter White</work:credit-name>
+				<work:contributor-email>walter@test.com</work:contributor-email>
+				<work:contributor-attributes>
+					<work:contributor-sequence>first</work:contributor-sequence>
+					<work:contributor-role>author</work:contributor-role>
+				</work:contributor-attributes>
+			</work:contributor>
+			<work:contributor>
+				<work:credit-name>John White</work:credit-name>
+				<work:contributor-email>john@test.com</work:contributor-email>
+				<work:contributor-attributes>
+					<work:contributor-sequence>additional</work:contributor-sequence>
+					<work:contributor-role>author</work:contributor-role>
+				</work:contributor-attributes>
+			</work:contributor>
+			<work:contributor>
+				<work:credit-name>Jesse Pinkman</work:credit-name>
+				<work:contributor-attributes>
+					<work:contributor-sequence>first</work:contributor-sequence>
+					<work:contributor-role>editor</work:contributor-role>
+				</work:contributor-attributes>
+			</work:contributor>
+		</work:contributors>
+	</work:work>
+	<work:work put-code="277871" path="/0000-0001-9227-636X/work/277871" visibility="public" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+	    <common:created-date>2014-01-22T19:11:57.151Z</common:created-date>
+	    <common:last-modified-date>2015-06-19T19:14:25.924Z</common:last-modified-date>
+	    <common:source>
+	        <common:source-orcid>
+	            <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-orcid>
+	        <common:source-client-id>
+	            <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-client-id>
+	        <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+	    </common:source>
+	    <work:title>
+	        <common:title>Branch artery occlusion in a young woman.</common:title>
+	    </work:title>
+	    <work:citation>
+	        <work:citation-type>formatted-unspecified</work:citation-type>
+	        <work:citation-value>Gittinger JW, Miller NR, Keltner JL, Burde RM. Branch artery occlusion in a young woman. Surv Ophthalmol. 1985 Jul-Aug; 30(1):52-8.</work:citation-value>
+	    </work:citation>
+	    <work:type>journal-article</work:type>
+	    <common:publication-date>
+	        <common:year>1985</common:year>
+	        <common:month>07</common:month>
+	        <common:day>01</common:day>
+	    </common:publication-date>
+	</work:work>
+</bulk:bulk>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/orcid-works/workBulk-277904-277902.xml b/dspace-api/src/test/resources/org/dspace/app/orcid-works/workBulk-277904-277902.xml
new file mode 100644
index 0000000000..6c9d0d7db6
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/orcid-works/workBulk-277904-277902.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bulk:bulk xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+	<work:work put-code="277904" path="/0000-0001-9227-636X/work/277904" visibility="public" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+	    <common:created-date>2014-01-22T19:11:57.160Z</common:created-date>
+	    <common:last-modified-date>2015-06-19T19:14:26.350Z</common:last-modified-date>
+	    <common:source>
+	        <common:source-orcid>
+	            <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-orcid>
+	        <common:source-client-id>
+	            <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-client-id>
+	        <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+	    </common:source>
+	    <work:title>
+	        <common:title>The elements of style and the survey of ophthalmology.</common:title>
+	    </work:title>
+	    <work:citation>
+	        <work:citation-type>bibtex</work:citation-type>
+	        <work:citation-value>@article{Test,
+					doi = {10.11234.12},
+					year = 2011,
+					month = {nov},
+					publisher = {Elsevier {BV}},
+					volume = {110},
+					pages = {71--83},
+					author = {Walter White},
+					title = {Title from Bibtex: The elements of style and the survey of ophthalmology.},
+					journal = {Test Journal}
+				}
+			</work:citation-value>
+	    </work:citation>
+	    <work:type>invention</work:type>
+	    <common:external-ids>
+			<common:external-id>
+				<common:external-id-type>agr</common:external-id-type>
+				<common:external-id-value>work:external-identifier-id</common:external-id-value>			
+				<common:external-id-url>http://orcid.org</common:external-id-url>
+				<common:external-id-relationship>version-of</common:external-id-relationship>
+			</common:external-id>
+			<common:external-id>
+				<common:external-id-type>doi</common:external-id-type>
+				<common:external-id-value>10.11234.12</common:external-id-value>			
+				<common:external-id-url>http://orcid.org</common:external-id-url>
+				<common:external-id-relationship>self</common:external-id-relationship>
+			</common:external-id>
+		</common:external-ids>
+		<work:contributors>
+			<work:contributor>
+				<work:credit-name>Walter White</work:credit-name>
+				<work:contributor-email>walter@test.com</work:contributor-email>
+				<work:contributor-attributes>
+					<work:contributor-sequence>first</work:contributor-sequence>
+					<work:contributor-role>author</work:contributor-role>
+				</work:contributor-attributes>
+			</work:contributor>
+		</work:contributors>
+		<common:language-code>it</common:language-code>
+	</work:work>
+	<work:work put-code="277902" path="/0000-0001-9227-636X/work/277902" visibility="public" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+	    <common:created-date>2014-01-22T19:11:57.159Z</common:created-date>
+	    <common:last-modified-date>2015-06-19T19:14:26.327Z</common:last-modified-date>
+	    <common:source>
+	        <common:source-orcid>
+	            <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-orcid>
+	        <common:source-client-id>
+	            <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+	            <common:path>0000-0002-4105-0763</common:path>
+	            <common:host>sandbox.orcid.org</common:host>
+	        </common:source-client-id>
+	        <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+	    </common:source>
+	    <work:title>
+	        <common:title>Another cautionary tale.</common:title>
+	    </work:title>
+		<work:journal-title>Journal title</work:journal-title>
+		<work:short-description>Short description</work:short-description>
+	    <work:type>journal-article</work:type>
+	    <common:publication-date>
+	        <common:year>2011</common:year>
+	        <common:month>05</common:month>
+	        <common:day>01</common:day>
+	    </common:publication-date>
+		<work:contributors>
+			<work:contributor>
+				<work:credit-name>Walter White</work:credit-name>
+				<work:contributor-email>walter@test.com</work:contributor-email>
+				<work:contributor-attributes>
+					<work:contributor-sequence>first</work:contributor-sequence>
+					<work:contributor-role>author</work:contributor-role>
+				</work:contributor-attributes>
+			</work:contributor>
+			<work:contributor>
+				<work:credit-name>John White</work:credit-name>
+				<work:contributor-email>john@test.com</work:contributor-email>
+				<work:contributor-attributes>
+					<work:contributor-sequence>additional</work:contributor-sequence>
+					<work:contributor-role>author</work:contributor-role>
+				</work:contributor-attributes>
+			</work:contributor>
+			<work:contributor>
+				<work:credit-name>Jesse Pinkman</work:credit-name>
+				<work:contributor-attributes>
+					<work:contributor-sequence>first</work:contributor-sequence>
+					<work:contributor-role>editor</work:contributor-role>
+				</work:contributor-attributes>
+			</work:contributor>
+		</work:contributors>
+	</work:work>
+</bulk:bulk>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/orcid-works/works.xml b/dspace-api/src/test/resources/org/dspace/app/orcid-works/works.xml
new file mode 100644
index 0000000000..411160ef8e
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/orcid-works/works.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<activities:works path="/0000-0001-9227-636X/works" xmlns:internal="http://www.orcid.org/ns/internal" xmlns:education="http://www.orcid.org/ns/education" xmlns:distinction="http://www.orcid.org/ns/distinction" xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:other-name="http://www.orcid.org/ns/other-name" xmlns:membership="http://www.orcid.org/ns/membership" xmlns:error="http://www.orcid.org/ns/error" xmlns:common="http://www.orcid.org/ns/common" xmlns:record="http://www.orcid.org/ns/record" xmlns:personal-details="http://www.orcid.org/ns/personal-details" xmlns:keyword="http://www.orcid.org/ns/keyword" xmlns:email="http://www.orcid.org/ns/email" xmlns:external-identifier="http://www.orcid.org/ns/external-identifier" xmlns:funding="http://www.orcid.org/ns/funding" xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:address="http://www.orcid.org/ns/address" xmlns:invited-position="http://www.orcid.org/ns/invited-position" xmlns:work="http://www.orcid.org/ns/work" xmlns:history="http://www.orcid.org/ns/history" xmlns:employment="http://www.orcid.org/ns/employment" xmlns:qualification="http://www.orcid.org/ns/qualification" xmlns:service="http://www.orcid.org/ns/service" xmlns:person="http://www.orcid.org/ns/person" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:researcher-url="http://www.orcid.org/ns/researcher-url" xmlns:peer-review="http://www.orcid.org/ns/peer-review" xmlns:bulk="http://www.orcid.org/ns/bulk" xmlns:research-resource="http://www.orcid.org/ns/research-resource">
+    <common:last-modified-date>2015-06-19T19:14:26.350Z</common:last-modified-date>
+    <activities:group>
+        <common:last-modified-date>2015-06-19T19:14:26.350Z</common:last-modified-date>
+        <common:external-ids/>
+        <work:work-summary put-code="277904" path="/0000-0001-9227-636X/work/277904" visibility="public" display-index="0">
+            <common:created-date>2014-01-22T19:11:57.160Z</common:created-date>
+            <common:last-modified-date>2015-06-19T19:14:26.350Z</common:last-modified-date>
+            <common:source>
+                <common:source-orcid>
+                    <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-orcid>
+                <common:source-client-id>
+                    <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-client-id>
+                <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+            </common:source>
+            <work:title>
+                <common:title>The elements of style and the survey of ophthalmology.</common:title>
+            </work:title>
+    		<work:type>invention</work:type>
+            <common:publication-date>
+                <common:year>2012</common:year>
+                <common:month>11</common:month>
+                <common:day>01</common:day>
+            </common:publication-date>
+        </work:work-summary>
+    </activities:group>
+    <activities:group>
+        <common:last-modified-date>2015-06-19T19:14:26.339Z</common:last-modified-date>
+        <common:external-ids/>
+        <work:work-summary put-code="277903" path="/0000-0001-9227-636X/work/277903" visibility="public" display-index="0">
+            <common:created-date>2014-01-22T19:11:57.159Z</common:created-date>
+            <common:last-modified-date>2015-06-19T19:14:26.339Z</common:last-modified-date>
+            <common:source>
+                <common:source-client-id>
+                    <common:uri>https://sandbox.orcid.org/client/DSPACE-CLIENT-ID</common:uri>
+                    <common:path>DSPACE-CLIENT-ID</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-client-id>
+                <common:source-name>DSPACE-CRIS</common:source-name>
+            </common:source>
+            <work:title>
+                <common:title>Introduction.</common:title>
+            </work:title>
+            <work:type>journal-article</work:type>
+            <common:publication-date>
+                <common:year>2011</common:year>
+                <common:month>11</common:month>
+                <common:day>01</common:day>
+            </common:publication-date>
+        </work:work-summary>
+    </activities:group>
+    <activities:group>
+        <common:last-modified-date>2015-06-19T19:14:26.327Z</common:last-modified-date>
+        <common:external-ids/>
+        <work:work-summary put-code="277902" path="/0000-0001-9227-636X/work/277902" visibility="public" display-index="1">
+            <common:created-date>2014-01-22T19:11:57.159Z</common:created-date>
+            <common:last-modified-date>2015-06-19T19:14:26.327Z</common:last-modified-date>
+            <common:source>
+                <common:source-orcid>
+                    <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-orcid>
+                <common:source-client-id>
+                    <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-client-id>
+                <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+            </common:source>
+            <work:title>
+                <common:title>Another cautionary tale.</common:title>
+            </work:title>
+            <work:type>journal-article</work:type>
+            <common:publication-date>
+                <common:year>2011</common:year>
+                <common:month>05</common:month>
+                <common:day>01</common:day>
+            </common:publication-date>
+        </work:work-summary>
+        <work:work-summary put-code="287902" path="/0000-0001-9227-636X/work/277902" visibility="public" display-index="0">
+            <common:created-date>2014-01-22T19:11:57.159Z</common:created-date>
+            <common:last-modified-date>2015-06-19T19:14:26.327Z</common:last-modified-date>
+            <common:source>
+                <common:source-client-id>
+                    <common:uri>https://sandbox.orcid.org/client/4Science</common:uri>
+                    <common:path>4Science</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-client-id>
+                <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+            </common:source>
+            <work:title>
+                <common:title>Another cautionary tale (4Science).</common:title>
+            </work:title>
+            <work:type>journal-article</work:type>
+            <common:publication-date>
+                <common:year>2011</common:year>
+                <common:month>05</common:month>
+                <common:day>01</common:day>
+            </common:publication-date>
+        </work:work-summary>
+    </activities:group>
+    <activities:group>
+        <common:last-modified-date>2015-06-19T19:14:26.108Z</common:last-modified-date>
+        <common:external-ids/>
+        <work:work-summary put-code="277885" path="/0000-0001-9227-636X/work/277885" visibility="public" display-index="0">
+            <common:created-date>2014-01-22T19:11:57.155Z</common:created-date>
+            <common:last-modified-date>2015-06-19T19:14:26.108Z</common:last-modified-date>
+            <common:source>
+                <common:source-orcid>
+                    <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-orcid>
+                <common:source-client-id>
+                    <common:uri>https://sandbox.orcid.org/client/DSPACE-CLIENT-ID</common:uri>
+                    <common:path>DSPACE-CLIENT-ID</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-client-id>
+                <common:source-name>DSPACE-CRIS</common:source-name>
+            </common:source>
+            <work:title>
+                <common:title>Functional hemianopsia: a historical perspective.</common:title>
+            </work:title>
+            <work:type>journal-article</work:type>
+            <common:publication-date>
+                <common:year>1988</common:year>
+                <common:month>05</common:month>
+                <common:day>01</common:day>
+            </common:publication-date>
+        </work:work-summary>
+        <work:work-summary put-code="277971" path="/0000-0001-9227-636X/work/277871" visibility="public" display-index="0">
+            <common:created-date>2014-01-22T19:11:57.151Z</common:created-date>
+            <common:last-modified-date>2015-06-19T19:14:25.924Z</common:last-modified-date>
+            <common:source>
+                <common:source-orcid>
+                    <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-orcid>
+                <common:source-client-id>
+                    <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-client-id>
+                <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+            </common:source>
+            <work:title>
+                <common:title>Branch artery occlusion in a young man.</common:title>
+            </work:title>
+            <work:type>journal-article</work:type>
+            <common:publication-date>
+                <common:year>1985</common:year>
+                <common:month>07</common:month>
+                <common:day>01</common:day>
+            </common:publication-date>
+        </work:work-summary>
+    </activities:group>
+    <activities:group>
+        <common:last-modified-date>2015-06-19T19:14:26.108Z</common:last-modified-date>
+        <common:external-ids/>
+        <work:work-summary put-code="277871" path="/0000-0001-9227-636X/work/277871" visibility="public" display-index="0">
+            <common:created-date>2014-01-22T19:11:57.151Z</common:created-date>
+            <common:last-modified-date>2015-06-19T19:14:25.924Z</common:last-modified-date>
+            <common:source>
+                <common:source-orcid>
+                    <common:uri>https://sandbox.orcid.org/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-orcid>
+                <common:source-client-id>
+                    <common:uri>https://sandbox.orcid.org/client/0000-0002-4105-0763</common:uri>
+                    <common:path>0000-0002-4105-0763</common:path>
+                    <common:host>sandbox.orcid.org</common:host>
+                </common:source-client-id>
+                <common:source-name>BU Profiles to ORCID Integration Site</common:source-name>
+            </common:source>
+            <work:title>
+                <common:title>Branch artery occlusion in a young woman.</common:title>
+            </work:title>
+            <work:type>journal-article</work:type>
+            <common:publication-date>
+                <common:year>1985</common:year>
+                <common:month>07</common:month>
+                <common:day>01</common:day>
+            </common:publication-date>
+        </work:work-summary>
+    </activities:group>
+</activities:works>
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/sherpa/0000-0000.json b/dspace-api/src/test/resources/org/dspace/app/sherpa/0000-0000.json
new file mode 100644
index 0000000000..3b9e474502
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/sherpa/0000-0000.json
@@ -0,0 +1,3 @@
+{
+    "items": []
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/sherpa/2731-0582.json b/dspace-api/src/test/resources/org/dspace/app/sherpa/2731-0582.json
new file mode 100644
index 0000000000..2e5c7e2db9
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/sherpa/2731-0582.json
@@ -0,0 +1,504 @@
+{
+    "items": [
+        {
+            "system_metadata": {
+                "id": 40863,
+                "uri": "https://v2.sherpa.ac.uk/id/publication/40863",
+                "date_modified": "2022-03-25 14:08:29",
+                "publicly_visible": "yes",
+                "publicly_visible_phrases": [
+                    {
+                        "language": "en",
+                        "phrase": "Yes",
+                        "value": "yes"
+                    }
+                ],
+                "date_created": "2022-01-11 09:43:53"
+            },
+            "tj_status_phrases": [
+                {
+                    "phrase": "Plan S Approved",
+                    "value": "plan_s_approved",
+                    "language": "en"
+                }
+            ],
+            "type_phrases": [
+                {
+                    "value": "journal",
+                    "phrase": "Journal",
+                    "language": "en"
+                }
+            ],
+            "id": 40863,
+            "issns": [
+                {
+                    "issn": "2731-0582"
+                }
+            ],
+            "publishers": [
+                {
+                    "relationship_type": "commercial_publisher",
+                    "relationship_type_phrases": [
+                        {
+                            "value": "commercial_publisher",
+                            "phrase": "Commercial Publisher",
+                            "language": "en"
+                        }
+                    ],
+                    "publisher": {
+                        "id": 3286,
+                        "name": [
+                            {
+                                "name": "Nature Research",
+                                "language": "en",
+                                "preferred_phrases": [
+                                    {
+                                        "language": "en",
+                                        "phrase": "Name",
+                                        "value": "name"
+                                    }
+                                ],
+                                "preferred": "name",
+                                "language_phrases": [
+                                    {
+                                        "phrase": "English",
+                                        "value": "en",
+                                        "language": "en"
+                                    }
+                                ]
+                            }
+                        ],
+                        "imprint_of_id": 62037,
+                        "country": "gb",
+                        "country_phrases": [
+                            {
+                                "value": "gb",
+                                "phrase": "United Kingdom",
+                                "language": "en"
+                            }
+                        ],
+                        "publication_count": 87,
+                        "uri": "https://v2.sherpa.ac.uk/id/publisher/3286",
+                        "url": "https://www.nature.com/"
+                    }
+                }
+            ],
+            "listed_in_doaj_phrases": [
+                {
+                    "language": "en",
+                    "phrase": "No",
+                    "value": "no"
+                }
+            ],
+            "listed_in_doaj": "no",
+            "tj_status": [
+                "plan_s_approved"
+            ],
+            "publisher_policy": [
+                {
+                    "open_access_prohibited": "no",
+                    "id": 3286,
+                    "publication_count": 36,
+                    "internal_moniker": "Default Policy",
+                    "urls": [
+                        {
+                            "description": "Self archiving and license to publish",
+                            "url": "https://www.nature.com/neuro/editorial-policies/self-archiving-and-license-to-publish"
+                        },
+                        {
+                            "description": "Preprints and Conference Proceedings",
+                            "url": "https://www.nature.com/nature-portfolio/editorial-policies/preprints-and-conference-proceedings"
+                        },
+                        {
+                            "url": "https://www.springernature.com/gp/open-research/policies/accepted-manuscript-terms",
+                            "description": "Accepted manuscript terms of use"
+                        }
+                    ],
+                    "open_access_prohibited_phrases": [
+                        {
+                            "value": "no",
+                            "phrase": "No",
+                            "language": "en"
+                        }
+                    ],
+                    "uri": "https://v2.sherpa.ac.uk/id/publisher_policy/3286",
+                    "permitted_oa": [
+                        {
+                            "prerequisites": {
+                                "prerequisites_phrases": [
+                                    {
+                                        "language": "en",
+                                        "value": "when_research_article",
+                                        "phrase": "If a Research Article"
+                                    }
+                                ],
+                                "prerequisites": [
+                                    "when_research_article"
+                                ]
+                            },
+                            "copyright_owner": "authors",
+                            "additional_oa_fee_phrases": [
+                                {
+                                    "language": "en",
+                                    "value": "no",
+                                    "phrase": "No"
+                                }
+                            ],
+                            "article_version_phrases": [
+                                {
+                                    "language": "en",
+                                    "value": "submitted",
+                                    "phrase": "Submitted"
+                                }
+                            ],
+                            "additional_oa_fee": "no",
+                            "copyright_owner_phrases": [
+                                {
+                                    "language": "en",
+                                    "value": "authors",
+                                    "phrase": "Authors"
+                                }
+                            ],
+                            "article_version": [
+                                "submitted"
+                            ],
+                            "location": {
+                                "location_phrases": [
+                                    {
+                                        "value": "authors_homepage",
+                                        "phrase": "Author's Homepage",
+                                        "language": "en"
+                                    },
+                                    {
+                                        "language": "en",
+                                        "phrase": "Funder Designated Location",
+                                        "value": "funder_designated_location"
+                                    },
+                                    {
+                                        "language": "en",
+                                        "value": "institutional_repository",
+                                        "phrase": "Institutional Repository"
+                                    },
+                                    {
+                                        "phrase": "Preprint Repository",
+                                        "value": "preprint_repository",
+                                        "language": "en"
+                                    }
+                                ],
+                                "location": [
+                                    "authors_homepage",
+                                    "funder_designated_location",
+                                    "institutional_repository",
+                                    "preprint_repository"
+                                ]
+                            },
+                            "conditions": [
+                                "Must link to publisher version",
+                                "Upon publication, source must be acknowledged and DOI cited",
+                                "Post-prints are subject to Springer Nature re-use terms",
+                                "Non-commercial use only"
+                            ]
+                        },
+                        {
+                            "embargo": {
+                                "units": "months",
+                                "amount": 6,
+                                "units_phrases": [
+                                    {
+                                        "phrase": "Months",
+                                        "value": "months",
+                                        "language": "en"
+                                    }
+                                ]
+                            },
+                            "license": [
+                                {
+                                    "license_phrases": [
+                                        {
+                                            "phrase": "Publisher's Bespoke License",
+                                            "value": "bespoke_license",
+                                            "language": "en"
+                                        }
+                                    ],
+                                    "license": "bespoke_license"
+                                }
+                            ],
+                            "article_version_phrases": [
+                                {
+                                    "value": "accepted",
+                                    "phrase": "Accepted",
+                                    "language": "en"
+                                }
+                            ],
+                            "additional_oa_fee": "no",
+                            "conditions": [
+                                "Must link to publisher version",
+                                "Published source must be acknowledged and DOI cited",
+                                "Post-prints are subject to Springer Nature re-use terms",
+                                "Non-commercial use only"
+                            ],
+                            "copyright_owner_phrases": [
+                                {
+                                    "phrase": "Authors",
+                                    "value": "authors",
+                                    "language": "en"
+                                }
+                            ],
+                            "location": {
+                                "location": [
+                                    "authors_homepage",
+                                    "funder_designated_location",
+                                    "institutional_repository",
+                                    "named_repository"
+                                ],
+                                "location_phrases": [
+                                    {
+                                        "phrase": "Author's Homepage",
+                                        "value": "authors_homepage",
+                                        "language": "en"
+                                    },
+                                    {
+                                        "phrase": "Funder Designated Location",
+                                        "value": "funder_designated_location",
+                                        "language": "en"
+                                    },
+                                    {
+                                        "language": "en",
+                                        "value": "institutional_repository",
+                                        "phrase": "Institutional Repository"
+                                    },
+                                    {
+                                        "language": "en",
+                                        "value": "named_repository",
+                                        "phrase": "Named Repository"
+                                    }
+                                ],
+                                "named_repository": [
+                                    "PubMed Central",
+                                    "Europe PMC"
+                                ]
+                            },
+                            "article_version": [
+                                "accepted"
+                            ],
+                            "prerequisites": {
+                                "prerequisites": [
+                                    "when_research_article"
+                                ],
+                                "prerequisites_phrases": [
+                                    {
+                                        "value": "when_research_article",
+                                        "phrase": "If a Research Article",
+                                        "language": "en"
+                                    }
+                                ]
+                            },
+                            "copyright_owner": "authors",
+                            "additional_oa_fee_phrases": [
+                                {
+                                    "language": "en",
+                                    "value": "no",
+                                    "phrase": "No"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "id": 4410,
+                    "open_access_prohibited": "no",
+                    "urls": [
+                        {
+                            "url": "https://www.springernature.com/gp/open-research/about/the-fundamentals-of-open-access-and-open-research",
+                            "description": "The fundamentals of open access and open research"
+                        },
+                        {
+                            "url": "https://www.nature.com/neuro/editorial-policies/self-archiving-and-license-to-publish",
+                            "description": "Self archiving and license to publish"
+                        },
+                        {
+                            "url": "https://www.springernature.com/gp/open-research/policies/journal-policies",
+                            "description": "Open access policies for journals"
+                        }
+                    ],
+                    "open_access_prohibited_phrases": [
+                        {
+                            "language": "en",
+                            "phrase": "No",
+                            "value": "no"
+                        }
+                    ],
+                    "internal_moniker": "Open Access",
+                    "publication_count": 34,
+                    "permitted_oa": [
+                        {
+                            "additional_oa_fee_phrases": [
+                                {
+                                    "language": "en",
+                                    "phrase": "Yes",
+                                    "value": "yes"
+                                }
+                            ],
+                            "copyright_owner": "authors",
+                            "conditions": [
+                                "Published source must be acknowledged with citation"
+                            ],
+                            "article_version": [
+                                "published"
+                            ],
+                            "copyright_owner_phrases": [
+                                {
+                                    "language": "en",
+                                    "value": "authors",
+                                    "phrase": "Authors"
+                                }
+                            ],
+                            "location": {
+                                "location_phrases": [
+                                    {
+                                        "phrase": "Any Website",
+                                        "value": "any_website",
+                                        "language": "en"
+                                    },
+                                    {
+                                        "language": "en",
+                                        "phrase": "Journal Website",
+                                        "value": "this_journal"
+                                    }
+                                ],
+                                "location": [
+                                    "any_website",
+                                    "this_journal"
+                                ]
+                            },
+                            "additional_oa_fee": "yes",
+                            "article_version_phrases": [
+                                {
+                                    "phrase": "Published",
+                                    "value": "published",
+                                    "language": "en"
+                                }
+                            ],
+                            "license": [
+                                {
+                                    "license_phrases": [
+                                        {
+                                            "phrase": "CC BY",
+                                            "value": "cc_by",
+                                            "language": "en"
+                                        }
+                                    ],
+                                    "license": "cc_by",
+                                    "version": "4.0"
+                                }
+                            ],
+                            "publisher_deposit": [
+                                {
+                                    "repository_metadata": {
+                                        "type_phrases": [
+                                            {
+                                                "language": "en",
+                                                "value": "disciplinary",
+                                                "phrase": "Disciplinary"
+                                            }
+                                        ],
+                                        "notes": "Launched as UK PubMed Central (UKPMC) in January 2007, changed to Europe PubMed Central in November 2012.\r\nSpecial item types include: Links",
+                                        "url": "http://europepmc.org/",
+                                        "type": "disciplinary",
+                                        "name": [
+                                            {
+                                                "name": "Europe PMC",
+                                                "language": "en",
+                                                "preferred": "name",
+                                                "language_phrases": [
+                                                    {
+                                                        "value": "en",
+                                                        "phrase": "English",
+                                                        "language": "en"
+                                                    }
+                                                ],
+                                                "preferred_phrases": [
+                                                    {
+                                                        "language": "en",
+                                                        "phrase": "Name",
+                                                        "value": "name"
+                                                    }
+                                                ]
+                                            }
+                                        ]
+                                    },
+                                    "system_metadata": {
+                                        "id": 908,
+                                        "uri": "https://v2.sherpa.ac.uk/id/repository/908"
+                                    }
+                                },
+                                {
+                                    "system_metadata": {
+                                        "id": 267,
+                                        "uri": "https://v2.sherpa.ac.uk/id/repository/267"
+                                    },
+                                    "repository_metadata": {
+                                        "type_phrases": [
+                                            {
+                                                "language": "en",
+                                                "phrase": "Disciplinary",
+                                                "value": "disciplinary"
+                                            }
+                                        ],
+                                        "type": "disciplinary",
+                                        "url": "http://www.ncbi.nlm.nih.gov/pmc/",
+                                        "name": [
+                                            {
+                                                "language": "en",
+                                                "name": "PubMed Central",
+                                                "preferred": "name",
+                                                "language_phrases": [
+                                                    {
+                                                        "language": "en",
+                                                        "value": "en",
+                                                        "phrase": "English"
+                                                    }
+                                                ],
+                                                "preferred_phrases": [
+                                                    {
+                                                        "language": "en",
+                                                        "value": "name",
+                                                        "phrase": "Name"
+                                                    }
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                }
+                            ]
+                        }
+                    ],
+                    "uri": "https://v2.sherpa.ac.uk/id/publisher_policy/4410"
+                }
+            ],
+            "title": [
+                {
+                    "preferred_phrases": [
+                        {
+                            "language": "en",
+                            "phrase": "Title",
+                            "value": "name"
+                        }
+                    ],
+                    "language_phrases": [
+                        {
+                            "language": "en",
+                            "value": "en",
+                            "phrase": "English"
+                        }
+                    ],
+                    "preferred": "name",
+                    "title": "Nature Synthesis",
+                    "language": "en"
+                }
+            ],
+            "type": "journal",
+            "url": "https://www.nature.com/natsynth/"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/test-config.properties b/dspace-api/src/test/resources/test-config.properties
index 66a29ab9a0..06322d4a7e 100644
--- a/dspace-api/src/test/resources/test-config.properties
+++ b/dspace-api/src/test/resources/test-config.properties
@@ -12,4 +12,4 @@ test.folder = ./target/testing/
 # Path of the test bitstream (to use in BitstreamTest and elsewhere)
 test.bitstream = ./target/testing/dspace/assetstore/ConstitutionofIreland.pdf
 test.exportcsv = ./target/testing/dspace/assetstore/test.csv
-test.importcsv = ./target/testing/dspace/assetstore/testImport.csv
+test.importcsv = ./target/testing/dspace/assetstore/testImport.csv
\ No newline at end of file
diff --git a/dspace-iiif/pom.xml b/dspace-iiif/pom.xml
index ce1dc8a326..879fb1da69 100644
--- a/dspace-iiif/pom.xml
+++ b/dspace-iiif/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -45,11 +45,25 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>${spring-boot.version}</version>
+            <exclusions>
+                <!-- Later version provided by dspace-api -->
+                <exclusion>
+                    <groupId>org.hibernate.validator</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
             <version>${spring-boot.version}</version>
+            <exclusions>
+                <!-- Later version brought in by spring-boot-starter-web above -->
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.datatype</groupId>
+                    <artifactId>jackson-datatype-jdk8</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -66,13 +80,12 @@
         <dependency>
             <groupId>javax.cache</groupId>
             <artifactId>cache-api</artifactId>
-            <version>1.1.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.ehcache/ehcache -->
         <dependency>
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>3.4.0</version>
+            <version>${ehcache.version}</version>
         </dependency>
 
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasService.java
index 189e4d6f62..dcfb707d62 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/CanvasService.java
@@ -78,29 +78,45 @@ public class CanvasService extends AbstractResourceService {
     }
 
     /**
-     * Checks for bitstream iiif.image.width metadata in the first
-     * bitstream in first IIIF bundle. If bitstream metadata is not
-     * found, use the IIIF image service to update the default canvas
-     * dimensions for this request. Called once for each manifest.
+     * Checks for "iiif.image.width" metadata in IIIF bundles. When bitstream
+     * metadata is not found for the first image in the bundle this method updates the
+     * default canvas dimensions for the request based on the actual image dimensions,
+     * using the IIIF image service. Called once for each manifest.
      * @param bundles IIIF bundles for this item
      */
-    protected void guessCanvasDimensions(List<Bundle> bundles) {
-        Bitstream firstBistream = bundles.get(0).getBitstreams().get(0);
-        if (!utils.hasWidthMetadata(firstBistream)) {
-            int[] imageDims = utils.getImageDimensions(firstBistream);
-            if (imageDims != null && imageDims.length == 2) {
-                // update the fallback dimensions
-                defaultCanvasWidthFallback = imageDims[0];
-                defaultCanvasHeightFallback = imageDims[1];
+    protected void guessCanvasDimensions(Context context, List<Bundle> bundles) {
+        // prevent redundant updates.
+        boolean dimensionUpdated = false;
+
+        for (Bundle bundle : bundles) {
+            if (!dimensionUpdated) {
+                for (Bitstream bitstream : bundle.getBitstreams()) {
+                    if (utils.isIIIFBitstream(context, bitstream)) {
+                        // check for width dimension
+                        if (!utils.hasWidthMetadata(bitstream)) {
+                            // get the dimensions of the image.
+                            int[] imageDims = utils.getImageDimensions(bitstream);
+                            if (imageDims != null && imageDims.length == 2) {
+                                // update the fallback dimensions
+                                defaultCanvasWidthFallback = imageDims[0];
+                                defaultCanvasHeightFallback = imageDims[1];
+                            }
+                            setDefaultCanvasDimensions();
+                            // stop processing the bundles
+                            dimensionUpdated = true;
+                        }
+                        // check only the first image
+                        break;
+                    }
+                }
             }
-            setDefaultCanvasDimensions();
         }
     }
 
     /**
-     * Used to set the height and width dimensions for all images when iiif.image.default-width and
-     * iiif.image.default-height are set to -1 in DSpace configuration.
-     * The values are updated only if the bitstream does not have its own iiif.image.width metadata.
+     * Sets the height and width dimensions for all images when "iiif.image.default-width"
+     * and "iiif.image.default-height" are set to -1 in DSpace configuration. The values
+     * are updated only when the bitstream does not have its own image dimension metadata.
      * @param bitstream
      */
     private void setCanvasDimensions(Bitstream bitstream) {
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ManifestService.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ManifestService.java
index a9611593d9..09526deeb6 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ManifestService.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/ManifestService.java
@@ -156,9 +156,8 @@ public class ManifestService extends AbstractResourceService {
         List<Bundle> bundles = utils.getIIIFBundles(item);
         // Set the default canvas dimensions.
         if (guessCanvasDimension) {
-            canvasService.guessCanvasDimensions(bundles);
+            canvasService.guessCanvasDimensions(context, bundles);
         }
-        // canvasService.setDefaultCanvasDimensions();
         for (Bundle bnd : bundles) {
             String bundleToCPrefix = null;
             if (bundles.size() > 1) {
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/WordHighlightSolrSearch.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/WordHighlightSolrSearch.java
index 0e614fae2a..da50f33582 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/WordHighlightSolrSearch.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/WordHighlightSolrSearch.java
@@ -12,14 +12,11 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.validator.routines.UrlValidator;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -35,7 +32,6 @@ import org.dspace.app.iiif.model.generator.ContentAsTextGenerator;
 import org.dspace.app.iiif.model.generator.ManifestGenerator;
 import org.dspace.app.iiif.model.generator.SearchResultGenerator;
 import org.dspace.app.iiif.service.utils.IIIFUtils;
-import org.dspace.discovery.SolrSearchCore;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,9 +62,6 @@ public class WordHighlightSolrSearch implements SearchAnnotationService {
     @Autowired
     SearchResultGenerator searchResult;
 
-    @Autowired
-    SolrSearchCore solrSearchCore;
-
     @Autowired
     ManifestGenerator manifestGenerator;
 
@@ -167,26 +160,49 @@ public class WordHighlightSolrSearch implements SearchAnnotationService {
     private String getAnnotationList(UUID uuid, String json, String query) {
         searchResult.setIdentifier(manifestId + "/search?q="
                 + URLEncoder.encode(query, StandardCharsets.UTF_8));
-        GsonBuilder builder = new GsonBuilder();
-        Gson gson = builder.create();
-        JsonObject body = gson.fromJson(json, JsonObject.class);
+
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode body = null;
+        try {
+            body = mapper.readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        // If error occurred or no body, return immediately
         if (body == null) {
-            log.warn("Unable to process json response.");
             return utils.asJson(searchResult.generateResource());
         }
-        // outer ocr highlight element
-        JsonObject highs = body.getAsJsonObject("ocrHighlighting");
-        // highlight entries
-        for (Map.Entry<String, JsonElement> ocrIds: highs.entrySet()) {
-            // ocr_text
-            JsonObject ocrObj = ocrIds.getValue().getAsJsonObject().getAsJsonObject("ocr_text");
-            // snippets array
-            if (ocrObj != null) {
-                for (JsonElement snippetArray : ocrObj.getAsJsonObject().get("snippets").getAsJsonArray()) {
-                    String pageId = getCanvasId(snippetArray.getAsJsonObject().get("pages"));
-                    for (JsonElement highlights : snippetArray.getAsJsonObject().getAsJsonArray("highlights")) {
-                        for (JsonElement highlight : highlights.getAsJsonArray()) {
-                            searchResult.addResource(getAnnotation(highlight, pageId, uuid));
+
+        // Example structure of Solr response available at
+        // https://github.com/dbmdz/solr-ocrhighlighting/blob/main/docs/query.md
+        // Get the outer ocrHighlighting node
+        JsonNode highs = body.get("ocrHighlighting");
+        if (highs != null) {
+            // Loop through each highlight entry under ocrHighlighting
+            for (final JsonNode highEntry : highs) {
+                // Get the ocr_text node under the entry
+                JsonNode ocrNode = highEntry.get("ocr_text");
+                if (ocrNode != null) {
+                    // Loop through the snippets array under that
+                    for (final JsonNode snippet : ocrNode.get("snippets")) {
+                        if (snippet != null) {
+                            // Get a canvas ID based on snippet's pages
+                            String pageId = getCanvasId(snippet.get("pages"));
+                            if (pageId != null) {
+                                // Loop through array of highlights for each snippet.
+                                for (final JsonNode highlights : snippet.get("highlights")) {
+                                    if (highlights != null) {
+                                        // May be multiple word highlights on a page, so loop through them.
+                                        for (int i = 0; i < highlights.size(); i++) {
+                                            // Add annotation associated with each highlight
+                                            AnnotationGenerator anno = getAnnotation(highlights.get(i), pageId, uuid);
+                                            if (anno != null) {
+                                                searchResult.addResource(anno);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -198,21 +214,24 @@ public class WordHighlightSolrSearch implements SearchAnnotationService {
 
     /**
      * Returns the annotation generator for the highlight.
-     * @param highlight highlight element from solor response
+     * @param highlight highlight node from Solr response
      * @param pageId page id from solr response
      * @return generator for a single annotation
      */
-    private AnnotationGenerator getAnnotation(JsonElement highlight, String pageId, UUID uuid) {
-        JsonObject hcoords = highlight.getAsJsonObject();
-        String text = (hcoords.get("text").getAsString());
-        int ulx = hcoords.get("ulx").getAsInt();
-        int uly = hcoords.get("uly").getAsInt();
-        int lrx = hcoords.get("lrx").getAsInt();
-        int lry = hcoords.get("lry").getAsInt();
-        String w = Integer.toString(lrx - ulx);
-        String h = Integer.toString(lry - uly);
-        String params = ulx + "," + uly + "," + w + "," + h;
-        return createSearchResultAnnotation(params, text, pageId, uuid);
+    private AnnotationGenerator getAnnotation(JsonNode highlight, String pageId, UUID uuid) {
+        String text = highlight.get("text") != null ? highlight.get("text").asText() : null;
+        int ulx = highlight.get("ulx") != null ? highlight.get("ulx").asInt() : -1;
+        int uly = highlight.get("uly") != null ? highlight.get("uly").asInt() : -1;
+        int lrx = highlight.get("lrx") != null ? highlight.get("lrx").asInt() : -1;
+        int lry = highlight.get("lry") != null ? highlight.get("lry").asInt() : -1;
+        String w = (lrx >= 0 && ulx >= 0) ? Integer.toString(lrx - ulx) : null;
+        String h = (lry >= 0 && uly >= 0) ? Integer.toString(lry - uly) : null;
+
+        if (text != null && w != null && h != null) {
+            String params = ulx + "," + uly + "," + w + "," + h;
+            return createSearchResultAnnotation(params, text, pageId, uuid);
+        }
+        return null;
     }
 
     /**
@@ -221,15 +240,22 @@ public class WordHighlightSolrSearch implements SearchAnnotationService {
      * delimited with a "." and that the integer corresponds to the
      * canvas identifier in the manifest. For METS/ALTO documents, the page
      * order can be derived from the METS file when loading the solr index.
-     * @param element the pages element
-     * @return canvas id
+     * @param pagesNode the pages node
+     * @return canvas id or null if node was null
      */
-    private String getCanvasId(JsonElement element) {
-        JsonArray pages = element.getAsJsonArray();
-        JsonObject page = pages.get(0).getAsJsonObject();
-        String[] identArr = page.get("id").getAsString().split("\\.");
-        // the canvas id.
-        return "c" + identArr[1];
+    private String getCanvasId(JsonNode pagesNode) {
+        if (pagesNode != null) {
+            JsonNode page = pagesNode.get(0);
+            if (page != null) {
+                JsonNode pageId = page.get("id");
+                if (pageId != null) {
+                    String[] identArr = pageId.asText().split("\\.");
+                    // the canvas id.
+                    return "c" + identArr[1];
+                }
+            }
+        }
+        return null;
     }
 
     /**
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/utils/IIIFUtils.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/utils/IIIFUtils.java
index 4a4357b803..782a5a9852 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/utils/IIIFUtils.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/utils/IIIFUtils.java
@@ -14,6 +14,7 @@ import static org.dspace.iiif.util.IIIFSharedUtils.METADATA_IIIF_WIDTH_QUALIFIER
 
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -136,7 +137,7 @@ public class IIIFUtils {
      * @param b the DSpace bitstream to check
      * @return true if the bitstream can be used as IIIF resource
      */
-    private boolean isIIIFBitstream(Context context, Bitstream b) {
+    public boolean isIIIFBitstream(Context context, Bitstream b) {
         return checkImageMimeType(getBitstreamMimeType(b, context)) && b.getMetadata().stream()
                 .filter(m -> m.getMetadataField().toString('.').contentEquals(METADATA_IIIF_ENABLED))
                 .noneMatch(m -> m.getValue().equalsIgnoreCase("false") || m.getValue().equalsIgnoreCase("no"));
@@ -227,7 +228,7 @@ public class IIIFUtils {
      * @param mimetype
      * @return true if an image
      */
-    public boolean checkImageMimeType(String mimetype) {
+    private boolean checkImageMimeType(String mimetype) {
         if (mimetype != null && mimetype.contains("image/")) {
             return true;
         }
@@ -335,12 +336,26 @@ public class IIIFUtils {
     public String getBundleIIIFToC(Bundle bundle) {
         String label = bundle.getMetadata().stream()
                 .filter(m -> m.getMetadataField().toString('.').contentEquals(METADATA_IIIF_LABEL))
-                .findFirst().map(m -> m.getValue()).orElse(bundle.getName());
+                .findFirst().map(m -> m.getValue()).orElse(getToCBundleLabel(bundle));
         return bundle.getMetadata().stream()
                 .filter(m -> m.getMetadataField().toString('.').contentEquals(METADATA_IIIF_TOC))
                 .findFirst().map(m -> m.getValue() + TOC_SEPARATOR + label).orElse(label);
     }
 
+    /**
+     * Excludes bundles found in the iiif.exclude.toc.bundle list
+     *
+     * @param bundle    the dspace bundle
+     * @return  bundle name or null if bundle is excluded
+     */
+    private String getToCBundleLabel(Bundle bundle) {
+        String[] iiifAlternate = configurationService.getArrayProperty("iiif.exclude.toc.bundle");
+        if (Arrays.stream(iiifAlternate).anyMatch(x -> x.contentEquals(bundle.getName()))) {
+            return null;
+        }
+        return bundle.getName();
+    }
+
     /**
      * Return the iiif viewing hint for the item
      * 
diff --git a/dspace-oai/pom.xml b/dspace-oai/pom.xml
index f4acb0d297..59bcdf39a2 100644
--- a/dspace-oai/pom.xml
+++ b/dspace-oai/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>dspace-parent</artifactId>
         <groupId>org.dspace</groupId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -82,10 +82,6 @@
                     <groupId>org.mockito</groupId>
                     <artifactId>mockito-all</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-lang3</artifactId>
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java b/dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java
index 700105899a..e27a3ee947 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java
@@ -8,6 +8,10 @@
 package org.dspace.xoai.app;
 
 import static com.lyncode.xoai.dataprovider.core.Granularity.Second;
+import static java.util.Objects.nonNull;
+import static org.apache.commons.lang.StringUtils.EMPTY;
+import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_PARAM;
+import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_START;
 import static org.dspace.xoai.util.ItemUtils.retrieveMetadata;
 
 import java.io.ByteArrayOutputStream;
@@ -38,6 +42,8 @@ import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrQuery.ORDER;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.SolrInputDocument;
 import org.dspace.authorize.ResourcePolicy;
@@ -77,6 +83,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 public class XOAI {
     private static Logger log = LogManager.getLogger(XOAI.class);
 
+    // needed because the solr query only returns 10 rows by default
     private final Context context;
     private boolean optimize;
     private final boolean verbose;
@@ -94,8 +101,8 @@ public class XOAI {
     private final AuthorizeService authorizeService;
     private final ItemService itemService;
 
-    private final static ConfigurationService configurationService = DSpaceServicesFactory
-            .getInstance().getConfigurationService();
+    private final static ConfigurationService configurationService = DSpaceServicesFactory.getInstance()
+            .getConfigurationService();
 
     private List<XOAIExtensionItemCompilePlugin> extensionPlugins;
 
@@ -152,9 +159,8 @@ public class XOAI {
                 System.out.println("Using full import.");
                 result = this.indexAll();
             } else {
-                SolrQuery solrParams = new SolrQuery("*:*")
-                    .addField("item.lastmodified")
-                    .addSort("item.lastmodified", ORDER.desc).setRows(1);
+                SolrQuery solrParams = new SolrQuery("*:*").addField("item.lastmodified")
+                        .addSort("item.lastmodified", ORDER.desc).setRows(1);
 
                 SolrDocumentList results = DSpaceSolrSearch.query(solrServerResolver.getServer(), solrParams);
                 if (results.getNumFound() == 0) {
@@ -167,7 +173,6 @@ public class XOAI {
             }
             solrServerResolver.getServer().commit();
 
-
             if (optimize) {
                 println("Optimizing Index");
                 solrServerResolver.getServer().optimize();
@@ -183,12 +188,10 @@ public class XOAI {
     }
 
     private int index(Date last) throws DSpaceSolrIndexerException, IOException {
-        System.out
-            .println("Incremental import. Searching for documents modified after: "
-                         + last.toString());
+        System.out.println("Incremental import. Searching for documents modified after: " + last.toString());
         /*
-         * Index all changed or new items or items whose visibility is viable to
-         * change due to an embargo.
+         * Index all changed or new items or items whose visibility is viable to change
+         * due to an embargo.
          */
         try {
             Iterator<Item> discoverableChangedItems = itemService
@@ -204,31 +207,55 @@ public class XOAI {
     }
 
     /**
-     * Get all items already in the index which are viable to change visibility
-     * due to an embargo. Only consider those which haven't been modified
-     * anyways since the last update, so they aren't updated twice in one import
-     * run.
+     * Get all items already in the index which are viable to change visibility due
+     * to an embargo. Only consider those which haven't been modified anyways since
+     * the last update, so they aren't updated twice in one import run.
      *
-     * @param last
-     *            maximum date for an item to be considered for an update
-     * @return Iterator over list of items which might have changed their
-     *         visibility since the last update.
+     * @param last maximum date for an item to be considered for an update
+     * @return Iterator over list of items which might have changed their visibility
+     *         since the last update.
      * @throws DSpaceSolrIndexerException
      */
     private Iterator<Item> getItemsWithPossibleChangesBefore(Date last) throws DSpaceSolrIndexerException, IOException {
         try {
-            SolrQuery params = new SolrQuery("item.willChangeStatus:true").addField("item.id");
-            SolrDocumentList documents = DSpaceSolrSearch.query(solrServerResolver.getServer(), params);
+            SolrQuery params = new SolrQuery("item.willChangeStatus:true").addField("item.id").setRows(100)
+                    .addSort("item.handle", SolrQuery.ORDER.asc);
+            SolrClient solrClient = solrServerResolver.getServer();
+
             List<Item> items = new LinkedList<>();
-            for (int i = 0; i < documents.getNumFound(); i++) {
-                Item item = itemService.find(context,
-                        UUID.fromString((String) documents.get(i).getFieldValue("item.id")));
-                if (item.getLastModified().before(last)) {
-                    items.add(item);
+            boolean done = false;
+            /*
+             * Using solr cursors to paginate and prevent the query from returning 10
+             * SolrDocument objects only.
+             */
+            String cursorMark = CURSOR_MARK_START;
+            String nextCursorMark = EMPTY;
+
+            while (!done) {
+                params.set(CURSOR_MARK_PARAM, cursorMark);
+                QueryResponse response = solrClient.query(params);
+                nextCursorMark = response.getNextCursorMark();
+
+                for (SolrDocument document : response.getResults()) {
+                    Item item = itemService.find(context, UUID.fromString((String) document.getFieldValue("item.id")));
+                    if (nonNull(item)) {
+                        if (nonNull(item.getLastModified())) {
+                            if (item.getLastModified().before(last)) {
+                                items.add(item);
+                            }
+                        } else {
+                            log.warn("Skipping item with id " + item.getID());
+                        }
+                    }
                 }
+
+                if (cursorMark.equals(nextCursorMark)) {
+                    done = true;
+                }
+                cursorMark = nextCursorMark;
             }
             return items.iterator();
-        } catch (SolrServerException | SQLException | DSpaceSolrException ex) {
+        } catch (SolrServerException | SQLException ex) {
             throw new DSpaceSolrIndexerException(ex.getMessage(), ex);
         }
     }
@@ -250,11 +277,10 @@ public class XOAI {
     }
 
     /**
-     * Check if an item is already indexed. Using this, it is possible to check
-     * if withdrawn or nondiscoverable items have to be indexed at all.
+     * Check if an item is already indexed. Using this, it is possible to check if
+     * withdrawn or nondiscoverable items have to be indexed at all.
      *
-     * @param item
-     *            Item that should be checked for its presence in the index.
+     * @param item Item that should be checked for its presence in the index.
      * @return has it been indexed?
      */
     private boolean checkIfIndexed(Item item) throws IOException {
@@ -266,11 +292,11 @@ public class XOAI {
             return false;
         }
     }
-     /**
+
+    /**
      * Check if an item is flagged visible in the index.
      *
-     * @param item
-     *            Item that should be checked for its presence in the index.
+     * @param item Item that should be checked for its presence in the index.
      * @return has it been indexed?
      */
     private boolean checkIfVisibleInOAI(Item item) throws IOException {
@@ -287,8 +313,7 @@ public class XOAI {
         }
     }
 
-    private int index(Iterator<Item> iterator)
-        throws DSpaceSolrIndexerException {
+    private int index(Iterator<Item> iterator) throws DSpaceSolrIndexerException {
         try {
             int i = 0;
             int batchSize = configurationService.getIntProperty("oai.import.batch.size", 1000);
@@ -302,7 +327,7 @@ public class XOAI {
                     } else {
                         list.add(this.index(item));
                     }
-                    //Uncache the item to keep memory consumption low
+                    // Uncache the item to keep memory consumption low
                     context.uncacheEntity(item);
 
                 } catch (SQLException | IOException | XMLStreamException | WritingXmlException ex) {
@@ -334,12 +359,11 @@ public class XOAI {
     }
 
     /**
-     * Method to get the most recent date on which the item changed concerning
-     * the OAI deleted status (policy start and end dates for all anonymous READ
+     * Method to get the most recent date on which the item changed concerning the
+     * OAI deleted status (policy start and end dates for all anonymous READ
      * policies and the standard last modification date)
      *
-     * @param item
-     *            Item
+     * @param item Item
      * @return date
      * @throws SQLException
      */
@@ -382,17 +406,16 @@ public class XOAI {
         boolean isIndexed = this.checkIfIndexed(item);
 
         /*
-         * If the item is not under embargo, it should be visible. If it is,
-         * make it invisible if this is the first time it is indexed. For
-         * subsequent index runs, keep the current status, so that if the item
-         * is embargoed again, it is flagged as deleted instead and does not
-         * just disappear, or if it is still under embargo, it won't become
-         * visible and be known to harvesters as deleted before it gets
-         * disseminated for the first time. The item has to be indexed directly
-         * after publication even if it is still embargoed, because its
-         * lastModified date will not change when the embargo end date (or start
-         * date) is reached. To circumvent this, an item which will change its
-         * status in the future will be marked as such.
+         * If the item is not under embargo, it should be visible. If it is, make it
+         * invisible if this is the first time it is indexed. For subsequent index runs,
+         * keep the current status, so that if the item is embargoed again, it is
+         * flagged as deleted instead and does not just disappear, or if it is still
+         * under embargo, it won't become visible and be known to harvesters as deleted
+         * before it gets disseminated for the first time. The item has to be indexed
+         * directly after publication even if it is still embargoed, because its
+         * lastModified date will not change when the embargo end date (or start date)
+         * is reached. To circumvent this, an item which will change its status in the
+         * future will be marked as such.
          */
 
         boolean isPublic = isEmbargoed ? (isIndexed ? isCurrentlyVisible : false) : true;
@@ -404,33 +427,31 @@ public class XOAI {
         doc.addField("item.willChangeStatus", willChangeStatus(item));
 
         /*
-         * Mark an item as deleted not only if it is withdrawn, but also if it
-         * is made private, because items should not simply disappear from OAI
-         * with a transient deletion policy. Do not set the flag for still
-         * invisible embargoed items, because this will override the item.public
-         * flag.
+         * Mark an item as deleted not only if it is withdrawn, but also if it is made
+         * private, because items should not simply disappear from OAI with a transient
+         * deletion policy. Do not set the flag for still invisible embargoed items,
+         * because this will override the item.public flag.
          */
 
         doc.addField("item.deleted",
                 (item.isWithdrawn() || !item.isDiscoverable() || (isEmbargoed ? isPublic : false)));
 
         /*
-         * An item that is embargoed will potentially not be harvested by
-         * incremental harvesters if the from and until params do not encompass
-         * both the standard lastModified date and the anonymous-READ resource
-         * policy start date. The same is true for the end date, where
-         * harvesters might not get a tombstone record. Therefore, consider all
-         * relevant policy dates and the standard lastModified date and take the
-         * most recent of those which have already passed.
+         * An item that is embargoed will potentially not be harvested by incremental
+         * harvesters if the from and until params do not encompass both the standard
+         * lastModified date and the anonymous-READ resource policy start date. The same
+         * is true for the end date, where harvesters might not get a tombstone record.
+         * Therefore, consider all relevant policy dates and the standard lastModified
+         * date and take the most recent of those which have already passed.
          */
-        doc.addField("item.lastmodified", SolrUtils.getDateFormatter()
-                .format(this.getMostRecentModificationDate(item)));
+        doc.addField("item.lastmodified",
+                SolrUtils.getDateFormatter().format(this.getMostRecentModificationDate(item)));
 
         if (item.getSubmitter() != null) {
             doc.addField("item.submitter", item.getSubmitter().getEmail());
         }
 
-        for (Collection col: item.getCollections()) {
+        for (Collection col : item.getCollections()) {
             doc.addField("item.collections", "col_" + col.getHandle().replace("/", "_"));
         }
         for (Community com : collectionsService.flatParentCommunities(context, item)) {
@@ -457,8 +478,7 @@ public class XOAI {
 
         // Message output before processing - for debugging purposes
         if (verbose) {
-            println(String.format("Item %s with handle %s is about to be indexed",
-                    item.getID().toString(), handle));
+            println(String.format("Item %s with handle %s is about to be indexed", item.getID().toString(), handle));
         }
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -476,8 +496,7 @@ public class XOAI {
         doc.addField("item.compile", out.toString());
 
         if (verbose) {
-            println(String.format("Item %s with handle %s indexed",
-                    item.getID().toString(), handle));
+            println(String.format("Item %s with handle %s indexed", item.getID().toString(), handle));
         }
 
         return doc;
@@ -510,12 +529,10 @@ public class XOAI {
         return pub;
     }
 
-
     private static boolean getKnownExplanation(Throwable t) {
         if (t instanceof ConnectException) {
-            System.err.println("Solr server ("
-                    + configurationService.getProperty("oai.solr.url", "")
-                    + ") is down, turn it on.");
+            System.err.println(
+                    "Solr server (" + configurationService.getProperty("oai.solr.url", "") + ") is down, turn it on.");
             return true;
         }
 
@@ -544,7 +561,7 @@ public class XOAI {
     }
 
     private static void cleanCache(XOAIItemCacheService xoaiItemCacheService, XOAICacheService xoaiCacheService)
-        throws IOException {
+            throws IOException {
         System.out.println("Purging cached OAI responses.");
         xoaiItemCacheService.deleteAll();
         xoaiCacheService.deleteAll();
@@ -557,10 +574,8 @@ public class XOAI {
 
     public static void main(String[] argv) throws IOException, ConfigurationException {
 
-
-        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(new Class[] {
-            BasicConfiguration.class
-        });
+        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(
+                new Class[] { BasicConfiguration.class });
 
         XOAICacheService cacheService = applicationContext.getBean(XOAICacheService.class);
         XOAIItemCacheService itemCacheService = applicationContext.getBean(XOAIItemCacheService.class);
@@ -571,21 +586,19 @@ public class XOAI {
             CommandLineParser parser = new DefaultParser();
             Options options = new Options();
             options.addOption("c", "clear", false, "Clear index before indexing");
-            options.addOption("o", "optimize", false,
-                              "Optimize index at the end");
+            options.addOption("o", "optimize", false, "Optimize index at the end");
             options.addOption("v", "verbose", false, "Verbose output");
             options.addOption("h", "help", false, "Shows some help");
             options.addOption("n", "number", true, "FOR DEVELOPMENT MUST DELETE");
             CommandLine line = parser.parse(options, argv);
 
-            String[] validSolrCommands = {COMMAND_IMPORT, COMMAND_CLEAN_CACHE};
-            String[] validDatabaseCommands = {COMMAND_CLEAN_CACHE, COMMAND_COMPILE_ITEMS, COMMAND_ERASE_COMPILED_ITEMS};
-
+            String[] validSolrCommands = { COMMAND_IMPORT, COMMAND_CLEAN_CACHE };
+            String[] validDatabaseCommands = { COMMAND_CLEAN_CACHE, COMMAND_COMPILE_ITEMS,
+                COMMAND_ERASE_COMPILED_ITEMS };
 
             boolean solr = true; // Assuming solr by default
             solr = !("database").equals(configurationService.getProperty("oai.storage", "solr"));
 
-
             boolean run = false;
             if (line.getArgs().length > 0) {
                 if (solr) {
@@ -607,10 +620,7 @@ public class XOAI {
 
                 if (COMMAND_IMPORT.equals(command)) {
                     ctx = new Context(Context.Mode.READ_ONLY);
-                    XOAI indexer = new XOAI(ctx,
-                                            line.hasOption('o'),
-                                            line.hasOption('c'),
-                                            line.hasOption('v'));
+                    XOAI indexer = new XOAI(ctx, line.hasOption('o'), line.hasOption('c'), line.hasOption('v'));
 
                     applicationContext.getAutowireCapableBeanFactory().autowireBean(indexer);
 
@@ -635,8 +645,7 @@ public class XOAI {
                 }
 
                 System.out.println("OAI 2.0 manager action ended. It took "
-                                       + ((System.currentTimeMillis() - start) / 1000)
-                                       + " seconds.");
+                        + ((System.currentTimeMillis() - start) / 1000) + " seconds.");
             } else {
                 usage();
             }
@@ -688,7 +697,7 @@ public class XOAI {
 
     private static void usage() {
         boolean solr = true; // Assuming solr by default
-        solr = !("database").equals(configurationService.getProperty("oai.storage","solr"));
+        solr = !("database").equals(configurationService.getProperty("oai.storage", "solr"));
 
         if (solr) {
             System.out.println("OAI Manager Script");
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/controller/DSpaceOAIDataProvider.java b/dspace-oai/src/main/java/org/dspace/xoai/controller/DSpaceOAIDataProvider.java
index 212f1e3406..379f2fa181 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/controller/DSpaceOAIDataProvider.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/controller/DSpaceOAIDataProvider.java
@@ -72,7 +72,12 @@ public class DSpaceOAIDataProvider {
 
     private DSpaceResumptionTokenFormatter resumptionTokenFormat = new DSpaceResumptionTokenFormatter();
 
-    @RequestMapping({"", "/"})
+    @RequestMapping("")
+    public void index(HttpServletResponse response, HttpServletRequest request) throws IOException {
+        response.sendRedirect(request.getRequestURI() + "/");
+    }
+
+    @RequestMapping({"/"})
     public String indexAction(HttpServletResponse response, Model model) throws ServletException {
         try {
             XOAIManager manager = xoaiManagerResolver.getManager();
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java
index 26dd976495..e67e9c56bd 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java
@@ -22,6 +22,7 @@ import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 
 public class DSpaceResourceResolver implements ResourceResolver {
+    // Requires usage of Saxon as OAI-PMH uses some XSLT 2 functions
     private static final TransformerFactory transformerFactory = TransformerFactory
             .newInstance("net.sf.saxon.TransformerFactoryImpl", null);
 
diff --git a/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java b/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java
index 6fab56b526..42dbed04b6 100644
--- a/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java
+++ b/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/AbstractXSLTest.java
@@ -19,6 +19,7 @@ import javax.xml.transform.stream.StreamSource;
 import org.apache.commons.io.IOUtils;
 
 public abstract class AbstractXSLTest {
+    // Requires usage of Saxon as OAI-PMH uses some XSLT 2 functions
     private static final TransformerFactory factory = TransformerFactory
             .newInstance("net.sf.saxon.TransformerFactoryImpl", null);
 
diff --git a/dspace-rdf/pom.xml b/dspace-rdf/pom.xml
index 8a25dece7e..6dbe3f3466 100644
--- a/dspace-rdf/pom.xml
+++ b/dspace-rdf/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/dspace-rest/pom.xml b/dspace-rest/pom.xml
index c60383384f..f4df15ab1c 100644
--- a/dspace-rest/pom.xml
+++ b/dspace-rest/pom.xml
@@ -3,7 +3,7 @@
     <groupId>org.dspace</groupId>
     <artifactId>dspace-rest</artifactId>
     <packaging>war</packaging>
-    <version>7.2</version>
+    <version>7.5-SNAPSHOT</version>
     <name>DSpace (Deprecated) REST Webapp</name>
     <description>DSpace RESTful Web Services API. NOTE: this REST API is DEPRECATED.
         Please consider using the REST API in the dspace-server-webapp instead!</description>
@@ -12,14 +12,13 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
     <properties>
         <!-- This is the path to the root [dspace-src] directory. -->
         <root.basedir>${basedir}/..</root.basedir>
-        <spring-security.version>5.3.10.RELEASE</spring-security.version>
     </properties>
     <build>
         <plugins>
@@ -63,45 +62,11 @@
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
             <version>${jersey.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-module-jaxb-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                    <artifactId>jackson-jaxrs-base</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                    <artifactId>jackson-jaxrs-json-provider</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.module</groupId>
-                    <artifactId>jackson-module-jaxb-annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <version>${jackson.version}</version>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-jaxb</artifactId>
+            <version>${jersey.version}</version>
         </dependency>
 
         <!-- Spring dependencies -->
@@ -156,11 +121,6 @@
                     <groupId>jakarta.annotation</groupId>
                     <artifactId>jakarta.annotation-api</artifactId>
                 </exclusion>
-                <!-- Newer version provided by solr-cell -->
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -193,30 +153,9 @@
             <version>${spring-security.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>2.2.2</version>
-        </dependency>
-
-        <!-- Use DSpace, for now, an older version to minimize spring generated dependency on Discovery -->
         <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- Connecting to DSpace datasource sets a dependency on Postgres DB-->
diff --git a/dspace-rest/src/main/webapp/static/reports/restCollReport.js b/dspace-rest/src/main/webapp/static/reports/restCollReport.js
index 1d1c04ae07..8d800a8edc 100644
--- a/dspace-rest/src/main/webapp/static/reports/restCollReport.js
+++ b/dspace-rest/src/main/webapp/static/reports/restCollReport.js
@@ -11,7 +11,7 @@ var CollReport = function() {
     //this.hasSorttable = function(){return true;}
     this.getLangSuffix = function(){
       return "[en]";
-    }
+    };
     
     //Indicate if Password Authentication is supported
     //this.makeAuthLink = function(){return true;};
@@ -38,7 +38,7 @@ var CollReport = function() {
             icollection   : "",
             ifilter       : "",
         };
-    }
+    };
     this.getCurrentParameters = function(){
         return {
             "show_fields[]" : this.myMetadataFields.getShowFields(),
@@ -49,7 +49,7 @@ var CollReport = function() {
             icollection    : $("#icollection").val(),
             ifilter        : $("#ifilter").val(),
         };
-    }
+    };
     var self = this;
 
     this.init = function() {
@@ -61,7 +61,7 @@ var CollReport = function() {
             collapsible: true,
             active: 2
         });
-    }
+    };
     
     this.myAuth.callback = function(data) {
         self.createCollectionTable();
@@ -71,11 +71,11 @@ var CollReport = function() {
         $("#refresh-fields,#refresh-fields-bits").bind("click", function(){
             self.drawItemTable($("#icollection").val(), $("#ifilter").val(), 0);
         });
-    }
+    };
 
     this.createCollectionTable = function() {
         var self = this;
-         var tbl = $("<table/>");
+        var tbl = $("<table/>");
         tbl.attr("id","table");
         $("#report").replaceWith(tbl);
 
@@ -93,7 +93,7 @@ var CollReport = function() {
         self.myHtmlUtil.makeTotalCol(thn);
         
         self.addCollections();
-    }
+    };
 
     this.addCollections = function() {
         var self = this;
@@ -144,8 +144,6 @@ var CollReport = function() {
         
         self.myHtmlUtil.addTd(tr, parval).addClass("title comm");
         self.myHtmlUtil.addTdAnchor(tr, coll.name, self.ROOTPATH + coll.handle).addClass("title");
-        var td = self.myHtmlUtil.addTd(tr, "").addClass("num").addClass("link").addClass("numCount");
-        td = self.myHtmlUtil.addTd(tr, "").addClass("num").addClass("numFiltered");
     };
     
     
@@ -197,7 +195,7 @@ var CollReport = function() {
                   $(".showCollections").attr("disabled", false);
             }
         });    
-    }
+    };
     
     this.loadData = function() {
         self.spinner.spin($("h1")[0]);
@@ -208,7 +206,7 @@ var CollReport = function() {
         $("#table tr.data").addClass("processing");
         self.myFilters.filterString = self.myFilters.getFilterList();
         self.doRow(0, self.THREADS, self.loadId);
-    }
+    };
     
     this.doRow = function(row, threads, curLoadId) {
         if (self.loadId != curLoadId) return;
@@ -285,14 +283,14 @@ var CollReport = function() {
                         $("#table").addClass("sortable");
                         sorttable.makeSortable($("#table")[0]);                        
                     }
-    }
-    
+    };
+
     this.totalFilters = function() {
-                    var colcount = $("#table tr th").length;
-                    for(var i=4; i<colcount; i++) {
-                        self.myHtmlUtil.totalCol(i);
-                    }
-                }
+        var colcount = $("#table tr th").length;
+        for(var i=4; i<colcount; i++) {
+            self.myHtmlUtil.totalCol(i);
+        }
+    };
 
     this.updateRow = function(cid, offset) {
         var tr = $("tr[cid="+cid+"]");
@@ -351,7 +349,7 @@ var CollReport = function() {
             var title = "Collection partially processed, item counts are incomplete. ";
             if (numItems >= self.TOOBIG) {
                 td.addClass("toobig");
-                title+= "\nIt will take significant time to apply this filter to the entire collection."
+                title+= "\nIt will take significant time to apply this filter to the entire collection.";
             }            
             td.attr("title", title);
             return false;
@@ -359,7 +357,7 @@ var CollReport = function() {
             self.totalFilters();
         }
         return true;
-    }
+    };
     
     this.setCellCount = function(tr, cid, offset, isPartial, itemFilter) {
         var filterName = itemFilter["filter-name"];
@@ -391,7 +389,7 @@ var CollReport = function() {
                 $("#ifilter").val(filterName);
             });                            
         }        
-    }
+    };
     
                 
     this.drawItemTable = function(cid, filter, offset) {
@@ -433,7 +431,7 @@ var CollReport = function() {
             offset: offset,
             "show_fields[]" : fields,
             "show_fields_bits[]" : bitfields,
-        }
+        };
         
         $.ajax({
             url: "/rest/filtered-collections/"+cid,
@@ -452,7 +450,6 @@ var CollReport = function() {
                     self.myHtmlUtil.addTd(tr, item.name).addClass("ititle");
                     if (fields != null) {
                         $.each(fields, function(index, field){
-                            var text = "";        
                             var td = self.myHtmlUtil.addTd(tr, "");
                             $.each(item.metadata, function(mindex,mv){
                                 if (mv.key == field) {
@@ -493,7 +490,7 @@ var CollReport = function() {
                 $("#itemResults").accordion("option", "active", self.IACCIDX_ITEM);
             }
         });
-    }
+    };
 
     //Ignore the first column containing a row number and the item handle
     this.exportCol = function(colnum, col) {
@@ -503,8 +500,8 @@ var CollReport = function() {
         data += (colnum == 1) ? "" : ",";
         data += self.exportCell(col);
         return data;
-    }
-}
+    };
+};
 CollReport.prototype = Object.create(Report.prototype);
 
 $(document).ready(function(){
diff --git a/dspace-rest/src/main/webapp/static/reports/restQueryReport.js b/dspace-rest/src/main/webapp/static/reports/restQueryReport.js
index 9a8297fb69..18e9a61d08 100644
--- a/dspace-rest/src/main/webapp/static/reports/restQueryReport.js
+++ b/dspace-rest/src/main/webapp/static/reports/restQueryReport.js
@@ -12,7 +12,7 @@ var QueryReport = function() {
     //this.hasSorttable = function(){return true;}
     this.getLangSuffix = function(){
       return "[en]";
-    }
+    };
     
     //Indicate if Password Authentication is supported
     //this.makeAuthLink = function(){return true;};
@@ -31,7 +31,7 @@ var QueryReport = function() {
             "limit"         : this.ITEM_LIMIT,
             "offset"        : 0,          
         };
-    }
+    };
     this.getCurrentParameters = function(){
     var expand = "parentCollection,metadata";
     if (this.myBitstreamFields.hasBitstreamFields()) {
@@ -54,21 +54,20 @@ var QueryReport = function() {
             paramArr[paramArr.length] = $(this).val();
         });
         return params;
-    }
+    };
     var self = this;
 
     this.init = function() {
         this.baseInit();    
-        var communitySelector = new CommunitySelector(this, $("#collSelector"), this.myReportParameters.params["collSel[]"]);
-    }
+    };
     
     this.initMetadataFields = function() {
         this.myMetadataFields = new QueryableMetadataFields(self);
         this.myMetadataFields.load();        
-    }
+    };
     this.myAuth.callback = function(data) {
-        $(".query-button").click(function(){self.runQuery();})
-    }
+        $(".query-button").click(function(){self.runQuery();});
+    };
 
     this.runQuery = function() {
         this.spinner.spin($("body")[0]);
@@ -93,7 +92,7 @@ var QueryReport = function() {
                 $("button").not("#next,#prev").attr("disabled", false);
             }
         });
-    }
+    };
     
     this.drawItemFilterTable = function(data) {
         $("#itemtable").replaceWith($('<table id="itemtable" class="sortable"></table>'));
@@ -150,7 +149,7 @@ var QueryReport = function() {
                 });
                 var fieldtext = self.myBitstreamFields.getKeyText(key, item, data.bitfields);
                 for(var j=0; j<fieldtext.length; j++) {
-                  td.append($("<div>"+fieldtext[j]+"</div>"))
+                  td.append($("<div>"+fieldtext[j]+"</div>"));
                 }
             }
         });
@@ -173,7 +172,7 @@ var QueryReport = function() {
             sorttable.makeSortable(itbl[0]);            
         }
         $("#metadatadiv").accordion("option", "active", $("#metadatadiv > h3").length - 1); 
-    }
+    };
     
     //Ignore the first column containing a row number and the item handle, get handle for the collection
     this.exportCol = function(colnum, col) {
@@ -189,8 +188,8 @@ var QueryReport = function() {
         } else {
             data += self.exportCell(col);        }
         return data;
-    }
-}
+    };
+};
 QueryReport.prototype = Object.create(Report.prototype);
 
 $(document).ready(function(){
@@ -223,7 +222,7 @@ var QueryableMetadataFields = function(report) {
         self.initQueries();        
         report.spinner.stop();
         $(".query-button").attr("disabled", false);
-    }
+    };
     
     this.initQueries = function() {
         $("#predefselect")
@@ -271,7 +270,7 @@ var QueryableMetadataFields = function(report) {
                   self.drawFilterQuery("*","matches","^.*[^[:ascii:]].*$");                        
               }
           });
-    }
+    };
 
     this.drawFilterQuery = function(pField, pOp, pVal) {
         var div = $("<div class='metadata'/>").appendTo("#queries");
@@ -327,7 +326,7 @@ var QueryableMetadataFields = function(report) {
             self.queryButtons();
         });
         self.queryButtons();
-    }
+    };
 
     this.valField = function(valop) {
         var val = valop.val();
@@ -337,7 +336,7 @@ var QueryableMetadataFields = function(report) {
         if (disableval) {
             valinput.val("");        
         }
-    }
+    };
 
     this.queryButtons = function() {
         $("button.field_plus").attr("disabled",true);
@@ -346,6 +345,6 @@ var QueryableMetadataFields = function(report) {
         if ($("button.field_minus").length == 1) {
             $("button.field_minus").attr("disabled",true);                
         }
-    }
-}
+    };
+};
 QueryableMetadataFields.prototype = Object.create(MetadataFields.prototype);
\ No newline at end of file
diff --git a/dspace-rest/src/main/webapp/static/reports/restReport.js b/dspace-rest/src/main/webapp/static/reports/restReport.js
index 747e78f75a..8c9dfd9ad4 100644
--- a/dspace-rest/src/main/webapp/static/reports/restReport.js
+++ b/dspace-rest/src/main/webapp/static/reports/restReport.js
@@ -11,7 +11,7 @@ var Report = function() {
     this.COUNT_LIMIT = 500;
     this.ITEM_LIMIT = 100;
 
-    this.ROOTPATH = "/handle/"
+    this.ROOTPATH = "/handle/";
 
     //Indicate if Password Authentication is supported
     this.makeAuthLink = function(){return false;};
@@ -23,23 +23,23 @@ var Report = function() {
     //Override this to return obj.id for DSpace 5 versions
     this.getId = function(obj) {
         return obj.uuid;
-    }
+    };
 
     //Override this method is sortable.js has been included
     this.hasSorttable = function() {
         return false;
-    }
+    };
 
     this.getDefaultParameters = function(){
         return {};
-    }
+    };
     this.getCurrentParameters = function(){
         return {};
-    }
+    };
 
     this.saveUrl = function() {
         this.myReportParameters.saveAsUrl(this.getCurrentParameters());
-    }
+    };
 
     this.getLoginPayload = function() {
         //Placeholder to allow a customized report to prompt for email/password
@@ -53,15 +53,15 @@ var Report = function() {
         } else {
            return {email: email, password: pass};
         }
-    }
+    };
     this.getLangSuffix = function(){
         return "";
-    }
+    };
     this.myAuth = new Auth(this);
     this.myAuth.authStat();
     this.myAuth.callback = function(data) {
         self.spinner.stop();
-    }
+    };
     this.myHtmlUtil = new HtmlUtil();
     this.spinner = new Spinner({
         lines: 13, // The number of lines to draw
@@ -103,7 +103,7 @@ var Report = function() {
         itemsTitle += " (" + (offset+1) + " - " + last + suff + ")";
         $("#prev,#next").attr("disabled",true);
         $("#itemdiv h3").text(itemsTitle);
-    $("#exlimit").removeClass("red");
+        $("#exlimit").removeClass("red");
         if (offset > 0) $("#prev").attr("disabled", false);
         $("#prev").off("click").on("click", funcdec);
         //in case of filters, always allow next
@@ -112,14 +112,14 @@ var Report = function() {
             $("#next").attr("disabled", false);
         } else if (offset + limit  < total) {
             $("#next").attr("disabled", false);
-      $("#exlimit").addClass("red");
+            $("#exlimit").addClass("red");
         } else if (limit == total) {
             //total may only be accurate to one page
             $("#next").attr("disabled", false);
-      $("#exlimit").addClass("red");
+            $("#exlimit").addClass("red");
         }
         $("#next").off("click").on("click", funcinc);
-    }
+    };
 
     this.myReportParameters = undefined;
     this.myFilters = undefined;
@@ -128,12 +128,12 @@ var Report = function() {
     this.initMetadataFields = function() {
         this.myMetadataFields = new MetadataFields(self);
         this.myMetadataFields.load();
-    }
+    };
 
   this.initBitstreamFields = function() {
     this.myBitstreamFields = new BitstreamFields(self);
     this.myBitstreamFields.load();
-  }
+  };
 
     this.baseInit = function() {
         this.myReportParameters = new ReportParameters(
@@ -144,7 +144,7 @@ var Report = function() {
         this.myFilters = new Filters(this.myReportParameters.params["filters"]);
         this.initMetadataFields();
         this.initBitstreamFields();
-        this.getActiveTab = function(){return 1;}
+        this.getActiveTab = function(){return 1;};
         $("#metadatadiv").accordion({
             heightStyle: "content",
             collapsible: true,
@@ -158,7 +158,7 @@ var Report = function() {
         });
         this.myFilters.createFilterTable(this.myReportParameters.params.filters);
         this.myAuth.init();
-    }
+    };
 
     this.makeCsv = function(rows) {
         var itemdata = "";
@@ -169,13 +169,13 @@ var Report = function() {
             });
         });
         return itemdata;
-    }
+    };
 
     this.export = function(rows) {
     var itemdata = "data:text/csv;charset=utf-8," + this.makeCsv(rows);
         var encodedUri = encodeURI(itemdata);
         window.open(encodedUri);
-    }
+    };
 
     //this is meant to be overridden for each report
     this.exportCol = function(colnum, col) {
@@ -183,7 +183,7 @@ var Report = function() {
         data += (colnum == 0) ? "" : ",";
         data += self.exportCell(col);
         return data;
-    }
+    };
 
     this.exportCell = function(col) {
         data = "\"";
@@ -199,13 +199,12 @@ var Report = function() {
         });
         data += "\"";
         return data;
-    }
+    };
 
     this.init = function() {
         this.baseInit();
-    }
-
-}
+    };
+};
 
 var Auth = function(report) {
     this.report = report;
@@ -214,7 +213,7 @@ var Auth = function(report) {
     };
     this.saveToken = function(data) {
         this.TOKEN = data;
-    }
+    };
     this.init = function() {
         var loginPayload = report.getLoginPayload();
         if (loginPayload == undefined) {
@@ -240,7 +239,7 @@ var Auth = function(report) {
                 self.callback();
             }
         });
-    }
+    };
 
     this.verifyShibLogin = function() {
         var self = this;
@@ -248,7 +247,7 @@ var Auth = function(report) {
             url: "/rest/shibboleth-login",
             success: self.authStat
         });
-    }
+    };
 
     this.authStat = function() {
         var self = this;
@@ -278,7 +277,7 @@ var Auth = function(report) {
                 }
             }
         });
-    }
+    };
 
     this.logout = function() {
         var self = this;
@@ -291,15 +290,15 @@ var Auth = function(report) {
                 self.authStat();
             }
         });
-    }
+    };
     this.getHeaders = function() {
         var HEADERS = {};
         if (this.TOKEN != null) {
             HEADERS['rest-dspace-token'] = this.TOKEN;
         }
         return HEADERS;
-    }
-}
+    };
+};
 
 var ReportParameters = function(defaultParams, prmstr) {
     this.params = defaultParams;
@@ -326,21 +325,21 @@ var ReportParameters = function(defaultParams, prmstr) {
     this.getOffset = function() {
         var offset = $("#offset").val();
         return $.isNumeric(offset) ? Number(offset) : this.offset;
-    }
+    };
 
     this.getNextOffset = function() {
         return this.getOffset() + this.getLimit();
-    }
+    };
 
     this.getPrevOffset = function() {
         var v = this.getOffset() - this.getLimit();
         return v < 0 ? 0 : v;
-    }
+    };
 
     this.getLimit = function() {
         var limit = $("#limit").val();
         return $.isNumeric(limit) ? Number(limit) : this.limit;
-    }
+    };
 
     this.updateOffset = function(increment) {
         var val = $("#offset").val();
@@ -352,13 +351,13 @@ var ReportParameters = function(defaultParams, prmstr) {
                 $("#offset").val(this.getPrevOffset());
             }
         }
-    }
+    };
 
     this.saveAsUrl = function(params) {
         var pstr = $.param(params).replace(/%5B%5D/g,"[]");
         window.location.search = pstr;
-    }
-}
+    };
+};
 
 
 var Filters = function() {
@@ -397,7 +396,7 @@ var Filters = function() {
                 });
             }
         );
-    }
+    };
 
     this.addFilter = function(val, categories, category, title, description, cname) {
         var catdiv = null;
@@ -425,7 +424,7 @@ var Filters = function() {
         div.append(label);
         catdiv.append(div);
         return input;
-    }
+    };
 
     this.getFilterList = function() {
         var list="";
@@ -441,8 +440,8 @@ var Filters = function() {
             list = "none";
         }
         return list;
-    }
-}
+    };
+};
 
 var MetadataFields = function(report) {
     this.metadataSchemas = undefined;
@@ -461,21 +460,20 @@ var MetadataFields = function(report) {
             complete: function(xhr, status) {
             }
         });
-    }
+    };
 
     this.initFields = function(data, report) {
         var params = report.myReportParameters.params;
         self.metadataSchemas = data;
         self.drawShowFields(params["show_fields[]"]);
-    }
+    };
 
     this.getShowFields = function(){
         var val = $("#show-fields select").val();
         return val == null ? Array() : val;
-    }
+    };
 
     this.drawShowFields = function(pfields) {
-        var self = this;
         var sel = $("<select name='show_fields'/>").attr("multiple","true").attr("size","8").appendTo("#show-fields");
         $.each(this.metadataSchemas, function(index, schema){
             if (schema.prefix == 'eperson') {
@@ -493,16 +491,16 @@ var MetadataFields = function(report) {
                 sel.append(opt);
             });
         });
-    }
+    };
 
     this.initQueries = function(){};
-}
+};
 
 var BitstreamFields = function(report) {
   var self = this;
   this.isOriginal = function(bit){
     return bit.bundleName === "ORIGINAL";
-  }
+  };
   this.map = [
     {
       key: "original-file-names",
@@ -559,7 +557,7 @@ var BitstreamFields = function(report) {
 
   this.load = function(){
     self.initFields(report);
-  }
+  };
 
   this.initFields = function(report) {
     var params = report.myReportParameters.params;
@@ -568,11 +566,12 @@ var BitstreamFields = function(report) {
 
   this.hasBitstreamFields = function() {
     return self.getShowFieldsBits() != null;
-  }
+  };
+
   this.getShowFieldsBits = function(){
     var val = $("#show-fields-bits select").val();
     return val == null ? Array() : val;
-  }
+  };
 
   this.drawShowFieldsBits = function(pfieldsBits) {
     var sel = $("<select name='show_fields_bits'/>");
@@ -584,7 +583,7 @@ var BitstreamFields = function(report) {
       }
       sel.append(opt);
     }
-  }
+  };
 
 
   this.getKeyText = function(key, item, bitfields) {
@@ -620,15 +619,15 @@ var BitstreamFields = function(report) {
       }
     });
     return ret;
-  }
-}
+  };
+};
 
 var HtmlUtil = function() {
     this.addTr = function(tbl) {
         var tr = $("<tr/>");
         tbl.append(tr);
         return tr;
-    }
+    };
 
     this.addTd = function(tr, val) {
         var td = $("<td/>");
@@ -637,7 +636,7 @@ var HtmlUtil = function() {
         }
         tr.append(td);
         return td;
-    }
+    };
 
     this.addTh = function(tr, val) {
         var th = $("<th/>");
@@ -646,12 +645,11 @@ var HtmlUtil = function() {
         }
         tr.append(th);
         return th;
-    }
-
+    };
 
     this.addTdAnchor = function(tr, val, href) {
         return this.addTd(tr, this.getAnchor(val, href));
-    }
+    };
 
     this.getAnchor = function(val, href) {
         var a = $("<a/>");
@@ -660,29 +658,29 @@ var HtmlUtil = function() {
         a.attr("target", "_blank");
         a.attr("rel", "noopener noreferrer");
         return a;
-    }
+    };
 
     this.createOpt = function(name, val) {
         var opt = $("<option/>");
         opt.attr("value", val).text(name);
         return opt;
-    }
+    };
 
     this.addOpt = function(sel, name, val) {
         var opt = this.createOpt(name, val);
         sel.append(opt);
         return opt;
-    }
+    };
 
     this.addDisabledOpt = function(sel, name, val) {
         var opt = this.createOpt(name, val).attr("disabled",true);
         sel.append(opt);
         return opt;
-    }
+    };
 
     this.makeTotalCol = function(th) {
         th.append($("<hr><span class='num'>-</span>"));
-    }
+    };
 
     this.totalCol = function(index){
         var total = 0;
@@ -693,9 +691,9 @@ var HtmlUtil = function() {
             }
         });
         $($("#table tr.header th")[index]).find("span.num").text(total);
-    }
+    };
 
-}
+};
 
 var CommunitySelector = function(report, parent, paramCollSel) {
     var self = this;
@@ -743,5 +741,5 @@ var CommunitySelector = function(report, parent, paramCollSel) {
                 self.addCommLabel(collSel, scomm, indent + 1, paramCollSel);
             });
         }
-    }
-}
+    };
+};
diff --git a/dspace-rest/src/main/webapp/static/reports/spin.js b/dspace-rest/src/main/webapp/static/reports/spin.js
index a52f40e0e7..afe41355ff 100644
--- a/dspace-rest/src/main/webapp/static/reports/spin.js
+++ b/dspace-rest/src/main/webapp/static/reports/spin.js
@@ -29,13 +29,13 @@ THE SOFTWARE.
 (function(root, factory) {
 
   /* CommonJS */
-  if (typeof exports == 'object')  module.exports = factory()
+  if (typeof exports == 'object')  module.exports = factory();
 
   /* AMD module */
-  else if (typeof define == 'function' && define.amd) define(factory)
+  else if (typeof define == 'function' && define.amd) define(factory);
 
   /* Browser global */
-  else root.Spinner = factory()
+  else root.Spinner = factory();
 }
 (this, function() {
   "use strict";
@@ -43,6 +43,7 @@ THE SOFTWARE.
   var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
     , animations = {} /* Animation rules keyed by their name */
     , useCssAnimations /* Whether to use CSS animations or setTimeout */
+    ;
 
   /**
    * Utility function to create elements. If no tag name is given,
@@ -51,9 +52,10 @@ THE SOFTWARE.
   function createEl(tag, prop) {
     var el = document.createElement(tag || 'div')
       , n
+      ;
 
-    for(n in prop) el[n] = prop[n]
-    return el
+    for(n in prop) el[n] = prop[n];
+    return el;
   }
 
   /**
@@ -63,17 +65,17 @@ THE SOFTWARE.
     for (var i=1, n=arguments.length; i<n; i++)
       parent.appendChild(arguments[i])
 
-    return parent
+    return parent;
   }
 
   /**
    * Insert a new stylesheet to hold the @keyframe or VML rules.
    */
   var sheet = (function() {
-    var el = createEl('style', {type : 'text/css'})
-    ins(document.getElementsByTagName('head')[0], el)
-    return el.sheet || el.styleSheet
-  }())
+    var el = createEl('style', {type : 'text/css'});
+    ins(document.getElementsByTagName('head')[0], el);
+    return el.sheet || el.styleSheet;
+  }());
 
   /**
    * Creates an opacity keyframe animation rule and returns its name.
@@ -86,6 +88,7 @@ THE SOFTWARE.
       , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
       , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
       , pre = prefix && '-' + prefix + '-' || ''
+      ;
 
     if (!animations[name]) {
       sheet.insertRule(
@@ -95,12 +98,12 @@ THE SOFTWARE.
         (start+0.01) + '%{opacity:1}' +
         (start+trail) % 100 + '%{opacity:' + alpha + '}' +
         '100%{opacity:' + z + '}' +
-        '}', sheet.cssRules.length)
+        '}', sheet.cssRules.length);
 
-      animations[name] = 1
+      animations[name] = 1;
     }
 
-    return name
+    return name;
   }
 
   /**
@@ -110,13 +113,14 @@ THE SOFTWARE.
     var s = el.style
       , pp
       , i
+      ;
 
-    prop = prop.charAt(0).toUpperCase() + prop.slice(1)
+    prop = prop.charAt(0).toUpperCase() + prop.slice(1);
     for(i=0; i<prefixes.length; i++) {
-      pp = prefixes[i]+prop
-      if(s[pp] !== undefined) return pp
+      pp = prefixes[i]+prop;
+      if(s[pp] !== undefined) return pp;
     }
-    if(s[prop] !== undefined) return prop
+    if(s[prop] !== undefined) return prop;
   }
 
   /**
@@ -124,9 +128,9 @@ THE SOFTWARE.
    */
   function css(el, prop) {
     for (var n in prop)
-      el.style[vendor(el, n)||n] = prop[n]
+      el.style[vendor(el, n)||n] = prop[n];
 
-    return el
+    return el;
   }
 
   /**
@@ -134,18 +138,18 @@ THE SOFTWARE.
    */
   function merge(obj) {
     for (var i=1; i < arguments.length; i++) {
-      var def = arguments[i]
+      var def = arguments[i];
       for (var n in def)
-        if (obj[n] === undefined) obj[n] = def[n]
+        if (obj[n] === undefined) obj[n] = def[n];
     }
-    return obj
+    return obj;
   }
 
   /**
    * Returns the line color from the given string or array.
    */
   function getColor(color, idx) {
-    return typeof color == 'string' ? color : color[idx % color.length]
+    return typeof color == 'string' ? color : color[idx % color.length];
   }
 
   // Built-in defaults
@@ -168,15 +172,15 @@ THE SOFTWARE.
     top: '50%',           // center vertically
     left: '50%',          // center horizontally
     position: 'absolute'  // element position
-  }
+  };
 
   /** The constructor */
   function Spinner(o) {
-    this.opts = merge(o || {}, Spinner.defaults, defaults)
+    this.opts = merge(o || {}, Spinner.defaults, defaults);
   }
 
   // Global defaults that override the built-ins:
-  Spinner.defaults = {}
+  Spinner.defaults = {};
 
   merge(Spinner.prototype, {
 
@@ -186,23 +190,24 @@ THE SOFTWARE.
      * stop() internally.
      */
     spin: function(target) {
-      this.stop()
+      this.stop();
 
       var self = this
         , o = self.opts
         , el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
+        ;
 
       css(el, {
         left: o.left,
         top: o.top
-      })
+      });
         
       if (target) {
-        target.insertBefore(el, target.firstChild||null)
+        target.insertBefore(el, target.firstChild||null);
       }
 
-      el.setAttribute('role', 'progressbar')
-      self.lines(el, self.opts)
+      el.setAttribute('role', 'progressbar');
+      self.lines(el, self.opts);
 
       if (!useCssAnimations) {
         // No CSS animation support, use setTimeout() instead
@@ -217,27 +222,27 @@ THE SOFTWARE.
         ;(function anim() {
           i++;
           for (var j = 0; j < o.lines; j++) {
-            alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity)
+            alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity);
 
-            self.opacity(el, j * o.direction + start, alpha, o)
+            self.opacity(el, j * o.direction + start, alpha, o);
           }
-          self.timeout = self.el && setTimeout(anim, ~~(1000/fps))
-        })()
+          self.timeout = self.el && setTimeout(anim, ~~(1000/fps));
+        })();
       }
-      return self
+      return self;
     },
 
     /**
      * Stops and removes the Spinner.
      */
     stop: function() {
-      var el = this.el
+      var el = this.el;
       if (el) {
-        clearTimeout(this.timeout)
-        if (el.parentNode) el.parentNode.removeChild(el)
-        this.el = undefined
+        clearTimeout(this.timeout);
+        if (el.parentNode) el.parentNode.removeChild(el);
+        this.el = undefined;
       }
-      return this
+      return this;
     },
 
     /**
@@ -248,6 +253,7 @@ THE SOFTWARE.
       var i = 0
         , start = (o.lines - 1) * (1 - o.direction) / 2
         , seg
+        ;
 
       function fill(color, shadow) {
         return css(createEl(), {
@@ -259,7 +265,7 @@ THE SOFTWARE.
           transformOrigin: 'left',
           transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
           borderRadius: (o.corners * o.width>>1) + 'px'
-        })
+        });
       }
 
       for (; i < o.lines; i++) {
@@ -269,12 +275,12 @@ THE SOFTWARE.
           transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
           opacity: o.opacity,
           animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite'
-        })
+        });
 
-        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}))
-        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
+        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}));
+        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')));
       }
-      return el
+      return el;
     },
 
     /**
@@ -282,25 +288,26 @@ THE SOFTWARE.
      * Will be overwritten in VML fallback mode below.
      */
     opacity: function(el, i, val) {
-      if (i < el.childNodes.length) el.childNodes[i].style.opacity = val
+      if (i < el.childNodes.length) el.childNodes[i].style.opacity = val;
     }
 
-  })
+  });
 
 
   function initVML() {
 
     /* Utility function to create a VML tag */
     function vml(tag, attr) {
-      return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr)
+      return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr);
     }
 
     // No CSS transforms but VML support, add a CSS rule for VML elements:
-    sheet.addRule('.spin-vml', 'behavior:url(#default#VML)')
+    sheet.addRule('.spin-vml', 'behavior:url(#default#VML)');
 
     Spinner.prototype.lines = function(el, o) {
       var r = o.length+o.width
         , s = 2*r
+        ;
 
       function grp() {
         return css(
@@ -309,12 +316,13 @@ THE SOFTWARE.
             coordorigin: -r + ' ' + -r
           }),
           { width: s, height: s }
-        )
+        );
       }
 
       var margin = -(o.width+o.length)*2 + 'px'
         , g = css(grp(), {position: 'absolute', top: margin, left: margin})
         , i
+        ;
 
       function seg(i, dx, filter) {
         ins(g,
@@ -330,32 +338,32 @@ THE SOFTWARE.
               vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
             )
           )
-        )
+        );
       }
 
       if (o.shadow)
         for (i = 1; i <= o.lines; i++)
-          seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)')
+          seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)');
 
-      for (i = 1; i <= o.lines; i++) seg(i)
-      return ins(el, g)
-    }
+      for (i = 1; i <= o.lines; i++) seg(i);
+      return ins(el, g);
+    };
 
     Spinner.prototype.opacity = function(el, i, val, o) {
-      var c = el.firstChild
-      o = o.shadow && o.lines || 0
+      var c = el.firstChild;
+      o = o.shadow && o.lines || 0;
       if (c && i+o < c.childNodes.length) {
-        c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild
-        if (c) c.opacity = val
+        c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild;
+        if (c) c.opacity = val;
       }
-    }
+    };
   }
 
-  var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
+  var probe = css(createEl('group'), {behavior: 'url(#default#VML)'});
 
-  if (!vendor(probe, 'transform') && probe.adj) initVML()
-  else useCssAnimations = vendor(probe, 'animation')
+  if (!vendor(probe, 'transform') && probe.adj) initVML();
+  else useCssAnimations = vendor(probe, 'animation');
 
-  return Spinner
+  return Spinner;
 
 }));
diff --git a/dspace-server-webapp/README.md b/dspace-server-webapp/README.md
index e71039308a..8d3853e8cc 100644
--- a/dspace-server-webapp/README.md
+++ b/dspace-server-webapp/README.md
@@ -22,7 +22,10 @@ The only tested way right now is to run this webapp inside your IDE (Eclipse). J
 > dspace.dir = d:/install/dspace7
 
 ## HAL Browser
-The modified version of the HAL Browser from the Spring Data REST project is included, the index.html file is overriden locally to support the /api baseURL (see [DATAREST-971](https://jira.spring.io/browse/DATAREST-971))
+
+The modified version of the HAL Browser from https://github.com/mikekelly/hal-browser
+
+We've updated/customized the HAL Browser to integrate better with our authentication system, provide CSRF support, and use a more recent version of its dependencies.
 
 ## Packages and main classes
 *[org.dspace.app.rest.Application](src/main/java/org/dspace/app/rest/Application.java)* is the spring boot main class it initializes
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 20395013ce..1565c688b4 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -68,7 +68,9 @@
                         <!--Skip license check of third party files included/customized from HAL Browser -->
                         <exclude>src/main/webapp/index.html</exclude>
                         <exclude>src/main/webapp/login.html</exclude>
+                        <exclude>src/main/webapp/styles.css</exclude>
                         <exclude>src/main/webapp/js/hal/**</exclude>
+                        <exclude>src/main/webapp/js/vendor/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -238,28 +240,18 @@
 
     <dependencies>
 
-        <!-- These next two dependencies build a WAR that is BOTH executable
-             AND deployable into an external container (Tomcat).
-             See: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#build-tool-plugins-maven-packaging -->
-        <!-- NOTE: For rapid development (if you don't need Solr or other webapps),
-             you can temporarily comment these out, and switch <packaging> to "jar".
-             This lets you develop in a standalone, runnable JAR application. -->
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>-->
-        <!-- Ensure embedded servlet container doesn't interfere when this
-             WAR is deployed to an external Tomcat (i.e. provided). -->
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>-->
-
+        <!-- Spring Boot dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>${spring-boot.version}</version>
+            <exclusions>
+                <!-- Later version provided by dspace-api -->
+                <exclusion>
+                    <groupId>org.hibernate.validator</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -272,6 +264,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
             <version>${spring-boot.version}</version>
+            <exclusions>
+                <!-- Later version brought in by spring-boot-starter-web above -->
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.datatype</groupId>
+                    <artifactId>jackson-datatype-jdk8</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -279,6 +278,12 @@
             <artifactId>spring-boot-starter-aop</artifactId>
             <version>${spring-boot.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.flipkart.zjsonpatch</groupId>
@@ -286,20 +291,24 @@
             <version>0.4.6</version>
         </dependency>
 
-        <!-- The HAL Browser -->
+        <!-- HAL Browser (via WebJars) : https://github.com/mikekelly/hal-browser -->
+        <!-- This is primarily used to pull in the HAL Browser core Javascript code ('js' folder), as we've overridden
+             many dependencies below and the HTML pages in src/main/webapp/ -->
+        <!-- NOTE: Eventually this should be replaced by the HAL Explorer included in Spring Data REST,
+             see https://github.com/DSpace/DSpace/issues/3017 -->
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-rest-hal-browser</artifactId>
-            <version>${spring-hal-browser.version}</version>
+            <groupId>org.webjars</groupId>
+            <artifactId>hal-browser</artifactId>
+            <version>ad9b865</version>
         </dependency>
 
-        <!-- WebJars dependencies used to update/enhance the default HAL Browser -->
+        <!-- Pull in several WebJars dependencies used to update/enhance the default HAL Browser -->
         <!-- Pull in current version of JQuery via WebJars
              Made available at: webjars/jquery/dist/jquery.min.js -->
         <dependency>
             <groupId>org.webjars.bowergithub.jquery</groupId>
             <artifactId>jquery-dist</artifactId>
-            <version>3.5.1</version>
+            <version>3.6.0</version>
         </dependency>
         <!-- Pull in current version of Toastr (toastrjs.com) via WebJars
              Made available at: webjars/toastr/build/toastr.min.js -->
@@ -308,17 +317,46 @@
             <artifactId>toastr</artifactId>
             <version>2.1.4</version>
         </dependency>
-        <!-- Also pull in current version of Bootstrap via WebJars. This is currently ONLY used by our OAI-PMH
-             interface. But, it is include here so that it's accessible to all interfaces enabled in server webapp.
+        <!-- Pull in current version of URI.js (https://medialize.github.io/URI.js/) via WebJars
+             Made available at: webjars/urijs/src/URI.min.js -->
+        <dependency>
+            <groupId>org.webjars.bowergithub.medialize</groupId>
+            <artifactId>uri.js</artifactId>
+            <version>1.19.10</version>
+        </dependency>
+        <!-- Pull in current version of Underscore.js (https://underscorejs.org/) via WebJars
+             Made available at: webjars/underscore/underscore-min.js -->
+        <dependency>
+            <groupId>org.webjars.bowergithub.jashkenas</groupId>
+            <artifactId>underscore</artifactId>
+            <version>1.13.2</version>
+        </dependency>
+        <!-- Pull in current version of Backbone.js (http://backbonejs.org/) via WebJars
+             Made available at: webjars/backbone/backbone-min.js -->
+        <dependency>
+            <groupId>org.webjars.bowergithub.jashkenas</groupId>
+            <artifactId>backbone</artifactId>
+            <version>1.4.1</version>
+        </dependency>
+        <!-- Pull in current version of json-editor.js (https://github.com/json-editor/json-editor) via WebJars
+             Made available at: webjars/json-editor__json-editor/2.6.1/dist/jsoneditor.js
+             (Required by js/vendor/CustomPostForm.js)
+             NOTE: Because the path contains the version, you MUST update index.html when updating this dependency -->
+        <dependency>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>json-editor__json-editor</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <!-- Also pull in current version of Bootstrap via WebJars.
+             This is used by BOTH our HAL Browser and our OAI-PMH interface.
              Made available at: webjars/bootstrap/dist/js/bootstrap.min.js and
              webjars/bootstrap/dist/css/bootstrap.min.css -->
         <dependency>
             <groupId>org.webjars.bowergithub.twbs</groupId>
             <artifactId>bootstrap</artifactId>
-            <version>4.5.2</version>
+            <version>4.6.1</version>
         </dependency>
 
-
         <!-- Add in Spring Security for AuthN and AuthZ -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -364,13 +402,12 @@
             <artifactId>dspace-services</artifactId>
         </dependency>
 
+        <!-- DSpace modules to deploy (these modules are all optional, but add features/endpoints to webapp) -->
+        <!-- You may choose to comment out any of these modules if you do not want/need its features -->
         <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-iiif</artifactId>
         </dependency>
-
-        <!-- DSpace modules to deploy (this modules are all optional, but add features/endpoints to webapp) -->
-        <!-- You may choose to comment out any of these modules if you do not want/need its features -->
         <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-oai</artifactId>
@@ -392,11 +429,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.8</version>
-        </dependency>
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
@@ -416,6 +448,31 @@
             <version>${nimbus-jose-jwt.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>${solr.client.version}</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache
+             Caching dependencies for iiif endpoint. -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/javax.cache/cache-api -->
+        <dependency>
+            <groupId>javax.cache</groupId>
+            <artifactId>cache-api</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.ehcache/ehcache -->
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>${ehcache.version}</version>
+        </dependency>
+
         <!-- TEST DEPENDENCIES -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -431,13 +488,11 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>${json-path.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path-assert</artifactId>
-            <version>${json-path.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -467,70 +522,6 @@
             <artifactId>solr-core</artifactId>
             <version>${solr.client.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <!-- Newer version brought in by opencsv -->
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-                <!-- Newer Jetty version brought in via Parent POM -->
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache
-             Caching dependencies for iiif endpoint. -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-            <version>${spring-boot.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/javax.cache/cache-api -->
-        <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.ehcache/ehcache -->
-        <dependency>
-            <groupId>org.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>3.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-cell</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <!-- Newer version brought in by opencsv -->
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-                <!-- Newer Jetty version brought in via Parent POM -->
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java
index e0ea0cccb0..f8922f528c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java
@@ -20,7 +20,9 @@ import org.dspace.app.rest.utils.DSpaceAPIRequestLoggingFilter;
 import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
 import org.dspace.app.sitemap.GenerateSitemaps;
+import org.dspace.app.solrdatabaseresync.SolrDatabaseResyncCli;
 import org.dspace.app.util.DSpaceContextListener;
+import org.dspace.google.GoogleAsyncEventListener;
 import org.dspace.utils.servlet.DSpaceWebappServletFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +42,7 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
@@ -65,11 +68,24 @@ public class Application extends SpringBootServletInitializer {
     @Autowired
     private ApplicationConfig configuration;
 
+    @Autowired
+    private GoogleAsyncEventListener googleAsyncEventListener;
+
     @Scheduled(cron = "${sitemap.cron:-}")
     public void generateSitemap() throws IOException, SQLException {
         GenerateSitemaps.generateSitemapsScheduled();
     }
 
+    @Scheduled(cron = "${solr-database-resync.cron:-}")
+    public void solrDatabaseResync() throws Exception {
+        SolrDatabaseResyncCli.runScheduled();
+    }
+
+    @Scheduled(cron = "${google.analytics.cron:-}")
+    public void sendGoogleAnalyticsEvents() {
+        googleAsyncEventListener.sendCollectedEvents();
+    }
+
     /**
      * Override the default SpringBootServletInitializer.configure() method,
      * passing it this Application class.
@@ -160,6 +176,7 @@ public class Application extends SpringBootServletInitializer {
             @Override
             public void addCorsMappings(@NonNull CorsRegistry registry) {
                 // Get allowed origins for api and iiif endpoints.
+                // The actuator endpoints are configured using management.endpoints.web.cors.* properties
                 String[] corsAllowedOrigins = configuration
                     .getCorsAllowedOrigins(configuration.getCorsAllowedOriginsConfig());
                 String[] iiifAllowedOrigins = configuration
@@ -175,7 +192,8 @@ public class Application extends SpringBootServletInitializer {
                             .allowCredentials(corsAllowCredentials).allowedOrigins(corsAllowedOrigins)
                             // Allow list of request preflight headers allowed to be sent to us from the client
                             .allowedHeaders("Accept", "Authorization", "Content-Type", "Origin", "X-On-Behalf-Of",
-                                "X-Requested-With", "X-XSRF-TOKEN", "X-CORRELATION-ID", "X-REFERRER")
+                                "X-Requested-With", "X-XSRF-TOKEN", "X-CORRELATION-ID", "X-REFERRER",
+                                "x-recaptcha-token")
                             // Allow list of response headers allowed to be sent by us (the server) to the client
                             .exposedHeaders("Authorization", "DSPACE-XSRF-TOKEN", "Location", "WWW-Authenticate");
                 }
@@ -186,19 +204,38 @@ public class Application extends SpringBootServletInitializer {
                             .allowCredentials(iiifAllowCredentials).allowedOrigins(iiifAllowedOrigins)
                             // Allow list of request preflight headers allowed to be sent to us from the client
                             .allowedHeaders("Accept", "Authorization", "Content-Type", "Origin", "X-On-Behalf-Of",
-                                "X-Requested-With", "X-XSRF-TOKEN", "X-CORRELATION-ID", "X-REFERRER")
+                                "X-Requested-With", "X-XSRF-TOKEN", "X-CORRELATION-ID", "X-REFERRER",
+                                "x-recaptcha-token")
                             // Allow list of response headers allowed to be sent by us (the server) to the client
                             .exposedHeaders("Authorization", "DSPACE-XSRF-TOKEN", "Location", "WWW-Authenticate");
                 }
             }
 
+            /**
+             * Add a ViewController for the root path, to load HAL Browser
+             * @param registry ViewControllerRegistry
+             */
+            @Override
+            public void addViewControllers(ViewControllerRegistry registry) {
+                // Ensure accessing the root path will load the index.html of the HAL Browser
+                registry.addViewController("/").setViewName("forward:/index.html");
+            }
+
             /**
              * Add a new ResourceHandler to allow us to use WebJars.org to pull in web dependencies
-             * dynamically for HAL Browser, and access them off the /webjars path.
+             * dynamically for HAL Browser, etc.
              * @param registry ResourceHandlerRegistry
              */
             @Override
             public void addResourceHandlers(ResourceHandlerRegistry registry) {
+                // First, "mount" the Hal Browser resources at the /browser path
+                // NOTE: the hal-browser directory uses the version of the Hal browser, so this needs to be synced
+                // with the org.webjars.hal-browser version in the POM
+                registry
+                    .addResourceHandler("/browser/**")
+                    .addResourceLocations("/webjars/hal-browser/ad9b865/");
+
+                // Make all other Webjars available off the /webjars path
                 registry
                     .addResourceHandler("/webjars/**")
                     .addResourceLocations("/webjars/");
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java
index 9660d0af56..313fe2de60 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java
@@ -7,8 +7,13 @@
  */
 package org.dspace.app.rest;
 
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
+
 import java.sql.SQLException;
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -19,9 +24,11 @@ import org.dspace.app.rest.model.AuthenticationStatusRest;
 import org.dspace.app.rest.model.AuthenticationTokenRest;
 import org.dspace.app.rest.model.AuthnRest;
 import org.dspace.app.rest.model.EPersonRest;
+import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.model.hateoas.AuthenticationStatusResource;
 import org.dspace.app.rest.model.hateoas.AuthenticationTokenResource;
 import org.dspace.app.rest.model.hateoas.AuthnResource;
+import org.dspace.app.rest.model.hateoas.EmbeddedPage;
 import org.dspace.app.rest.model.wrapper.AuthenticationToken;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.app.rest.security.RestAuthenticationService;
@@ -34,6 +41,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PagedResourcesAssembler;
+import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.Link;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -80,7 +91,7 @@ public class AuthenticationRestController implements InitializingBean {
     @Override
     public void afterPropertiesSet() {
         discoverableEndpointsService
-            .register(this, Arrays.asList(new Link("/api/" + AuthnRest.CATEGORY, AuthnRest.NAME)));
+            .register(this, Arrays.asList(Link.of("/api/" + AuthnRest.CATEGORY, AuthnRest.NAME)));
     }
 
     @RequestMapping(method = RequestMethod.GET)
@@ -109,6 +120,8 @@ public class AuthenticationRestController implements InitializingBean {
         if (context.getCurrentUser() != null) {
             ePersonRest = converter.toRest(context.getCurrentUser(), projection);
         }
+        List<GroupRest> groupList = context.getSpecialGroups().stream()
+                .map(g -> (GroupRest) converter.toRest(g, projection)).collect(Collectors.toList());
 
         AuthenticationStatusRest authenticationStatusRest = new AuthenticationStatusRest(ePersonRest);
         // When not authenticated add WWW-Authenticate so client can retrieve all available authentication methods
@@ -120,11 +133,41 @@ public class AuthenticationRestController implements InitializingBean {
         }
         authenticationStatusRest.setAuthenticationMethod(context.getAuthenticationMethod());
         authenticationStatusRest.setProjection(projection);
+        authenticationStatusRest.setSpecialGroups(groupList);
+
         AuthenticationStatusResource authenticationStatusResource = converter.toResource(authenticationStatusRest);
 
         return authenticationStatusResource;
     }
 
+    /**
+     * Check the current user's authentication status (i.e. whether they are authenticated or not) and,
+     * if authenticated, retrieves the current context's special groups.
+     * @param page
+     * @param assembler
+     * @param request
+     * @param response
+     * @return
+     * @throws SQLException
+     */
+    @RequestMapping(value = "/status/specialGroups", method = RequestMethod.GET)
+    public EntityModel retrieveSpecialGroups(Pageable page, PagedResourcesAssembler assembler,
+                HttpServletRequest request, HttpServletResponse response)
+            throws SQLException {
+        Context context = ContextUtil.obtainContext(request);
+        Projection projection = utils.obtainProjection();
+
+        List<GroupRest> groupList = context.getSpecialGroups().stream()
+                .map(g -> (GroupRest) converter.toRest(g, projection)).collect(Collectors.toList());
+        Page<GroupRest> groupPage = (Page<GroupRest>) utils.getPage(groupList, page);
+        Link link = linkTo(
+                methodOn(AuthenticationRestController.class).retrieveSpecialGroups(page, assembler, request, response))
+                        .withSelfRel();
+
+        return EntityModel.of(new EmbeddedPage(link.getHref(),
+                groupPage.map(converter::toResource), null, "specialGroups"));
+    }
+
     /**
      * Check whether the login has succeeded or not. The actual login is performed by one of the enabled login filters
      * (e.g. {@link org.dspace.app.rest.security.StatelessLoginFilter}).
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
index 75d3c9886c..01822e5536 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
@@ -12,7 +12,6 @@ import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFI
 import static org.springframework.web.bind.annotation.RequestMethod.PUT;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
@@ -22,7 +21,6 @@ import javax.ws.rs.core.Response;
 
 import org.apache.catalina.connector.ClientAbortException;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
@@ -133,19 +131,12 @@ public class BitstreamRestController {
         }
 
         try {
-            long filesize;
-            if (citationDocumentService.isCitationEnabledForBitstream(bit, context)) {
-                final Pair<InputStream, Long> citedDocument = citationDocumentService.makeCitedDocument(context, bit);
-                filesize = citedDocument.getRight();
-                citedDocument.getLeft().close();
-            } else {
-                filesize = bit.getSizeBytes();
-            }
+            long filesize = bit.getSizeBytes();
+            Boolean citationEnabledForBitstream = citationDocumentService.isCitationEnabledForBitstream(bit, context);
 
             HttpHeadersInitializer httpHeadersInitializer = new HttpHeadersInitializer()
                 .withBufferSize(BUFFER_SIZE)
                 .withFileName(name)
-                .withLength(filesize)
                 .withChecksum(bit.getChecksum())
                 .withMimetype(mimetype)
                 .with(request)
@@ -161,11 +152,10 @@ public class BitstreamRestController {
                 httpHeadersInitializer.withDisposition(HttpHeadersInitializer.CONTENT_DISPOSITION_ATTACHMENT);
             }
 
-
-
             org.dspace.app.rest.utils.BitstreamResource bitstreamResource =
-                new org.dspace.app.rest.utils.BitstreamResource(
-                    bit, name, uuid, filesize, currentUser != null ? currentUser.getID() : null);
+                new org.dspace.app.rest.utils.BitstreamResource(name, uuid,
+                    currentUser != null ? currentUser.getID() : null,
+                    context.getSpecialGroupUuids(), citationEnabledForBitstream);
 
             //We have all the data we need, close the connection to the database so that it doesn't stay open during
             //download/streaming
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java
index a0f5d5f71e..0cb6bc47e0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java
@@ -59,7 +59,7 @@ import org.springframework.web.multipart.MultipartFile;
  * </pre>
  */
 @RestController
-@RequestMapping("/api/" + BundleRest.CATEGORY + "/" + BundleRest.PLURAL_NAME + "/"
+@RequestMapping("/api/" + BundleRest.CATEGORY + "/" + BundleRest.PLURAL_NAME
         + REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID + "/" + BitstreamRest.PLURAL_NAME)
 public class BundleUploadBitstreamController {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/DiscoveryRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/DiscoveryRestController.java
index 5ecbe19176..947515ca54 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/DiscoveryRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/DiscoveryRestController.java
@@ -73,7 +73,7 @@ public class DiscoveryRestController implements InitializingBean {
     @Override
     public void afterPropertiesSet() throws Exception {
         discoverableEndpointsService
-            .register(this, Arrays.asList(new Link("/api/" + SearchResultsRest.CATEGORY, SearchResultsRest.CATEGORY)));
+            .register(this, Arrays.asList(Link.of("/api/" + SearchResultsRest.CATEGORY, SearchResultsRest.CATEGORY)));
     }
 
     @RequestMapping(method = RequestMethod.GET)
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/IdentifierRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/IdentifierRestController.java
index d3a6ef981d..5f7a473b91 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/IdentifierRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/IdentifierRestController.java
@@ -66,8 +66,8 @@ public class IdentifierRestController implements InitializingBean {
         discoverableEndpointsService
             .register(this,
                     Arrays.asList(
-                            new Link(
-                                    new UriTemplate("/api/" + CATEGORY + "/" + ACTION,
+                            Link.of(
+                                    UriTemplate.of("/api/" + CATEGORY + "/" + ACTION,
                                             new TemplateVariables(
                                                     new TemplateVariable(PARAM, VariableType.REQUEST_PARAM))),
                                     CATEGORY)));
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/OidcRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/OidcRestController.java
index ab34a72a8d..db04b3b7cd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/OidcRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/OidcRestController.java
@@ -45,7 +45,7 @@ public class OidcRestController {
 
     @PostConstruct
     public void afterPropertiesSet() {
-        discoverableEndpointsService.register(this, List.of(new Link("/api/" + AuthnRest.CATEGORY, "oidc")));
+        discoverableEndpointsService.register(this, List.of(Link.of("/api/" + AuthnRest.CATEGORY, "oidc")));
     }
 
     @RequestMapping(method = RequestMethod.GET)
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java
index 500176a348..79ca381753 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java
@@ -23,6 +23,7 @@ import javax.xml.transform.stream.StreamResult;
 
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.app.rest.utils.ScopeResolver;
 import org.dspace.app.util.SyndicationFeed;
 import org.dspace.app.util.factory.UtilServiceFactory;
 import org.dspace.app.util.service.OpenSearchService;
@@ -35,12 +36,19 @@ import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
 import org.dspace.core.Utils;
 import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.DiscoverQuery.SORT_ORDER;
 import org.dspace.discovery.DiscoverResult;
 import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.SearchService;
 import org.dspace.discovery.SearchServiceException;
 import org.dspace.discovery.SearchUtils;
 import org.dspace.discovery.configuration.DiscoveryConfiguration;
+import org.dspace.discovery.configuration.DiscoveryConfigurationService;
 import org.dspace.discovery.configuration.DiscoverySearchFilter;
+import org.dspace.discovery.configuration.DiscoverySortConfiguration;
+import org.dspace.discovery.configuration.DiscoverySortFieldConfiguration;
+import org.dspace.discovery.indexobject.IndexableItem;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -67,8 +75,17 @@ public class OpenSearchController {
     private AuthorizeService authorizeService;
     private OpenSearchService openSearchService;
 
+    @Autowired
+    private SearchService searchService;
+
+    @Autowired
+    private DiscoveryConfigurationService searchConfigurationService;
+
     private Context context;
 
+    @Autowired
+    private ScopeResolver scopeResolver;
+
     /**
      * This method provides the OpenSearch query on the path /search
      * It will pass the result as a OpenSearchDocument directly to the client
@@ -80,6 +97,9 @@ public class OpenSearchController {
                          @RequestParam(name = "start", required = false) Integer start,
                          @RequestParam(name = "rpp", required = false) Integer count,
                          @RequestParam(name = "format", required = false) String format,
+                         @RequestParam(name = "sort", required = false) String sort,
+                         @RequestParam(name = "sort_direction", required = false) String sortDirection,
+                         @RequestParam(name = "scope", required = false) String dsoObject,
                          Model model) throws IOException, ServletException {
         context = ContextUtil.obtainContext(request);
         if (start == null) {
@@ -115,9 +135,54 @@ public class OpenSearchController {
 
             // support pagination parameters
             DiscoverQuery queryArgs = new DiscoverQuery();
-            queryArgs.setQuery(query);
+            if (query == null) {
+                query = "";
+            } else {
+                queryArgs.setQuery(query);
+            }
             queryArgs.setStart(start);
             queryArgs.setMaxResults(count);
+            queryArgs.setDSpaceObjectFilter(IndexableItem.TYPE);
+
+            if (sort != null) {
+                DiscoveryConfiguration discoveryConfiguration =
+                    searchConfigurationService.getDiscoveryConfiguration("");
+                if (discoveryConfiguration != null) {
+                    DiscoverySortConfiguration searchSortConfiguration = discoveryConfiguration
+                        .getSearchSortConfiguration();
+                    if (searchSortConfiguration != null) {
+                        DiscoverySortFieldConfiguration sortFieldConfiguration = searchSortConfiguration
+                            .getSortFieldConfiguration(sort);
+                        if (sortFieldConfiguration != null) {
+                            String sortField = searchService
+                                .toSortFieldIndex(sortFieldConfiguration.getMetadataField(),
+                                sortFieldConfiguration.getType());
+
+                            if (sortDirection != null && sortDirection.equals("DESC")) {
+                                queryArgs.setSortField(sortField, SORT_ORDER.desc);
+                            } else {
+                                queryArgs.setSortField(sortField, SORT_ORDER.asc);
+                            }
+                        } else {
+                            throw new IllegalArgumentException(sort + " is not a valid sort field");
+                        }
+                    }
+                }
+            } else {
+                // this is the default sort so we want to switch this to date accessioned
+                queryArgs.setSortField("dc.date.accessioned_dt", SORT_ORDER.desc);
+            }
+
+            if (dsoObject != null) {
+                container = scopeResolver.resolveScope(context, dsoObject);
+                DiscoveryConfiguration discoveryConfiguration = searchConfigurationService
+                        .getDiscoveryConfigurationByNameOrDso("site", container);
+                queryArgs.setDiscoveryConfigurationName(discoveryConfiguration.getId());
+                queryArgs.addFilterQueries(discoveryConfiguration.getDefaultFilterQueries()
+                        .toArray(
+                                new String[discoveryConfiguration.getDefaultFilterQueries()
+                                        .size()]));
+            }
 
             // Perform the search
             DiscoverResult qResults = null;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyEPersonReplaceRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyEPersonReplaceRestController.java
new file mode 100644
index 0000000000..e772aa0abe
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyEPersonReplaceRestController.java
@@ -0,0 +1,82 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.utils.ContextUtil.obtainContext;
+import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT;
+import static org.dspace.core.Constants.EPERSON;
+import static org.springframework.web.bind.annotation.RequestMethod.PUT;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Objects;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.utils.Utils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.authorize.service.ResourcePolicyService;
+import org.dspace.content.DSpaceObject;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.rest.webmvc.ControllerUtils;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * This controller will handle all the incoming calls on the/api/authz/resourcepolicies/{id}/eperson endpoint
+ * where the id corresponds to the ResourcePolicy of which you want to replace the related EPerson.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+@RestController
+@RequestMapping("/api/authz/resourcepolicies" + REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT + "/eperson")
+public class ResourcePolicyEPersonReplaceRestController {
+
+    @Autowired
+    private Utils utils;
+    @Autowired
+    private ResourcePolicyService resourcePolicyService;
+
+    @PreAuthorize("hasPermission(#id, 'resourcepolicy', 'ADMIN')")
+    @RequestMapping(method = PUT, consumes = {"text/uri-list"})
+    public ResponseEntity<RepresentationModel<?>> replaceEPersonOfResourcePolicy(@PathVariable Integer id,
+            HttpServletResponse response, HttpServletRequest request) throws SQLException, AuthorizeException {
+
+        Context context = obtainContext(request);
+        List<DSpaceObject> dsoList = utils.constructDSpaceObjectList(context, utils.getStringListFromRequest(request));
+
+        if (dsoList.size() != 1 || dsoList.get(0).getType() != EPERSON) {
+            throw new UnprocessableEntityException(
+                                        "The EPerson doesn't exist or the data cannot be resolved to an EPerson.");
+        }
+
+        ResourcePolicy resourcePolicy = resourcePolicyService.find(context, id);
+        if (Objects.isNull(resourcePolicy)) {
+            throw new ResourceNotFoundException("ResourcePolicy with id: " + id + " not found");
+        }
+
+        if (Objects.isNull(resourcePolicy.getEPerson())) {
+            throw new UnprocessableEntityException("ResourcePolicy with id:" + id + " doesn't link to an EPerson");
+        }
+        EPerson newEPerson = (EPerson) dsoList.get(0);
+        resourcePolicy.setEPerson(newEPerson);
+        context.commit();
+        return ControllerUtils.toEmptyResponse(HttpStatus.NO_CONTENT);
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyGroupReplaceRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyGroupReplaceRestController.java
new file mode 100644
index 0000000000..e9ba0dff44
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyGroupReplaceRestController.java
@@ -0,0 +1,82 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.utils.ContextUtil.obtainContext;
+import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT;
+import static org.dspace.core.Constants.GROUP;
+import static org.springframework.web.bind.annotation.RequestMethod.PUT;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Objects;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.utils.Utils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.authorize.service.ResourcePolicyService;
+import org.dspace.content.DSpaceObject;
+import org.dspace.core.Context;
+import org.dspace.eperson.Group;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.rest.webmvc.ControllerUtils;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * This controller will handle all the incoming calls on the/api/authz/resourcepolicies/{id}/group endpoint
+ * where the id corresponds to the ResourcePolicy of which you want to replace the related Group.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+@RestController
+@RequestMapping("/api/authz/resourcepolicies" + REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT + "/group")
+public class ResourcePolicyGroupReplaceRestController {
+
+    @Autowired
+    private Utils utils;
+    @Autowired
+    private ResourcePolicyService resourcePolicyService;
+
+    @PreAuthorize("hasPermission(#id, 'resourcepolicy', 'ADMIN')")
+    @RequestMapping(method = PUT, consumes = {"text/uri-list"})
+    public ResponseEntity<RepresentationModel<?>> replaceGroupOfResourcePolicy(@PathVariable Integer id,
+            HttpServletResponse response, HttpServletRequest request) throws SQLException, AuthorizeException {
+
+        Context context = obtainContext(request);
+        List<DSpaceObject> dsoList = utils.constructDSpaceObjectList(context, utils.getStringListFromRequest(request));
+
+        if (dsoList.size() != 1 || dsoList.get(0).getType() != GROUP) {
+            throw new UnprocessableEntityException("The Group doesn't exist or the data cannot be resolved to a Group");
+        }
+
+        ResourcePolicy resourcePolicy = resourcePolicyService.find(context, id);
+        if (Objects.isNull(resourcePolicy)) {
+            throw new ResourceNotFoundException("ResourcePolicy with id: " + id + " not found!");
+        }
+
+        if (Objects.isNull(resourcePolicy.getGroup())) {
+            throw new UnprocessableEntityException("ResourcePolicy with id:" + id + "  doesn't link to a Group");
+        }
+
+        Group newGroup = (Group) dsoList.get(0);
+        resourcePolicy.setGroup(newGroup);
+        context.commit();
+        return ControllerUtils.toEmptyResponse(HttpStatus.NO_CONTENT);
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/RestResourceController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/RestResourceController.java
index 7c79a85701..b82b483075 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/RestResourceController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/RestResourceController.java
@@ -127,7 +127,7 @@ public class RestResourceController implements InitializingBean {
             // Link l = linkTo(this.getClass(), r).withRel(r);
             String[] split = r.split("\\.", 2);
             String plural = English.plural(split[1]);
-            Link l = new Link("/api/" + split[0] + "/" + plural, plural);
+            Link l = Link.of("/api/" + split[0] + "/" + plural, plural);
             links.add(l);
             log.debug(l.getRel().value() + " " + l.getHref());
         }
@@ -821,7 +821,7 @@ public class RestResourceController implements InitializingBean {
                         link = linkTo(this.getClass(), apiCategory, model).slash(uuid).slash(subpath).withSelfRel();
                     }
 
-                    return new EntityModel(new EmbeddedPage(link.getHref(),
+                    return EntityModel.of(new EmbeddedPage(link.getHref(),
                             pageResult.map(converter::toResource), null, subpath));
                 } else {
                     RestModel object = (RestModel) linkMethod.invoke(linkRepository, request,
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ScriptProcessesController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ScriptProcessesController.java
index 1197e13c98..196cade5dd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ScriptProcessesController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ScriptProcessesController.java
@@ -55,13 +55,15 @@ public class ScriptProcessesController {
      * This method can be called by sending a POST request to the system/scripts/{name}/processes endpoint
      * This will start a process for the script that matches the given name
      * @param scriptName    The name of the script that we want to start a process for
+     * @param files         (Optional) any files that need to be passed to the script for it to run
      * @return              The ProcessResource object for the created process
      * @throws Exception    If something goes wrong
      */
     @RequestMapping(method = RequestMethod.POST)
     @PreAuthorize("hasAuthority('ADMIN')")
-    public ResponseEntity<RepresentationModel<?>> startProcess(@PathVariable(name = "name") String scriptName,
-                                                        @RequestParam(name = "file") List<MultipartFile> files)
+    public ResponseEntity<RepresentationModel<?>> startProcess(
+        @PathVariable(name = "name") String scriptName,
+        @RequestParam(name = "file", required = false) List<MultipartFile> files)
         throws Exception {
         if (log.isTraceEnabled()) {
             log.trace("Starting Process for Script with name: " + scriptName);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/StatisticsRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/StatisticsRestController.java
index 4c2dc54574..a491157f53 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/StatisticsRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/StatisticsRestController.java
@@ -57,7 +57,7 @@ public class StatisticsRestController implements InitializingBean {
     public void afterPropertiesSet() throws Exception {
         discoverableEndpointsService
             .register(this, Arrays
-                .asList(new Link("/api/" + RestAddressableModel.STATISTICS, RestAddressableModel.STATISTICS)));
+                .asList(Link.of("/api/" + RestAddressableModel.STATISTICS, RestAddressableModel.STATISTICS)));
     }
 
     @RequestMapping(method = RequestMethod.GET)
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/SubmissionCCLicenseUrlRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/SubmissionCCLicenseUrlRepository.java
index 78e71d91fd..c32d551cbe 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/SubmissionCCLicenseUrlRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/SubmissionCCLicenseUrlRepository.java
@@ -132,7 +132,7 @@ public class SubmissionCCLicenseUrlRepository extends DSpaceRestRepository<Submi
     @Override
     public void afterPropertiesSet() {
         discoverableEndpointsService.register(this, Arrays.asList(
-                new Link("/api/" + SubmissionCCLicenseUrlRest.CATEGORY + "/" +
+                Link.of("/api/" + SubmissionCCLicenseUrlRest.CATEGORY + "/" +
                         SubmissionCCLicenseUrlRest.PLURAL + "/search",
                         SubmissionCCLicenseUrlRest.PLURAL + "-search")));
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/UUIDLookupRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/UUIDLookupRestController.java
index 01f77a8ddc..40c0a79b97 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/UUIDLookupRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/UUIDLookupRestController.java
@@ -73,8 +73,8 @@ public class UUIDLookupRestController implements InitializingBean {
         discoverableEndpointsService
             .register(this,
                     Arrays.asList(
-                            new Link(
-                                    new UriTemplate("/api/" + CATEGORY + "/" + ACTION,
+                            Link.of(
+                                    UriTemplate.of("/api/" + CATEGORY + "/" + ACTION,
                                             new TemplateVariables(
                                                     new TemplateVariable(PARAM, VariableType.REQUEST_PARAM))),
                                     CATEGORY)));
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanChangePasswordFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanChangePasswordFeature.java
index ebeb6714c0..69e9cffa67 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanChangePasswordFeature.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanChangePasswordFeature.java
@@ -18,18 +18,19 @@ import org.dspace.core.Context;
 import org.springframework.stereotype.Component;
 
 /**
- * The canChangePassword feature. It can be used to verify if the user can change his password.
+ * The canChangePassword feature. It can be used to verify if the user can change their password.
  */
 @Component
 @AuthorizationFeatureDocumentation(name = CanChangePasswordFeature.NAME,
-        description = "It can be used to verify if the user can change his password")
+        description = "It can be used to verify if the user can change their password")
 public class CanChangePasswordFeature implements AuthorizationFeature {
 
     public static final String NAME = "canChangePassword";
 
     @Override
     public boolean isAuthorized(Context context, BaseObjectRest object) throws SQLException {
-        if (context.getCurrentUser() != null && StringUtils.equals(context.getAuthenticationMethod(), "password")) {
+        if (context.getCurrentUser() != null && !context.isContextUserSwitched()
+            && StringUtils.equals(context.getAuthenticationMethod(), "password")) {
             return true;
         }
         return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
new file mode 100644
index 0000000000..9642bb4a2d
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
@@ -0,0 +1,96 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.authorization.impl;
+
+import java.sql.SQLException;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.authorization.AuthorizationFeature;
+import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
+import org.dspace.app.rest.model.BaseObjectRest;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Checks if the given user can claim the given item. An item can be claimed
+ * only if the show claim is enabled for it (see
+ * {@link org.dspace.app.rest.authorization.impl.ShowClaimItemFeature}).
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component
+@AuthorizationFeatureDocumentation(name = CanClaimItemFeature.NAME,
+    description = "Used to verify if the current user is able to claim this item as their profile. "
+        + "Only available if the current item is not already claimed.")
+public class CanClaimItemFeature implements AuthorizationFeature {
+
+    public static final String NAME = "canClaimItem";
+
+    private static final Logger LOG = LoggerFactory.getLogger(CanClaimItemFeature.class);
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private ResearcherProfileService researcherProfileService;
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public boolean isAuthorized(Context context, BaseObjectRest object) throws SQLException {
+
+        if (!(object instanceof ItemRest) || context.getCurrentUser() == null) {
+            return false;
+        }
+
+        String id = ((ItemRest) object).getId();
+        Item item = itemService.find(context, UUID.fromString(id));
+
+        return researcherProfileService.hasProfileType(item)
+            && hasNotOwner(item)
+            && hasNotAlreadyAProfile(context)
+            && haveSameEmail(item, context.getCurrentUser());
+    }
+
+    private boolean hasNotAlreadyAProfile(Context context) {
+        try {
+            return researcherProfileService.findById(context, context.getCurrentUser().getID()) == null;
+        } catch (SQLException | AuthorizeException e) {
+            LOG.warn("Error while checking if eperson has a ResearcherProfileAssociated: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    private boolean hasNotOwner(Item item) {
+        return StringUtils.isBlank(itemService.getMetadata(item, "dspace.object.owner"));
+    }
+
+    private boolean haveSameEmail(Item item, EPerson currentUser) {
+        return itemService.getMetadataByMetadataString(item, "person.email").stream()
+            .map(MetadataValue::getValue)
+            .filter(StringUtils::isNotBlank)
+            .anyMatch(email -> email.equalsIgnoreCase(currentUser.getEmail()));
+    }
+
+    @Override
+    public String[] getSupportedTypes() {
+        return new String[] { ItemRest.CATEGORY + "." + ItemRest.NAME };
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanCreateVersionFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanCreateVersionFeature.java
index b77dc5f623..acd909d187 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanCreateVersionFeature.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanCreateVersionFeature.java
@@ -10,7 +10,6 @@ import java.sql.SQLException;
 import java.util.Objects;
 import java.util.UUID;
 
-import org.apache.commons.lang.StringUtils;
 import org.dspace.app.rest.authorization.AuthorizationFeature;
 import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
 import org.dspace.app.rest.model.BaseObjectRest;
@@ -58,13 +57,6 @@ public class CanCreateVersionFeature implements AuthorizationFeature {
             }
             Item item = itemService.find(context, UUID.fromString(((ItemRest) object).getUuid()));
             if (Objects.nonNull(item)) {
-                // The property versioning.block.entity is used to disable versioning for items with EntityType
-                boolean isBlockEntity = configurationService.getBooleanProperty("versioning.block.entity", true);
-                boolean hasEntityType = StringUtils.isNotBlank(itemService.
-                                        getMetadataFirstValue(item, "dspace", "entity", "type", Item.ANY));
-                if (isBlockEntity && hasEntityType) {
-                    return false;
-                }
                 if (authorizeService.isAdmin(context, item)) {
                     return true;
                 }
@@ -84,4 +76,4 @@ public class CanCreateVersionFeature implements AuthorizationFeature {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanDeleteVersionFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanDeleteVersionFeature.java
index 59ea8ae8cb..c20668fcc5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanDeleteVersionFeature.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanDeleteVersionFeature.java
@@ -9,14 +9,12 @@ package org.dspace.app.rest.authorization.impl;
 import java.sql.SQLException;
 import java.util.Objects;
 
-import org.apache.commons.lang.StringUtils;
 import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
 import org.dspace.app.rest.converter.ItemConverter;
 import org.dspace.app.rest.model.BaseObjectRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.app.rest.projection.DefaultProjection;
-import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
@@ -57,12 +55,6 @@ public class CanDeleteVersionFeature extends DeleteFeature {
             Version version = versioningService.getVersion(context, ((VersionRest)object).getId());
             if (Objects.nonNull(version) && Objects.nonNull(version.getItem())) {
                 ItemRest itemRest = itemConverter.convert(version.getItem(), DefaultProjection.DEFAULT);
-                boolean isBlockEntity = configurationService.getBooleanProperty("versioning.block.entity", true);
-                boolean hasEntityType = StringUtils.isNotBlank(
-                        itemService.getMetadataFirstValue(version.getItem(), "dspace", "entity", "type", Item.ANY));
-                if (isBlockEntity && hasEntityType) {
-                    return false;
-                }
                 return super.isAuthorized(context, itemRest);
             }
         }
@@ -76,4 +68,4 @@ public class CanDeleteVersionFeature extends DeleteFeature {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanEditVersionFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanEditVersionFeature.java
index cc767c4e07..eb6a94163b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanEditVersionFeature.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanEditVersionFeature.java
@@ -9,14 +9,11 @@ package org.dspace.app.rest.authorization.impl;
 import java.sql.SQLException;
 import java.util.Objects;
 
-import org.apache.commons.lang.StringUtils;
 import org.dspace.app.rest.authorization.AuthorizationFeature;
 import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
 import org.dspace.app.rest.model.BaseObjectRest;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.Item;
-import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.versioning.Version;
@@ -37,8 +34,6 @@ public class CanEditVersionFeature implements AuthorizationFeature {
 
     public static final String NAME = "canEditVersion";
 
-    @Autowired
-    private ItemService itemService;
     @Autowired
     private AuthorizeService authorizeService;
     @Autowired
@@ -56,12 +51,6 @@ public class CanEditVersionFeature implements AuthorizationFeature {
             }
             Version version = versioningService.getVersion(context, (((VersionRest) object).getId()));
             if (Objects.nonNull(version) && Objects.nonNull(version.getItem())) {
-                boolean isBlockEntity = configurationService.getBooleanProperty("versioning.block.entity", true);
-                boolean hasEntityType = StringUtils.isNotBlank(
-                        itemService.getMetadataFirstValue(version.getItem(), "dspace", "entity", "type", Item.ANY));
-                if (isBlockEntity && hasEntityType) {
-                    return false;
-                }
                 return authorizeService.isAdmin(context, version.getItem());
             }
         }
@@ -75,4 +64,4 @@ public class CanEditVersionFeature implements AuthorizationFeature {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanManageVersionsFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanManageVersionsFeature.java
index 5b5e4c16e0..9e1f7f6d84 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanManageVersionsFeature.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanManageVersionsFeature.java
@@ -10,7 +10,6 @@ import java.sql.SQLException;
 import java.util.Objects;
 import java.util.UUID;
 
-import org.apache.commons.lang.StringUtils;
 import org.dspace.app.rest.authorization.AuthorizationFeature;
 import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
 import org.dspace.app.rest.model.BaseObjectRest;
@@ -54,12 +53,6 @@ public class CanManageVersionsFeature implements AuthorizationFeature {
             }
             Item item = itemService.find(context, UUID.fromString(((ItemRest) object).getUuid()));
             if (Objects.nonNull(item)) {
-                boolean isBlockEntity = configurationService.getBooleanProperty("versioning.block.entity", true);
-                boolean hasEntityType = StringUtils.isNotBlank(itemService.
-                                        getMetadataFirstValue(item, "dspace", "entity", "type", Item.ANY));
-                if (isBlockEntity && hasEntityType) {
-                    return false;
-                }
                 return authorizeService.isAdmin(context, item);
             }
         }
@@ -73,4 +66,4 @@ public class CanManageVersionsFeature implements AuthorizationFeature {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanSynchronizeWithORCID.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanSynchronizeWithORCID.java
new file mode 100644
index 0000000000..b1ebde3049
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanSynchronizeWithORCID.java
@@ -0,0 +1,91 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.authorization.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.function.Predicate;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.authorization.AuthorizationFeature;
+import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
+import org.dspace.app.rest.model.BaseObjectRest;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * The synchronization with ORCID feature. It can be used to verify
+ * if the user can synchronize with ORCID.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.it)
+ */
+@Component
+@AuthorizationFeatureDocumentation(name = CanSynchronizeWithORCID.NAME,
+    description = "It can be used to verify if the user can synchronize with ORCID")
+public class CanSynchronizeWithORCID implements AuthorizationFeature {
+
+    public static final String NAME = "canSynchronizeWithORCID";
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    /**
+     * This method returns true if the BaseObjectRest object is an instance of
+     * {@link ItemRest}, there is a current user in the {@link Context} and it is
+     * the owner of that item. Otherwise this method returns false.
+     */
+    @Override
+    public boolean isAuthorized(Context context, BaseObjectRest object) throws SQLException {
+
+        EPerson ePerson = context.getCurrentUser();
+
+        if (!(object instanceof ItemRest) || Objects.isNull(ePerson)) {
+            return false;
+        }
+
+        String id = ((ItemRest) object).getId();
+        Item item = itemService.find(context, UUID.fromString(id));
+
+        return isOrcidSynchronizationEnabled() && isDspaceObjectOwner(ePerson, item);
+    }
+
+    @Override
+    public String[] getSupportedTypes() {
+        return new String[] { ItemRest.CATEGORY + "." + ItemRest.NAME };
+    }
+
+    private boolean isOrcidSynchronizationEnabled() {
+        return configurationService.getBooleanProperty("orcid.synchronization-enabled", true);
+    }
+
+    /**
+     * This method returns true if the given eperson is not null and if the given
+     * item has the metadata field dspace.object.owner with an authority equals to
+     * the uuid of the eperson. Otherwise this method returns false.
+     */
+    private boolean isDspaceObjectOwner(EPerson eperson, Item item) {
+        if (eperson == null) {
+            return false;
+        }
+        List<MetadataValue> owners = itemService.getMetadataByMetadataString(item, "dspace.object.owner");
+        Predicate<MetadataValue> checkOwner = v -> StringUtils.equals(v.getAuthority(), eperson.getID().toString());
+        return owners.stream().anyMatch(checkOwner);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/configuration/ActuatorConfiguration.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/configuration/ActuatorConfiguration.java
new file mode 100644
index 0000000000..ad78fe2db4
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/configuration/ActuatorConfiguration.java
@@ -0,0 +1,95 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.configuration;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Arrays;
+
+import org.apache.solr.client.solrj.SolrServerException;
+import org.dspace.app.rest.DiscoverableEndpointsService;
+import org.dspace.app.rest.health.GeoIpHealthIndicator;
+import org.dspace.authority.AuthoritySolrServiceImpl;
+import org.dspace.discovery.SolrSearchCore;
+import org.dspace.statistics.SolrStatisticsCore;
+import org.dspace.xoai.services.api.solr.SolrServerResolver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
+import org.springframework.boot.actuate.health.Status;
+import org.springframework.boot.actuate.solr.SolrHealthIndicator;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+import org.springframework.hateoas.Link;
+
+/**
+ * Configuration class related to the actuator endpoints.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Configuration
+public class ActuatorConfiguration {
+
+    public static final Status UP_WITH_ISSUES_STATUS = new Status("UP_WITH_ISSUES");
+
+    @Autowired
+    private DiscoverableEndpointsService discoverableEndpointsService;
+
+    @Value("${management.endpoints.web.base-path:/actuator}")
+    private String actuatorBasePath;
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void registerActuatorEndpoints() {
+        discoverableEndpointsService.register(this, Arrays.asList(Link.of(actuatorBasePath, "actuator")));
+    }
+
+    @Bean
+    @ConditionalOnEnabledHealthIndicator("solrSearch")
+    @ConditionalOnProperty("discovery.search.server")
+    public SolrHealthIndicator solrSearchCoreHealthIndicator(SolrSearchCore solrSearchCore) {
+        return new SolrHealthIndicator(solrSearchCore.getSolr());
+    }
+
+    @Bean
+    @ConditionalOnEnabledHealthIndicator("solrStatistics")
+    @ConditionalOnProperty("solr-statistics.server")
+    public SolrHealthIndicator solrStatisticsCoreHealthIndicator(SolrStatisticsCore solrStatisticsCore) {
+        return new SolrHealthIndicator(solrStatisticsCore.getSolr());
+    }
+
+    @Bean
+    @ConditionalOnEnabledHealthIndicator("solrAuthority")
+    @ConditionalOnProperty("solr.authority.server")
+    public SolrHealthIndicator solrAuthorityCoreHealthIndicator(AuthoritySolrServiceImpl authoritySolrService)
+        throws MalformedURLException, SolrServerException, IOException {
+        return new SolrHealthIndicator(authoritySolrService.getSolr());
+    }
+
+    @Bean
+    @ConditionalOnEnabledHealthIndicator("solrOai")
+    @ConditionalOnProperty("oai.solr.url")
+    public SolrHealthIndicator solrOaiCoreHealthIndicator(SolrServerResolver solrServerResolver)
+        throws SolrServerException {
+        return new SolrHealthIndicator(solrServerResolver.getServer());
+    }
+
+    @Bean
+    @ConditionalOnEnabledHealthIndicator("geoIp")
+    public GeoIpHealthIndicator geoIpHealthIndicator() {
+        return new GeoIpHealthIndicator();
+    }
+
+    public String getActuatorBasePath() {
+        return actuatorBasePath;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/AInprogressItemConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/AInprogressItemConverter.java
index 1fb2bffc58..ce7ca34918 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/AInprogressItemConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/AInprogressItemConverter.java
@@ -27,6 +27,7 @@ import org.dspace.content.InProgressSubmission;
 import org.dspace.content.Item;
 import org.dspace.eperson.EPerson;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 
 /**
  * Abstract implementation providing the common functionalities for all the inprogressSubmission Converter
@@ -44,6 +45,8 @@ public abstract class AInprogressItemConverter<T extends InProgressSubmission,
 
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(AInprogressItemConverter.class);
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/BitstreamConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/BitstreamConverter.java
index d707156a05..bb5544b359 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/BitstreamConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/BitstreamConverter.java
@@ -15,7 +15,6 @@ import org.dspace.app.rest.model.CheckSumRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 
@@ -27,9 +26,6 @@ import org.springframework.stereotype.Component;
 @Component
 public class BitstreamConverter extends DSpaceObjectConverter<Bitstream, BitstreamRest> {
 
-    @Autowired
-    ConverterService converter;
-
     @Override
     public BitstreamRest convert(org.dspace.content.Bitstream obj, Projection projection) {
         BitstreamRest b = super.convert(obj, projection);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ClaimedTaskConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ClaimedTaskConverter.java
index cc7459955f..5238b8888a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ClaimedTaskConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ClaimedTaskConverter.java
@@ -14,6 +14,7 @@ import org.dspace.xmlworkflow.factory.XmlWorkflowFactory;
 import org.dspace.xmlworkflow.storedcomponents.ClaimedTask;
 import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -26,6 +27,8 @@ import org.springframework.stereotype.Component;
 public class ClaimedTaskConverter
         implements IndexableObjectConverter<ClaimedTask, ClaimedTaskRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ConverterService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ConverterService.java
index 18fc119eef..0f7b47239e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ConverterService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ConverterService.java
@@ -38,6 +38,7 @@ import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.data.domain.Page;
@@ -52,9 +53,12 @@ import org.springframework.stereotype.Service;
 /**
  * Converts domain objects from the DSpace service layer to rest objects, and from rest objects to resource
  * objects, applying {@link Projection}s where applicable.
- *
+ * <P>
+ * MUST be loaded @Lazy, as this service requires other services to be preloaded (especially DSpaceConverter components)
+ * and that can result in circular references if those services need this ConverterService (and many do).
  * @author Luca Giamminonni (luca.giamminonni at 4science dot it)
  */
+@Lazy
 @Service
 public class ConverterService {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/DSpaceObjectConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/DSpaceObjectConverter.java
index 0c730265ef..a89d5ec4e9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/DSpaceObjectConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/DSpaceObjectConverter.java
@@ -24,6 +24,7 @@ import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
 import org.dspace.services.RequestService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 
 /**
  * This is the base converter from/to objects in the DSpace API data model and
@@ -38,6 +39,8 @@ public abstract class DSpaceObjectConverter<M extends DSpaceObject, R extends or
 
     private static final Logger log = LogManager.getLogger(DSpaceObjectConverter.class);
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/DiscoverFacetsConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/DiscoverFacetsConverter.java
index c145a3ed13..cbbdc3e9cb 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/DiscoverFacetsConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/DiscoverFacetsConverter.java
@@ -34,7 +34,8 @@ public class DiscoverFacetsConverter {
 
     private static final Logger log = LogManager.getLogger(DiscoverFacetsConverter.class);
 
-    private final DiscoverFacetValueConverter facetValueConverter = new DiscoverFacetValueConverter();
+    @Autowired
+    private DiscoverFacetValueConverter facetValueConverter;
 
     @Autowired
     private SearchService searchService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/HarvestedCollectionConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/HarvestedCollectionConverter.java
index b989233612..b77f783a3e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/HarvestedCollectionConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/HarvestedCollectionConverter.java
@@ -18,6 +18,7 @@ import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.Collection;
 import org.dspace.harvest.HarvestedCollection;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -28,6 +29,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class HarvestedCollectionConverter implements DSpaceConverter<HarvestedCollection, HarvestedCollectionRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/MetadataConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/MetadataConverter.java
index 14189a4401..76aca4be23 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/MetadataConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/MetadataConverter.java
@@ -28,6 +28,7 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.DSpaceObjectService;
 import org.dspace.core.Context;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -39,6 +40,8 @@ public class MetadataConverter implements DSpaceConverter<MetadataValueList, Met
     @Autowired
     private ContentServiceFactory contentServiceFactory;
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/MetadataFieldConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/MetadataFieldConverter.java
index 89da5b0dc9..eeeafd174b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/MetadataFieldConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/MetadataFieldConverter.java
@@ -11,6 +11,7 @@ import org.dspace.app.rest.model.MetadataFieldRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.MetadataField;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -21,6 +22,8 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class MetadataFieldConverter implements DSpaceConverter<MetadataField, MetadataFieldRest> {
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidHistoryRestConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidHistoryRestConverter.java
new file mode 100644
index 0000000000..5399e6d396
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidHistoryRestConverter.java
@@ -0,0 +1,43 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.OrcidHistoryRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.orcid.OrcidHistory;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the converter from/to the OrcidHistory in the DSpace API data model and
+ * the REST data model.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+@Component
+public class OrcidHistoryRestConverter implements DSpaceConverter<OrcidHistory, OrcidHistoryRest> {
+
+    @Override
+    public OrcidHistoryRest convert(OrcidHistory modelObject, Projection projection) {
+        OrcidHistoryRest rest = new OrcidHistoryRest();
+        rest.setId(modelObject.getID());
+        rest.setProfileItemId(modelObject.getProfileItem().getID());
+        rest.setEntityId(modelObject.getEntity() != null ? modelObject.getEntity().getID() : null);
+        rest.setResponseMessage(modelObject.getResponseMessage());
+        rest.setStatus(modelObject.getStatus());
+        rest.setTimestamp(modelObject.getTimestamp());
+        rest.setProjection(projection);
+        rest.setPutCode(modelObject.getPutCode());
+        return rest;
+    }
+
+    @Override
+    public Class<OrcidHistory> getModelClass() {
+        return OrcidHistory.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidQueueRestConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidQueueRestConverter.java
new file mode 100644
index 0000000000..755e43a577
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidQueueRestConverter.java
@@ -0,0 +1,47 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.OrcidQueueRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.Item;
+import org.dspace.orcid.OrcidQueue;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the converter from/to the OrcidQueue in the DSpace API data model and
+ * the REST data model.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+@Component
+public class OrcidQueueRestConverter implements DSpaceConverter<OrcidQueue, OrcidQueueRest> {
+
+    @Override
+    public OrcidQueueRest convert(OrcidQueue orcidQueue, Projection projection) {
+        OrcidQueueRest rest = new OrcidQueueRest();
+
+        Item entity = orcidQueue.getEntity();
+
+        rest.setEntityId(entity != null ? entity.getID() : null);
+        rest.setDescription(orcidQueue.getDescription());
+        rest.setRecordType(orcidQueue.getRecordType());
+        rest.setId(orcidQueue.getID());
+        rest.setProfileItemId(orcidQueue.getProfileItem().getID());
+        rest.setOperation(orcidQueue.getOperation() != null ? orcidQueue.getOperation().name() : null);
+        rest.setProjection(projection);
+
+        return rest;
+    }
+
+    @Override
+    public Class<OrcidQueue> getModelClass() {
+        return OrcidQueue.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/PoolTaskConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/PoolTaskConverter.java
index 48299dd362..548dc63753 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/PoolTaskConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/PoolTaskConverter.java
@@ -13,6 +13,7 @@ import org.dspace.discovery.IndexableObject;
 import org.dspace.xmlworkflow.storedcomponents.PoolTask;
 import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -25,6 +26,8 @@ import org.springframework.stereotype.Component;
 public class PoolTaskConverter
     implements IndexableObjectConverter<PoolTask, org.dspace.app.rest.model.PoolTaskRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ProcessConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ProcessConverter.java
index 4a794c9b85..de03d60630 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ProcessConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ProcessConverter.java
@@ -15,6 +15,7 @@ import org.dspace.app.rest.projection.Projection;
 import org.dspace.scripts.Process;
 import org.dspace.scripts.service.ProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -23,6 +24,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class ProcessConverter implements DSpaceConverter<Process, ProcessRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RelationshipConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RelationshipConverter.java
index f9d0cf52ec..1459db1a94 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RelationshipConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RelationshipConverter.java
@@ -11,6 +11,7 @@ import org.dspace.app.rest.model.RelationshipRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.Relationship;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -20,6 +21,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class RelationshipConverter implements DSpaceConverter<Relationship, RelationshipRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RelationshipTypeConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RelationshipTypeConverter.java
index c20249c025..44a5eb3d13 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RelationshipTypeConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RelationshipTypeConverter.java
@@ -11,6 +11,7 @@ import org.dspace.app.rest.model.RelationshipTypeRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.RelationshipType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -20,6 +21,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class RelationshipTypeConverter implements DSpaceConverter<RelationshipType, RelationshipTypeRest>  {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResearcherProfileConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResearcherProfileConverter.java
new file mode 100644
index 0000000000..54dffa5788
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResearcherProfileConverter.java
@@ -0,0 +1,98 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.converter;
+
+import static org.dspace.orcid.model.OrcidEntityType.FUNDING;
+import static org.dspace.orcid.model.OrcidEntityType.PUBLICATION;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.dspace.app.rest.model.ResearcherProfileRest;
+import org.dspace.app.rest.model.ResearcherProfileRest.OrcidSynchronizationRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.web.ContextUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * This converter is responsible for transforming an model that represent a
+ * ResearcherProfile to the REST representation of an ResearcherProfile.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component
+public class ResearcherProfileConverter implements DSpaceConverter<ResearcherProfile, ResearcherProfileRest> {
+
+    @Autowired
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    @Override
+    public ResearcherProfileRest convert(ResearcherProfile profile, Projection projection) {
+        ResearcherProfileRest researcherProfileRest = new ResearcherProfileRest();
+
+        researcherProfileRest.setVisible(profile.isVisible());
+        researcherProfileRest.setId(profile.getId());
+        researcherProfileRest.setProjection(projection);
+
+        Item item = profile.getItem();
+
+        Context context = ContextUtil.obtainCurrentRequestContext();
+
+        if (orcidSynchronizationService.isLinkedToOrcid(context, item)) {
+            profile.getOrcid().ifPresent(researcherProfileRest::setOrcid);
+
+            OrcidSynchronizationRest orcidSynchronization = new OrcidSynchronizationRest();
+            orcidSynchronization.setMode(getMode(item));
+            orcidSynchronization.setProfilePreferences(getProfilePreferences(item));
+            orcidSynchronization.setFundingsPreference(getFundingsPreference(item));
+            orcidSynchronization.setPublicationsPreference(getPublicationsPreference(item));
+            researcherProfileRest.setOrcidSynchronization(orcidSynchronization);
+        }
+
+        return researcherProfileRest;
+    }
+
+    private String getPublicationsPreference(Item item) {
+        return orcidSynchronizationService.getEntityPreference(item, PUBLICATION)
+                                          .map(OrcidEntitySyncPreference::name)
+                                          .orElse(OrcidEntitySyncPreference.DISABLED.name());
+    }
+
+    private String getFundingsPreference(Item item) {
+        return orcidSynchronizationService.getEntityPreference(item, FUNDING)
+                                          .map(OrcidEntitySyncPreference::name)
+                                          .orElse(OrcidEntitySyncPreference.DISABLED.name());
+    }
+
+    private List<String> getProfilePreferences(Item item) {
+        return orcidSynchronizationService.getProfilePreferences(item).stream()
+                                          .map(OrcidProfileSyncPreference::name)
+                                          .collect(Collectors.toList());
+    }
+
+    private String getMode(Item item) {
+        return orcidSynchronizationService.getSynchronizationMode(item)
+                                          .map(OrcidSynchronizationMode::name)
+                                          .orElse(OrcidSynchronizationMode.MANUAL.name());
+    }
+
+    @Override
+    public Class<ResearcherProfile> getModelClass() {
+        return ResearcherProfile.class;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResourcePolicyConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResourcePolicyConverter.java
index ab8694874c..6b233fed8b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResourcePolicyConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResourcePolicyConverter.java
@@ -12,6 +12,7 @@ import org.dspace.app.rest.projection.Projection;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.service.ResourcePolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -26,6 +27,8 @@ public class ResourcePolicyConverter implements DSpaceConverter<ResourcePolicy,
     @Autowired
     ResourcePolicyService resourcePolicyService;
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     ConverterService converterService;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ScriptConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ScriptConverter.java
index 105975355b..2d84a91dc7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ScriptConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ScriptConverter.java
@@ -12,6 +12,7 @@ import java.util.List;
 
 import org.apache.commons.cli.Option;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.dspace.app.rest.model.ParameterRest;
 import org.dspace.app.rest.model.ScriptRest;
 import org.dspace.app.rest.projection.Projection;
@@ -39,7 +40,7 @@ public class ScriptConverter implements DSpaceConverter<ScriptConfiguration, Scr
             parameterRest.setDescription(option.getDescription());
             parameterRest.setName((option.getOpt() != null ? "-" + option.getOpt() : "--" + option.getLongOpt()));
             parameterRest.setNameLong(option.getLongOpt() != null ? "--" + option.getLongOpt() : null);
-            parameterRest.setType(((Class) option.getType()).getSimpleName());
+            parameterRest.setType(getType(option));
             parameterRest.setMandatory(option.isRequired());
             parameterRestList.add(parameterRest);
         }
@@ -48,6 +49,29 @@ public class ScriptConverter implements DSpaceConverter<ScriptConfiguration, Scr
         return scriptRest;
     }
 
+    /**
+     * Retrieve the type for this Option. In Apache Commons CLI, Option objects default to a "String" type.
+     *
+     * In most situations, the Option type will correspond to the Java Class name (e.g. "String", "boolean", etc.).
+     * However, when the Option type is "String" (the default) and the Option is configured to not allow for
+     * additional arguments (hasArg=false), we switch the type to be "boolean". This behavior is necessary to ensure
+     * our REST API differentiates between an Option that requires an additional argument (which our REST API returns
+     * as a "String" type), and an Option which does not accept additional arguments (which is just a boolean flag
+     * used to trigger different behavior, hence a "boolean" type is more appropriate).
+     *
+     * @param option Option to retrieve the type for
+     * @return the type of the option based on the aforementioned logic
+     */
+    private String getType(Option option) {
+        String simpleName = ((Class) option.getType()).getSimpleName();
+        if (StringUtils.equalsIgnoreCase(simpleName, "string")) {
+            if (!option.hasArg()) {
+                return boolean.class.getSimpleName();
+            }
+        }
+        return simpleName;
+    }
+
     @Override
     public Class<ScriptConfiguration> getModelClass() {
         return ScriptConfiguration.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchFilterToAppliedFilterConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchFilterToAppliedFilterConverter.java
index 4bfce24935..6af9d904a3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchFilterToAppliedFilterConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchFilterToAppliedFilterConverter.java
@@ -29,7 +29,7 @@ public class SearchFilterToAppliedFilterConverter {
         AuthorityValue authorityValue = null;
         if (searchFilter.hasAuthorityOperator()) {
             // FIXME this is obviously wrong as it assumes that the authorityValueService is able to retrieve the label
-            // for each Authority. Indeed, the AuthorityValueService regardless to his name is specific of the
+            // for each Authority. Indeed, the AuthorityValueService regardless of its name is specific of the
             // "SOLRAuthority" implementation and should not have a prominent role.
             // Moreover, it is not possible to discover which authority is responsible for the value selected in the
             // facet as the authority is bind at the metadata level and so a facet could contains values from multiple
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCCLicenseConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCCLicenseConverter.java
index bf6b92a618..ad6e2d7962 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCCLicenseConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCCLicenseConverter.java
@@ -16,6 +16,7 @@ import org.dspace.app.rest.projection.Projection;
 import org.dspace.license.CCLicense;
 import org.dspace.license.CCLicenseField;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -25,6 +26,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class SubmissionCCLicenseConverter implements DSpaceConverter<CCLicense, SubmissionCCLicenseRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCCLicenseFieldConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCCLicenseFieldConverter.java
index 782056dc1c..70a1a4d76c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCCLicenseFieldConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCCLicenseFieldConverter.java
@@ -16,6 +16,7 @@ import org.dspace.app.rest.projection.Projection;
 import org.dspace.license.CCLicenseField;
 import org.dspace.license.CCLicenseFieldEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -27,6 +28,8 @@ import org.springframework.stereotype.Component;
 public class SubmissionCCLicenseFieldConverter
         implements DSpaceConverter<CCLicenseField, SubmissionCCLicenseFieldRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionDefinitionConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionDefinitionConverter.java
index f380a6695f..eccd9cba41 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionDefinitionConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionDefinitionConverter.java
@@ -27,6 +27,7 @@ import org.dspace.content.Collection;
 import org.dspace.core.Context;
 import org.dspace.services.RequestService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -47,6 +48,8 @@ public class SubmissionDefinitionConverter implements DSpaceConverter<Submission
     @Autowired
     private RequestService requestService;
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionFormConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionFormConverter.java
index 4555d8b00a..4febcd5594 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionFormConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionFormConverter.java
@@ -155,6 +155,7 @@ public class SubmissionFormConverter implements DSpaceConverter<DCInputSet, Subm
         inputField.setInput(inputRest);
         if (dcinput.isMetadataField()) {
             inputField.setSelectableMetadata(selectableMetadata);
+            inputField.setTypeBind(dcinput.getTypeBindList());
         }
         if (dcinput.isRelationshipField()) {
             selectableRelationship = getSelectableRelationships(dcinput);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/TemplateItemConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/TemplateItemConverter.java
index 1135238896..267b221417 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/TemplateItemConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/TemplateItemConverter.java
@@ -18,6 +18,7 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -28,6 +29,8 @@ import org.springframework.stereotype.Component;
 public class TemplateItemConverter
     implements DSpaceConverter<TemplateItem, TemplateItemRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/WorkflowDefinitionConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/WorkflowDefinitionConverter.java
index 04af851e8b..e7f322a20c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/WorkflowDefinitionConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/WorkflowDefinitionConverter.java
@@ -15,6 +15,7 @@ import org.dspace.app.rest.projection.Projection;
 import org.dspace.xmlworkflow.factory.XmlWorkflowFactory;
 import org.dspace.xmlworkflow.state.Workflow;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -28,6 +29,8 @@ public class WorkflowDefinitionConverter implements DSpaceConverter<Workflow, Wo
     @Autowired
     protected XmlWorkflowFactory xmlWorkflowFactory;
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/WorkflowStepConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/WorkflowStepConverter.java
index e1809f2cc4..a16093566a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/WorkflowStepConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/WorkflowStepConverter.java
@@ -14,6 +14,7 @@ import org.dspace.app.rest.model.WorkflowStepRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.xmlworkflow.state.Step;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -24,6 +25,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class WorkflowStepConverter implements DSpaceConverter<Step, WorkflowStepRest> {
 
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
     @Autowired
     ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceAccessDeniedHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceAccessDeniedHandler.java
index 9e20eca4c2..c2842d33d2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceAccessDeniedHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceAccessDeniedHandler.java
@@ -12,9 +12,9 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.dspace.app.rest.security.WebSecurityConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.security.web.csrf.CsrfToken;
@@ -40,8 +40,9 @@ import org.springframework.web.servlet.HandlerExceptionResolver;
 @Component
 public class DSpaceAccessDeniedHandler implements AccessDeniedHandler {
 
+    @Lazy
     @Autowired
-    private WebSecurityConfiguration webSecurityConfiguration;
+    private CsrfTokenRepository csrfTokenRepository;
 
     @Autowired
     @Qualifier("handlerExceptionResolver")
@@ -69,9 +70,6 @@ public class DSpaceAccessDeniedHandler implements AccessDeniedHandler {
         // switched clients (from HAL Browser to UI or visa versa) and has an out-of-sync token.
         // NOTE: this logic is tested in AuthenticationRestControllerIT.testRefreshTokenWithInvalidCSRF()
         if (ex instanceof InvalidCsrfTokenException) {
-            // Get access to our enabled CSRF token repository
-            CsrfTokenRepository csrfTokenRepository = webSecurityConfiguration.getCsrfTokenRepository();
-
             // Remove current token & generate a new one
             csrfTokenRepository.saveToken(null, request, response);
             CsrfToken newToken = csrfTokenRepository.generateToken(request);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
index d57e637047..1cbfd5c632 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
@@ -7,20 +7,27 @@
  */
 package org.dspace.app.rest.exception;
 
+import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
 import static org.springframework.web.servlet.DispatcherServlet.EXCEPTION_ATTRIBUTE;
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.dspace.app.exception.ResourceAlreadyExistsException;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
+import org.dspace.eperson.InvalidReCaptchaException;
+import org.dspace.orcid.exception.OrcidValidationException;
+import org.dspace.services.ConfigurationService;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.repository.support.QueryMethodParameterConversionException;
@@ -51,12 +58,18 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
  */
 @ControllerAdvice
 public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionHandler {
-    private static final Logger log = LogManager.getLogger(DSpaceApiExceptionControllerAdvice.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
-     * Set of HTTP error codes to log as ERROR with full stacktrace.
+     * Default collection of HTTP error codes to log as ERROR with full stack trace.
      */
-    private static final Set<Integer> LOG_AS_ERROR = Set.of(422);
+    private static final String[] LOG_AS_ERROR_DEFAULT = { "422" };
+
+    /** Configuration parameter for ERROR treatment. */
+    private static final String P_LOG_AS_ERROR = "logging.server.include-stacktrace-for-httpcode";
+
+    @Inject
+    private ConfigurationService configurationService;
 
     @ExceptionHandler({AuthorizeException.class, RESTAuthorizationException.class, AccessDeniedException.class})
     protected void handleAuthorizeException(HttpServletRequest request, HttpServletResponse response, Exception ex)
@@ -106,7 +119,7 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
                           HttpServletResponse.SC_METHOD_NOT_ALLOWED);
     }
 
-    @ExceptionHandler( {UnprocessableEntityException.class})
+    @ExceptionHandler({ UnprocessableEntityException.class, ResourceAlreadyExistsException.class })
     protected void handleUnprocessableEntityException(HttpServletRequest request, HttpServletResponse response,
                                                       Exception ex) throws IOException {
         //422 is not defined in HttpServletResponse.  Its meaning is "Unprocessable Entity".
@@ -124,15 +137,35 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
                 HttpStatus.UNPROCESSABLE_ENTITY.value());
     }
 
+    /**
+     * Handle the {@link OrcidValidationException} returning the exception message
+     * in the response, that always contains only the validation error codes (usable
+     * for example to show specific messages to users). No other details are present
+     * in the exception message.
+     */
+    @ExceptionHandler({ OrcidValidationException.class })
+    protected void handleOrcidValidationException(HttpServletRequest request, HttpServletResponse response,
+        OrcidValidationException ex) throws IOException {
+        sendErrorResponse(request, response, ex, ex.getMessage(), HttpStatus.UNPROCESSABLE_ENTITY.value());
+    }
+
     /**
      * Add user-friendly error messages to the response body for selected errors.
-     * Since the error messages will be exposed to the API user, the exception classes are expected to implement
-     * {@link TranslatableException} such that the error messages can be translated.
+     * Since the error messages will be exposed to the API user, the
+     * exception classes are expected to implement {@link TranslatableException}
+     * such that the error messages can be translated.
+     *
+     * @param request the client's request
+     * @param response our response
+     * @param ex exception thrown in handling request
+     * @throws java.io.IOException passed through.
      */
     @ExceptionHandler({
         RESTEmptyWorkflowGroupException.class,
         EPersonNameNotProvidedException.class,
         GroupNameNotProvidedException.class,
+        GroupHasPendingWorkflowTasksException.class,
+        PasswordNotValidException.class,
     })
     protected void handleCustomUnprocessableEntityException(HttpServletRequest request, HttpServletResponse response,
                                                             TranslatableException ex) throws IOException {
@@ -160,6 +193,18 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
                           HttpStatus.BAD_REQUEST.value());
     }
 
+    @ExceptionHandler({WrongCurrentPasswordException.class})
+    protected void handleInvalidPasswordException(HttpServletRequest request, HttpServletResponse response,
+                                               Exception ex) throws IOException {
+        sendErrorResponse(request, response, ex, ex.getMessage(), HttpServletResponse.SC_FORBIDDEN);
+    }
+
+    @ExceptionHandler(InvalidReCaptchaException.class)
+    protected void handleInvalidCaptchaTokenRequestException(HttpServletRequest request, HttpServletResponse response,
+                                                                                      Exception ex) throws IOException {
+        sendErrorResponse(request, response, ex, "Invalid captcha token", SC_FORBIDDEN);
+    }
+
     @Override
     protected ResponseEntity<Object> handleMissingServletRequestParameter(MissingServletRequestParameterException ex,
                                                                           HttpHeaders headers, HttpStatus status,
@@ -192,9 +237,12 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
 
     /**
      * Send the error to the response.
-     * 5xx errors will be logged as ERROR with a full stack trace, 4xx errors will be logged as WARN without a
-     * stacktrace. Specific 4xx errors where an ERROR log with full stacktrace is more appropriate are configured in
-     * {@link #LOG_AS_ERROR}
+     * 5xx errors will be logged as ERROR with a full stack trace.  4xx errors
+     * will be logged as WARN without a stack trace. Specific 4xx errors where
+     * an ERROR log with full stack trace is more appropriate are configured
+     * using property {@code logging.server.include-stacktrace-for-httpcode}
+     * (see {@link P_LOG_AS_ERROR} and {@link LOG_AS_ERROR_DEFAULT}).
+     *
      * @param request current request
      * @param response current response
      * @param ex Exception thrown
@@ -202,18 +250,44 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
      * @param statusCode status code to send in response
      * @throws IOException
      */
-    private void sendErrorResponse(final HttpServletRequest request, final HttpServletResponse response,
-                                   final Exception ex, final String message, final int statusCode) throws IOException {
+    private void sendErrorResponse(final HttpServletRequest request,
+            final HttpServletResponse response,
+            final Exception ex, final String message, final int statusCode)
+            throws IOException {
         //Make sure Spring picks up this exception
         request.setAttribute(EXCEPTION_ATTRIBUTE, ex);
 
+        // Which status codes should be treated as ERROR?
+        final Set<Integer> LOG_AS_ERROR = new HashSet<>();
+        String[] error_codes = configurationService.getArrayProperty(
+                P_LOG_AS_ERROR, LOG_AS_ERROR_DEFAULT);
+        for (String code : error_codes) {
+            try {
+                LOG_AS_ERROR.add(Integer.valueOf(code));
+            } catch (NumberFormatException e) {
+                log.warn("Non-integer HTTP status code {} in {}", code, P_LOG_AS_ERROR);
+                // And continue
+            }
+        }
+
         // We don't want to fill logs with bad/invalid REST API requests.
         if (HttpStatus.valueOf(statusCode).is5xxServerError() || LOG_AS_ERROR.contains(statusCode)) {
             // Log the full error and status code
             log.error("{} (status:{})", message, statusCode, ex);
         } else if (HttpStatus.valueOf(statusCode).is4xxClientError()) {
             // Log the error as a single-line WARN
-            log.warn("{} (status:{})", message, statusCode);
+            String location;
+            String exceptionMessage;
+            if (null == ex) {
+                exceptionMessage = "none";
+                location = "unknown";
+            } else {
+                exceptionMessage = ex.getMessage();
+                StackTraceElement[] trace = ex.getStackTrace();
+                location = trace.length <= 0 ? "unknown" : trace[0].toString();
+            }
+            log.warn("{} (status:{} exception: {} at: {})", message, statusCode,
+                    exceptionMessage, location);
         }
 
         //Exception properties will be set by org.springframework.boot.web.support.ErrorPageFilter
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/GroupHasPendingWorkflowTasksException.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/GroupHasPendingWorkflowTasksException.java
new file mode 100644
index 0000000000..707fa445e6
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/GroupHasPendingWorkflowTasksException.java
@@ -0,0 +1,36 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.rest.exception;
+
+import org.dspace.core.I18nUtil;
+
+/**
+ * <p>Extend {@link UnprocessableEntityException} to provide a specific error message
+ * in the REST response. The error message is added to the response in
+ * {@link DSpaceApiExceptionControllerAdvice#handleCustomUnprocessableEntityException},
+ * hence it should not contain sensitive or security-compromising info.</p>
+ *
+ */
+public class GroupHasPendingWorkflowTasksException
+        extends UnprocessableEntityException implements TranslatableException {
+    public static final String MESSAGE_KEY =
+        "org.dspace.app.rest.exception.GroupHasPendingWorkflowTasksException.message";
+
+    public GroupHasPendingWorkflowTasksException() {
+        super(I18nUtil.getMessage(MESSAGE_KEY));
+    }
+
+    public GroupHasPendingWorkflowTasksException(Throwable cause) {
+        super(I18nUtil.getMessage(MESSAGE_KEY), cause);
+    }
+
+    public String getMessageKey() {
+        return MESSAGE_KEY;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/InvalidSearchRequestException.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/InvalidSearchRequestException.java
index cd9f288453..48279b063d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/InvalidSearchRequestException.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/InvalidSearchRequestException.java
@@ -7,11 +7,11 @@
  */
 package org.dspace.app.rest.exception;
 
-import org.dspace.app.rest.utils.DiscoverQueryBuilder;
+import org.dspace.app.rest.utils.RestDiscoverQueryBuilder;
 
 /**
  * This exception is thrown when the given search configuration
- * passed to {@link DiscoverQueryBuilder} is invalid
+ * passed to {@link RestDiscoverQueryBuilder} is invalid
  * 
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
@@ -25,4 +25,4 @@ public class InvalidSearchRequestException extends RuntimeException {
         super(message);
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/PasswordNotValidException.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/PasswordNotValidException.java
new file mode 100644
index 0000000000..90f30491cc
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/PasswordNotValidException.java
@@ -0,0 +1,37 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.exception;
+
+import org.dspace.core.I18nUtil;
+
+/**
+ * This class provides an exception to be used when trying to create an EPerson
+ * with password that not match regular expression configured in this
+ * variable "authentication-password.regex-validation.pattern" in dspace.cfg or during the patch of password.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class PasswordNotValidException extends UnprocessableEntityException implements TranslatableException {
+
+    private static final long serialVersionUID = -4294543847989250566L;
+
+    public static final String MESSAGE_KEY = "org.dspace.app.rest.exception.PasswordNotValidException.message";
+
+    public PasswordNotValidException() {
+        super(I18nUtil.getMessage(MESSAGE_KEY));
+    }
+
+    public PasswordNotValidException(Throwable cause) {
+        super(I18nUtil.getMessage(MESSAGE_KEY), cause);
+    }
+
+    public String getMessageKey() {
+        return MESSAGE_KEY;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/WrongCurrentPasswordException.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/WrongCurrentPasswordException.java
new file mode 100644
index 0000000000..95c29fa592
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/WrongCurrentPasswordException.java
@@ -0,0 +1,23 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.exception;
+
+/**
+ * This exception is thrown when the provided current password is wrong.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.it)
+ */
+public class WrongCurrentPasswordException extends RuntimeException {
+
+    private static final long serialVersionUID = 7774965236190392985L;
+
+    public WrongCurrentPasswordException(String message) {
+        super(message);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/hdlresolver/HdlResolverRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/hdlresolver/HdlResolverRestController.java
new file mode 100644
index 0000000000..540c3fd172
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/hdlresolver/HdlResolverRestController.java
@@ -0,0 +1,198 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.hdlresolver;
+
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.Optional;
+import javax.servlet.http.HttpServletRequest;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.handle.hdlresolver.HdlResolverDTO;
+import org.dspace.handle.hdlresolver.HdlResolverService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * This controller is public and is useful for handle resolving,
+ * whether a target handle identifier will be resolved into the
+ * corresponding URL (if found), otherwise will respond a null string.
+ *
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.it)
+ *
+ */
+@RestController
+@ConditionalOnProperty("handle.remote-resolver.enabled")
+@RequestMapping(path = "/{hdlService:hdlresolver|resolve|listhandles|listprefixes}/")
+public class HdlResolverRestController {
+    static final String HDL_RESOLVER = "/hdlresolver/";
+    static final String RESOLVE = "/resolve/";
+    static final String LISTHANDLES = "/listhandles/";
+    static final String LISTPREFIXES = "/listprefixes/";
+
+    private static final Logger log = LogManager.getLogger();
+
+    @Autowired
+    private HdlResolverService hdlResolverService;
+
+    @GetMapping(
+        value = "**",
+        produces = "application/json;charset=UTF-8"
+    )
+    public ResponseEntity<String> handleController(HttpServletRequest request, @PathVariable String hdlService) {
+        if (HDL_RESOLVER.contains(hdlService) || RESOLVE.contains(hdlService)) {
+            return resolveHandle(request, hdlService);
+        } else if (LISTHANDLES.contains(hdlService)) {
+            return this.listHandles(
+                    request,
+                    Optional.ofNullable(request.getRequestURI().split(LISTHANDLES))
+                        .filter(split -> split.length > 1)
+                        .map(splitted -> splitted[1])
+                        .orElse(null)
+            );
+        } else if (LISTPREFIXES.contains(hdlService)) {
+            return this.listPrefixes(request);
+        } else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
+    /**
+     * REST GET Method used to find and retrieve the URL of a target Handle. It
+     * should return only one item, if found, else a null body value.
+     * </br>
+     * Generate an <code>HttpStatus.BAD_REQUEST</code> 400 Error if the handle used
+     * in path isn't valid.
+     * </br>
+     * The response type will be (<code>application/json;charset=UTF-8</code>)
+     * a string representing an array-like list of handles:
+     * </br>
+     * Example:
+     *      <ul>
+     *          <li>Request: GET - http://{dspace.url}/hdlresolver/handleIdExample/1</li>
+     *          <li>Response: 200 - ["http://localhost/handle/hanldeIdExample1"]
+     *      </ul>
+     *
+     * @param request {@code HttpServletRequest}
+     * @return One element List or <code>null</code> with status 200 - <code>HttpStatus.OK</code>
+     *         or 400 - <code>HttpStatus.BAD_REQUEST</code> error
+     */
+    public ResponseEntity<String> resolveHandle(HttpServletRequest request, String hdlService) {
+        HdlResolverDTO handleResolver =
+                this.hdlResolverService.resolveBy(
+                        request.getRequestURI(),
+                        MessageFormat.format("{0}/{1}/", request.getContextPath(), hdlService)
+                );
+        if (!handleResolver.isValid()) {
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        } else {
+            return new ResponseEntity<>(this.resolveToURL(request, handleResolver), HttpStatus.OK);
+        }
+    }
+
+    /**
+     * REST GET Method used to list all available prefixes for handles. It
+     * should return a list of prefixes, at least the default one.
+     * </br>
+     * The response type will be (<code>application/json;charset=UTF-8</code>)
+     * a string representing an array-like list of handles:
+     * </br>
+     * Example:
+     *      <ul>
+     *          <li>Request: GET - http://{dspace.url}/listprefixes</li>
+     *          <li>Response: 200 - ["123456789","prefix1","prefix2"]
+     *      </ul>
+     *
+     * @param request {@code HttpServletRequest}
+     * @return List of valid prefixes with status 200 <code>HttpStatus.OK</code>
+     */
+    public ResponseEntity<String> listPrefixes(HttpServletRequest request) {
+        return new ResponseEntity<>(this.mapAsJson(this.hdlResolverService.listPrefixes()), HttpStatus.OK);
+    }
+
+    /**
+     * REST GET Method used to list all available handles starting with target prefix.
+     * It should return a list of handles.
+     * </br>
+     * If the controller is disabled `handle.hide.listhandles = true`,
+     * then 400 - <code>HttpStatus.NOT_FOUND</code> is returned.
+     * </br>
+     * If the requested prefix is blank,
+     * then 404 - <code>HttpStatus.BAD_REQUEST</code> is returned.
+     * </br>
+     * The response type will be (<code>application/json;charset=UTF-8</code>)
+     * a string representing an array-like list of handles:
+     * </br>
+     * Example:
+     *      <ul>
+     *          <li>Request: GET - http://{dspace.url}/listhandles/prefix</li>
+     *          <li>Response: 200 - ["prefix/zero","prefix1/one","prefix2/two"]
+     *      </ul>
+     *
+     * @param request {@code HttpServletRequest}
+     * @param prefix {@code String} representing the prefix that will be searched
+     * @return List of valid prefixes with status 200 <code>HttpStatus.OK</code>
+     *         or status 400 <code>HttpStatus.NOT_FOUND</code> if disabled by properties
+     *         or status 404 <code>HttpStatus.BAD_REQUEST</code> if blank prefix is requested.
+     */
+    public ResponseEntity<String> listHandles(HttpServletRequest request, @PathVariable String prefix) {
+        if (!this.hdlResolverService.isListhandlesEnabled()) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+        if (StringUtils.isBlank(prefix)) {
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<>(
+            this.mapAsJson(this.hdlResolverService.listHandles(ContextUtil.obtainContext(request), prefix)),
+            HttpStatus.OK
+        );
+    }
+
+    /**
+     * Maps the handle to a correct response.
+     *
+     * @param request        HttpServletRequest
+     * @param handleResolver HdlResolverDTO - Handle resolver
+     * @return One element list using String if found, else null String.
+     */
+    private String resolveToURL(HttpServletRequest request, HdlResolverDTO handleResolver) {
+        return mapAsJson(this.hdlResolverService.resolveToURL(ContextUtil.obtainContext(request), handleResolver));
+    }
+
+    protected String mapAsJson(final String resolvedUrl) {
+        String json = "null";
+        if (StringUtils.isNotEmpty(resolvedUrl)) {
+            json = mapAsJson(List.of(resolvedUrl));
+        }
+        return json;
+    }
+
+    protected String mapAsJson(final List<String> jsonList) {
+        String json = "null";
+        if (jsonList != null && !jsonList.isEmpty()) {
+            try {
+                json = new ObjectMapper().writeValueAsString(jsonList);
+            } catch (JsonProcessingException e) {
+                log.error("Error during conversion of response!", e);
+            }
+        }
+        return json;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/health/GeoIpHealthIndicator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/health/GeoIpHealthIndicator.java
new file mode 100644
index 0000000000..191bb4f1ef
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/health/GeoIpHealthIndicator.java
@@ -0,0 +1,42 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.health;
+
+import static org.dspace.app.rest.configuration.ActuatorConfiguration.UP_WITH_ISSUES_STATUS;
+
+import org.dspace.statistics.GeoIpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.health.AbstractHealthIndicator;
+import org.springframework.boot.actuate.health.Health.Builder;
+import org.springframework.boot.actuate.health.HealthIndicator;
+
+/**
+ * Implementation of {@link HealthIndicator} that verifies if the GeoIP database
+ * is configured correctly.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GeoIpHealthIndicator extends AbstractHealthIndicator {
+
+    @Autowired
+    private GeoIpService geoIpService;
+
+    @Override
+    protected void doHealthCheck(Builder builder) throws Exception {
+
+        try {
+            geoIpService.getDatabaseReader();
+            builder.up();
+        } catch (IllegalStateException ex) {
+            builder.status(UP_WITH_ISSUES_STATUS).withDetail("reason", ex.getMessage());
+        }
+
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/HalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/HalLinkFactory.java
index 093c93a182..86719847d8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/HalLinkFactory.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/HalLinkFactory.java
@@ -43,10 +43,12 @@ public abstract class HalLinkFactory<RESOURCE, CONTROLLER> {
         return list;
     }
 
-
+    /**
+     * Please note that this method could lead to double encoding.
+     * See: https://github.com/DSpace/DSpace/issues/8333
+     */
     protected <T> Link buildLink(String rel, T data) {
         UriComponentsBuilder uriComponentsBuilder = uriBuilder(data);
-
         return buildLink(rel, uriComponentsBuilder.build().toUriString());
     }
 
@@ -56,9 +58,7 @@ public abstract class HalLinkFactory<RESOURCE, CONTROLLER> {
     }
 
     protected Link buildLink(String rel, String href) {
-        Link link = new Link(href, rel);
-
-        return link;
+        return Link.of(href, rel);
     }
 
     protected CONTROLLER getMethodOn(Object... parameters) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/OrcidQueueHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/OrcidQueueHalLinkFactory.java
new file mode 100644
index 0000000000..813ddf58db
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/OrcidQueueHalLinkFactory.java
@@ -0,0 +1,64 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.link;
+
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
+
+import java.util.LinkedList;
+
+import org.atteo.evo.inflector.English;
+import org.dspace.app.rest.RestResourceController;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.model.OrcidQueueRest;
+import org.dspace.app.rest.model.hateoas.OrcidQueueResource;
+import org.springframework.data.domain.Pageable;
+import org.springframework.hateoas.Link;
+import org.springframework.stereotype.Component;
+import org.springframework.web.util.UriComponentsBuilder;
+
+/**
+ * This class' purpose is to provide a factory to add links to the OrcidQueueResource.
+ * The addLinks factory will be called from the HalLinkService class addLinks method.
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+@Component
+public class OrcidQueueHalLinkFactory extends HalLinkFactory<OrcidQueueResource, RestResourceController> {
+
+    @Override
+    protected void addLinks(OrcidQueueResource halResource, Pageable pageable, LinkedList<Link> list)
+            throws Exception {
+
+        OrcidQueueRest orcidQueueRest = halResource.getContent();
+        if (orcidQueueRest.getProfileItemId() != null) {
+            UriComponentsBuilder uriComponentsBuilder = linkTo(getMethodOn(ItemRest.CATEGORY, ItemRest.NAME)
+                                       .findRel(null, null, ItemRest.CATEGORY, English.plural(ItemRest.NAME),
+                                        orcidQueueRest.getProfileItemId(), "", null, null)).toUriComponentsBuilder();
+            String uribuilder = uriComponentsBuilder.build().toString();
+            list.add(buildLink("profileItem", uribuilder.substring(0, uribuilder.lastIndexOf("/"))));
+        }
+
+        if (orcidQueueRest.getEntityId() != null) {
+            UriComponentsBuilder uriComponentsBuilder = linkTo(getMethodOn(ItemRest.CATEGORY, ItemRest.NAME)
+                                       .findRel(null, null, ItemRest.CATEGORY, English.plural(ItemRest.NAME),
+                                        orcidQueueRest.getEntityId(), "", null, null)).toUriComponentsBuilder();
+            String uribuilder = uriComponentsBuilder.build().toString();
+            list.add(buildLink("entity", uribuilder.substring(0, uribuilder.lastIndexOf("/"))));
+        }
+    }
+
+    @Override
+    protected Class<RestResourceController> getControllerClass() {
+        return RestResourceController.class;
+    }
+
+    @Override
+    protected Class<OrcidQueueResource> getResourceClass() {
+        return OrcidQueueResource.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/externalsources/ExternalSourceEntryHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/externalsources/ExternalSourceEntryHalLinkFactory.java
index 0c0f9678b8..a5189fc844 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/externalsources/ExternalSourceEntryHalLinkFactory.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/externalsources/ExternalSourceEntryHalLinkFactory.java
@@ -7,13 +7,15 @@
  */
 package org.dspace.app.rest.link.externalsources;
 
+import static org.springframework.hateoas.IanaLinkRelations.SELF;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
+
 import java.util.LinkedList;
 
 import org.dspace.app.rest.ExternalSourcesRestController;
 import org.dspace.app.rest.link.HalLinkFactory;
 import org.dspace.app.rest.model.hateoas.ExternalSourceEntryResource;
 import org.springframework.data.domain.Pageable;
-import org.springframework.hateoas.IanaLinkRelations;
 import org.springframework.hateoas.Link;
 import org.springframework.stereotype.Component;
 
@@ -26,12 +28,19 @@ public class ExternalSourceEntryHalLinkFactory
 
     @Override
     protected void addLinks(ExternalSourceEntryResource halResource, Pageable pageable, LinkedList<Link> list)
-        throws Exception {
-
-        list.add(buildLink(IanaLinkRelations.SELF.value(),
-                           getMethodOn().getExternalSourceEntryValue(halResource.getContent().getExternalSource(),
-                                                                     halResource.getContent().getId())));
+            throws Exception {
+        String externalSource = halResource.getContent().getExternalSource();
+        String id = halResource.getContent().getId();
+        list.add(buildLink(getMethodOn().getExternalSourceEntryValue(externalSource, id), SELF.value()));
+    }
 
+    /**
+     * FIXME
+     * This custom logic should be removed when Some HAL links
+     * show a double encoding https://github.com/DSpace/DSpace/issues/8333 is fixed.
+     */
+    private <T> Link buildLink(T data, String rel) {
+        return linkTo(data).withRel(rel);
     }
 
     @Override
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/PostLoggedInAction.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/PostLoggedInAction.java
new file mode 100644
index 0000000000..d288ef1ecf
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/PostLoggedInAction.java
@@ -0,0 +1,27 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.login;
+
+import org.dspace.core.Context;
+
+/**
+ * Interface for classes that need to perform some operations after the user
+ * login.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface PostLoggedInAction {
+
+    /**
+     * Perform some operations after the user login.
+     *
+     * @param context the DSpace context
+     */
+    public void loggedIn(Context context);
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
new file mode 100644
index 0000000000..1450c12f90
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
@@ -0,0 +1,141 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.login.impl;
+
+import static org.apache.commons.collections4.IteratorUtils.toList;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.dspace.content.authority.Choices.CF_ACCEPTED;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.login.PostLoggedInAction;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataFieldName;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+
+/**
+ * Implementation of {@link PostLoggedInAction} that perform an automatic claim
+ * between the logged eperson and possible profiles without eperson present in
+ * the system. This pairing between eperson and profile is done starting from
+ * the configured metadata of the logged in user.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class ResearcherProfileAutomaticClaim implements PostLoggedInAction {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(ResearcherProfileAutomaticClaim.class);
+
+    @Autowired
+    private ResearcherProfileService researcherProfileService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private EPersonService ePersonService;
+
+    /**
+     * The field of the eperson to search for.
+     */
+    private final String ePersonField;
+
+    /**
+     * The field of the profile item to search.
+     */
+    private final String profileField;
+
+    public ResearcherProfileAutomaticClaim(String ePersonField, String profileField) {
+        Assert.notNull(ePersonField, "An eperson field is required to perform automatic claim");
+        Assert.notNull(profileField, "An profile field is required to perform automatic claim");
+        this.ePersonField = ePersonField;
+        this.profileField = profileField;
+    }
+
+    @Override
+    public void loggedIn(Context context) {
+
+        if (isBlank(researcherProfileService.getProfileType())) {
+            return;
+        }
+
+        EPerson currentUser = context.getCurrentUser();
+        if (currentUser == null) {
+            return;
+        }
+
+        try {
+            claimProfile(context, currentUser);
+        } catch (SQLException | AuthorizeException e) {
+            LOGGER.error("An error occurs during the profile claim by email", e);
+        }
+
+    }
+
+    private void claimProfile(Context context, EPerson currentUser) throws SQLException, AuthorizeException {
+
+        UUID id = currentUser.getID();
+        String fullName = currentUser.getFullName();
+
+        if (currentUserHasAlreadyResearcherProfile(context)) {
+            return;
+        }
+
+        Item item = findClaimableProfile(context, currentUser);
+        if (item != null) {
+            itemService.addMetadata(context, item, "dspace", "object", "owner",
+                                    null, fullName, id.toString(), CF_ACCEPTED);
+        }
+
+    }
+
+    private boolean currentUserHasAlreadyResearcherProfile(Context context) throws SQLException, AuthorizeException {
+        return researcherProfileService.findById(context, context.getCurrentUser().getID()) != null;
+    }
+
+    private Item findClaimableProfile(Context context, EPerson currentUser) throws SQLException, AuthorizeException {
+
+        String value = getValueToSearchFor(context, currentUser);
+        if (StringUtils.isEmpty(value)) {
+            return null;
+        }
+
+        List<Item> items = toList(itemService.findArchivedByMetadataField(context, profileField, value)).stream()
+            .filter(this::hasNotOwner)
+            .filter(researcherProfileService::hasProfileType)
+            .collect(Collectors.toList());
+
+        return items.size() == 1 ? items.get(0) : null;
+    }
+
+    private String getValueToSearchFor(Context context, EPerson currentUser) {
+        if ("email".equals(ePersonField)) {
+            return currentUser.getEmail();
+        }
+        return ePersonService.getMetadataFirstValue(currentUser, new MetadataFieldName(ePersonField), Item.ANY);
+    }
+
+    private boolean hasNotOwner(Item item) {
+        return CollectionUtils.isEmpty(itemService.getMetadata(item, "dspace", "object", "owner", Item.ANY));
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AccessStatusRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AccessStatusRest.java
new file mode 100644
index 0000000000..c7dc2d1198
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AccessStatusRest.java
@@ -0,0 +1,49 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty.Access;
+
+/**
+ * The Access Status REST Resource.
+ */
+public class AccessStatusRest implements RestModel {
+    public static final String NAME = "accessStatus";
+
+    String status;
+
+    @Override
+    @JsonProperty(access = Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    @JsonIgnore
+    public String getTypePlural() {
+        return getType();
+    }
+
+    public AccessStatusRest() {
+        setStatus(null);
+    }
+
+    public AccessStatusRest(String status) {
+        setStatus(status);
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthenticationStatusRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthenticationStatusRest.java
index 81a59bbd69..784c06e059 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthenticationStatusRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthenticationStatusRest.java
@@ -7,9 +7,12 @@
  */
 package org.dspace.app.rest.model;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.dspace.app.rest.RestResourceController;
 
+
 /**
  * Find out your authentication status.
  */
@@ -18,7 +21,11 @@ public class AuthenticationStatusRest extends BaseObjectRest<Integer> {
     private boolean authenticated;
     private String authenticationMethod;
 
+    private EPersonRest ePersonRest;
+    private List<GroupRest> specialGroups;
+
     public static final String NAME = "status";
+    public static final String SPECIALGROUPS = "specialGroups";
     public static final String CATEGORY = RestAddressableModel.AUTHENTICATION;
 
     @Override
@@ -41,9 +48,6 @@ public class AuthenticationStatusRest extends BaseObjectRest<Integer> {
         return RestResourceController.class;
     }
 
-
-    private EPersonRest ePersonRest;
-
     public AuthenticationStatusRest() {
         setOkay(true);
         setAuthenticated(false);
@@ -90,4 +94,14 @@ public class AuthenticationStatusRest extends BaseObjectRest<Integer> {
     public void setAuthenticationMethod(final String authenticationMethod) {
         this.authenticationMethod = authenticationMethod;
     }
+
+    public void setSpecialGroups(List<GroupRest> groupList) {
+        this.specialGroups = groupList;
+    }
+
+    @LinkRest(name = "specialGroups")
+    @JsonIgnore
+    public List<GroupRest> getSpecialGroups() {
+        return specialGroups;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java
index 5897f73944..63004b68d2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java
@@ -17,6 +17,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
+        @LinkRest(
+                name = ItemRest.ACCESS_STATUS,
+                method = "getAccessStatus"
+        ),
         @LinkRest(
                 name = ItemRest.BUNDLES,
                 method = "getBundles"
@@ -51,6 +55,7 @@ public class ItemRest extends DSpaceObjectRest {
     public static final String PLURAL_NAME = "items";
     public static final String CATEGORY = RestAddressableModel.CORE;
 
+    public static final String ACCESS_STATUS = "accessStatus";
     public static final String BUNDLES = "bundles";
     public static final String MAPPED_COLLECTIONS = "mappedCollections";
     public static final String OWNING_COLLECTION = "owningCollection";
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidHistoryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidHistoryRest.java
new file mode 100644
index 0000000000..02e0f47062
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidHistoryRest.java
@@ -0,0 +1,107 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.Date;
+import java.util.UUID;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The OrcidHistory REST Resource
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+@LinkRest
+public class OrcidHistoryRest extends BaseObjectRest<Integer> {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CATEGORY = RestModel.EPERSON;
+    public static final String NAME = "orcidhistory";
+
+    private UUID profileItemId;
+
+    private UUID entityId;
+
+    private Integer status;
+
+    private String putCode;
+
+    private Date timestamp;
+
+    private String responseMessage;
+
+    public OrcidHistoryRest(){}
+
+    @Override
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class<RestResourceController> getController() {
+        return RestResourceController.class;
+    }
+
+    public UUID getProfileItemId() {
+        return profileItemId;
+    }
+
+    public void setProfileItemId(UUID profileItemId) {
+        this.profileItemId = profileItemId;
+    }
+
+    public UUID getEntityId() {
+        return entityId;
+    }
+
+    public void setEntityId(UUID entityId) {
+        this.entityId = entityId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getPutCode() {
+        return putCode;
+    }
+
+    public void setPutCode(String putCode) {
+        this.putCode = putCode;
+    }
+
+    public Date getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Date timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getResponseMessage() {
+        return responseMessage;
+    }
+
+    public void setResponseMessage(String responseMessage) {
+        this.responseMessage = responseMessage;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidQueueRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidQueueRest.java
new file mode 100644
index 0000000000..ba7c300628
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidQueueRest.java
@@ -0,0 +1,88 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.UUID;
+
+import org.dspace.app.rest.RestResourceController;
+
+@LinkRest
+public class OrcidQueueRest extends BaseObjectRest<Integer> {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CATEGORY = RestModel.EPERSON;
+    public static final String NAME = "orcidqueue";
+    public static final String PLURAL_NAME = "orcidqueues";
+
+    private UUID profileItemId;
+
+    private UUID entityId;
+
+    private String description;
+
+    private String recordType;
+
+    private String operation;
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class<RestResourceController> getController() {
+        return RestResourceController.class;
+    }
+
+    public UUID getProfileItemId() {
+        return profileItemId;
+    }
+
+    public void setProfileItemId(UUID profileItemId) {
+        this.profileItemId = profileItemId;
+    }
+
+    public UUID getEntityId() {
+        return entityId;
+    }
+
+    public void setEntityId(UUID entityId) {
+        this.entityId = entityId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getRecordType() {
+        return recordType;
+    }
+
+    public void setRecordType(String recordType) {
+        this.recordType = recordType;
+    }
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java
index e1aeb3ff6f..dd35a0726e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java
@@ -18,10 +18,18 @@ import org.dspace.app.rest.RestResourceController;
  * This class acts as a data holder for the RelationshipResource
  * Refer to {@link org.dspace.content.Relationship} for explanation about the properties
  */
+@LinksRest(links = {
+    @LinkRest(
+        name = RelationshipRest.RELATIONSHIP_TYPE,
+        method = "getRelationshipType"
+    )
+})
 public class RelationshipRest extends BaseObjectRest<Integer> {
     public static final String NAME = "relationship";
     public static final String CATEGORY = "core";
 
+    public static final String RELATIONSHIP_TYPE = "relationshipType";
+
     @JsonIgnore
     private UUID leftId;
     @JsonIgnore
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResearcherProfileRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResearcherProfileRest.java
new file mode 100644
index 0000000000..4224cfeeb9
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResearcherProfileRest.java
@@ -0,0 +1,132 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.List;
+import java.util.UUID;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The Researcher Profile REST resource.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@LinksRest(links = {
+        @LinkRest(name = ResearcherProfileRest.ITEM, method = "getItem"),
+        @LinkRest(name = ResearcherProfileRest.EPERSON, method = "getEPerson")
+})
+public class ResearcherProfileRest extends BaseObjectRest<UUID> {
+
+    private static final long serialVersionUID = 1L;
+    public static final String CATEGORY = RestModel.EPERSON;
+    public static final String NAME = "profile";
+
+    public static final String ITEM = "item";
+    public static final String EPERSON = "eperson";
+
+    private boolean visible;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String orcid;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private OrcidSynchronizationRest orcidSynchronization;
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public void setVisible(boolean visible) {
+        this.visible = visible;
+    }
+
+    public OrcidSynchronizationRest getOrcidSynchronization() {
+        return orcidSynchronization;
+    }
+
+    public void setOrcidSynchronization(OrcidSynchronizationRest orcidSynchronization) {
+        this.orcidSynchronization = orcidSynchronization;
+    }
+
+    public String getOrcid() {
+        return orcid;
+    }
+
+    public void setOrcid(String orcid) {
+        this.orcid = orcid;
+    }
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class<?> getController() {
+        return RestResourceController.class;
+    }
+
+    /**
+     * Inner class to model ORCID synchronization preferences and mode.
+     *
+     * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+     *
+     */
+    public static class OrcidSynchronizationRest {
+
+        private String mode;
+
+        private String publicationsPreference;
+
+        private String fundingsPreference;
+
+        private List<String> profilePreferences;
+
+        public String getMode() {
+            return mode;
+        }
+
+        public void setMode(String mode) {
+            this.mode = mode;
+        }
+
+        public List<String> getProfilePreferences() {
+            return profilePreferences;
+        }
+
+        public void setProfilePreferences(List<String> profilePreferences) {
+            this.profilePreferences = profilePreferences;
+        }
+
+        public String getPublicationsPreference() {
+            return publicationsPreference;
+        }
+
+        public void setPublicationsPreference(String publicationsPreference) {
+            this.publicationsPreference = publicationsPreference;
+        }
+
+        public String getFundingsPreference() {
+            return fundingsPreference;
+        }
+
+        public void setFundingsPreference(String fundingsPreference) {
+            this.fundingsPreference = fundingsPreference;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionFormFieldRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionFormFieldRest.java
index eb724ecbdb..dbf61c06bc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionFormFieldRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionFormFieldRest.java
@@ -83,6 +83,11 @@ public class SubmissionFormFieldRest {
      */
     private List<LanguageFormField> languageCodes;
 
+    /**
+     * The list of type bind value
+     */
+    private List<String> typeBind;
+
     /**
      * Getter for {@link #selectableMetadata}
      * 
@@ -266,6 +271,14 @@ public class SubmissionFormFieldRest {
         }
     }
 
+    public List<String> getTypeBind() {
+        return typeBind;
+    }
+
+    public void setTypeBind(List<String> typeBind) {
+        this.typeBind = typeBind;
+    }
+
     public SelectableRelationship getSelectableRelationship() {
         return selectableRelationship;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/AccessStatusResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/AccessStatusResource.java
new file mode 100644
index 0000000000..c5cd2a5aee
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/AccessStatusResource.java
@@ -0,0 +1,31 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import org.dspace.app.rest.model.AccessStatusRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+
+/**
+ * Access Status Rest HAL Resource. The HAL Resource wraps the REST Resource
+ * adding support for the links and embedded resources
+ */
+@RelNameDSpaceResource(AccessStatusRest.NAME)
+public class AccessStatusResource extends HALResource<AccessStatusRest> {
+
+    @JsonUnwrapped
+    private AccessStatusRest data;
+
+    public AccessStatusResource(AccessStatusRest entry) {
+        super(entry);
+    }
+
+    public AccessStatusRest getData() {
+        return data;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/OrcidHistoryResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/OrcidHistoryResource.java
new file mode 100644
index 0000000000..3708eade69
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/OrcidHistoryResource.java
@@ -0,0 +1,28 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.OrcidHistoryRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * This class serves as a wrapper class to wrap the OrcidHistoryRest into a HAL
+ * resource.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ *
+ */
+@RelNameDSpaceResource(OrcidHistoryRest.NAME)
+public class OrcidHistoryResource extends DSpaceResource<OrcidHistoryRest> {
+
+    public OrcidHistoryResource(OrcidHistoryRest data, Utils utils) {
+        super(data, utils);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/OrcidQueueResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/OrcidQueueResource.java
new file mode 100644
index 0000000000..2c24fe2cc9
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/OrcidQueueResource.java
@@ -0,0 +1,29 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.OrcidQueueRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * This class serves as a wrapper class to wrap the OrcidQueueRest into a HAL
+ * resource.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@RelNameDSpaceResource(OrcidQueueRest.NAME)
+public class OrcidQueueResource extends DSpaceResource<OrcidQueueRest> {
+
+    public OrcidQueueResource(OrcidQueueRest data, Utils utils) {
+        super(data, utils);
+    }
+
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ResearcherProfileResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ResearcherProfileResource.java
new file mode 100644
index 0000000000..3b034c1506
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ResearcherProfileResource.java
@@ -0,0 +1,29 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.ResearcherProfileRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * This class serves as a wrapper class to wrap the SearchConfigurationRest into
+ * a HAL resource.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@RelNameDSpaceResource(ResearcherProfileRest.NAME)
+public class ResearcherProfileResource extends DSpaceResource<ResearcherProfileRest> {
+
+    public ResearcherProfileResource(ResearcherProfileRest data, Utils utils) {
+        super(data, utils);
+    }
+
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/SherpaPolicy.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/SherpaPolicy.java
new file mode 100644
index 0000000000..1f6bd07c2a
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/SherpaPolicy.java
@@ -0,0 +1,48 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model.step;
+
+import java.util.Date;
+
+import org.dspace.app.sherpa.v2.SHERPAResponse;
+
+/**
+ * Java Bean to expose Sherpa policies during in progress submission.
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class SherpaPolicy implements SectionData {
+
+    private static final long serialVersionUID = 2440249335255683173L;
+
+    private Date retrievalTime;
+
+    private SHERPAResponse sherpaResponse;
+
+    public Date getRetrievalTime() {
+        return retrievalTime;
+    }
+
+    public void setRetrievalTime(Date retrievalTime) {
+        this.retrievalTime = retrievalTime;
+    }
+
+    public SHERPAResponse getSherpaResponse() {
+        return sherpaResponse;
+    }
+
+    /**
+     * Setting a sherpaResponse will automatically set the retrievealTime
+     * of the section copying the value from the response if not null
+     */
+    public void setSherpaResponse(SHERPAResponse sherpaResponse) {
+        this.sherpaResponse = sherpaResponse;
+        this.retrievalTime = sherpaResponse.getRetrievalTime();
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/projection/SpecificLevelProjection.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/projection/SpecificLevelProjection.java
index 7ef603b23c..ff32fba7da 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/projection/SpecificLevelProjection.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/projection/SpecificLevelProjection.java
@@ -21,7 +21,7 @@ import org.springframework.hateoas.Link;
  * This Projection will allow us to specify how many levels deep we're going to embed resources onto the requested
  * HalResource.
  * The projection is used by using the name combined with the embedLevelDepth parameter to specify how deep the embeds
- * have to go. There is an upperlimit in place for this, which is specified on the bean through the maxEmbed property
+ * have to go. There is an upper limit in place for this, which is specified on the bean through the maxEmbed property.
  */
 public class SpecificLevelProjection extends AbstractProjection {
 
@@ -55,7 +55,7 @@ public class SpecificLevelProjection extends AbstractProjection {
             throw new MissingParameterException("The embedLevelDepth parameter needs to be specified" +
                                                    " for this Projection");
         }
-        Integer embedLevelDepth = Integer.parseInt(embedLevelDepthString);
+        int embedLevelDepth = Integer.parseInt(embedLevelDepthString);
         if (embedLevelDepth > maxEmbed) {
             throw new IllegalArgumentException("The embedLevelDepth may not exceed the configured max: " + maxEmbed);
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AbstractDSpaceRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AbstractDSpaceRestRepository.java
index f835098d55..0ccfa5249f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AbstractDSpaceRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AbstractDSpaceRestRepository.java
@@ -14,6 +14,7 @@ import org.dspace.core.Context;
 import org.dspace.services.RequestService;
 import org.dspace.utils.DSpace;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 
 /**
  * This is the base class for any Rest Repository. It provides utility method to
@@ -26,6 +27,7 @@ public abstract class AbstractDSpaceRestRepository {
     @Autowired
     protected Utils utils;
 
+    @Lazy
     @Autowired
     protected ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationRestRepository.java
index 05d5a1dde2..97e6866073 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationRestRepository.java
@@ -200,7 +200,7 @@ public class AuthorizationRestRepository extends DSpaceRestRepository<Authorizat
             // restore the real current user
             context.restoreContextUser();
         }
-        return converter.toRestPage(authorizations, null, utils.obtainProjection());
+        return converter.toRestPage(authorizations, pageable, utils.obtainProjection());
     }
 
     private List<Authorization> findAuthorizationsByUUIDList(
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java
index f60178fe52..74aa9f38bf 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java
@@ -136,7 +136,7 @@ public class BrowseItemLinkRepository extends AbstractDSpaceRestRepository
         }
 
         // For second level browses on metadata indexes, we need to adjust the default sorting
-        if (bi != null && bi.isMetadataIndex() && bs.isSecondLevel() && bs.getSortBy() <= 0) {
+        if (bi.isMetadataIndex() && bs.isSecondLevel() && bs.getSortBy() <= 0) {
             bs.setSortBy(1);
         }
 
@@ -144,7 +144,7 @@ public class BrowseItemLinkRepository extends AbstractDSpaceRestRepository
 
         Pageable pageResultInfo =
                 PageRequest.of((binfo.getStart() - 1) / binfo.getResultsPerPage(), binfo.getResultsPerPage());
-        List<Item> tmpResult = new ArrayList<Item>();
+        List<Item> tmpResult = new ArrayList<>();
         for (Item bb : binfo.getBrowseItemResults()) {
             tmpResult.add(bb);
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskRestRepository.java
index 3c0c81a88a..dbd37093a9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskRestRepository.java
@@ -287,7 +287,7 @@ public class ClaimedTaskRestRepository extends DSpaceRestRepository<ClaimedTaskR
     @Override
     public void afterPropertiesSet() throws Exception {
         discoverableEndpointsService.register(this, Arrays.asList(
-                new Link("/api/" + ClaimedTaskRest.CATEGORY + "/" + ClaimedTaskRest.PLURAL_NAME + "/search",
+                Link.of("/api/" + ClaimedTaskRest.CATEGORY + "/" + ClaimedTaskRest.PLURAL_NAME + "/search",
                         ClaimedTaskRest.PLURAL_NAME + "-search")));
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java
index 4a769709d3..ba3163a444 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java
@@ -24,6 +24,7 @@ import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.GroupHasPendingWorkflowTasksException;
 import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.BitstreamRest;
@@ -695,8 +696,8 @@ public class CollectionRestRepository extends DSpaceObjectRestRepository<Collect
         throws SQLException, WorkflowConfigurationException, AuthorizeException, WorkflowException, IOException {
         Group group = workflowService.getWorkflowRoleGroup(context, collection, workflowRole, null);
         if (!poolTaskService.findByGroup(context, group).isEmpty()) {
-            throw new UnprocessableEntityException("The Group that was attempted to be deleted " +
-                                                       "still has Pooltasks open");
+            // todo: also handle claimed tasks that would become associated with this group once returned to the pool
+            throw new GroupHasPendingWorkflowTasksException();
         }
         if (group == null) {
             throw new ResourceNotFoundException("The requested Group was not found");
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
index 5fa86824b1..01f127eca5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
@@ -22,12 +22,15 @@ import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.RESTAuthorizationException;
 import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.RestAddressableModel;
 import org.dspace.app.rest.model.patch.Patch;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.core.Context;
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -45,20 +48,44 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID extends Serializable>
     extends AbstractDSpaceRestRepository
-    implements PagingAndSortingRepository<T, ID> {
+    implements PagingAndSortingRepository<T, ID>, BeanNameAware {
 
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(DSpaceRestRepository.class);
 
-    //Trick to make inner-calls to ourselves that are checked by Spring security
-    //See:
-    // https://stackoverflow.com/questions/13564627/spring-aop-not-working-for-method-call-inside-another-method
-    // https://docs.spring.io/spring/docs/4.3.18.RELEASE/spring-framework-reference/htmlsingle/#aop-understanding-aop-proxies
-    @Autowired
+    private String thisRepositoryBeanName;
     private DSpaceRestRepository<T, ID> thisRepository;
 
+    @Autowired
+    private ApplicationContext applicationContext;
+
     @Autowired
     private MetadataFieldService metadataFieldService;
 
+    /**
+     * From BeanNameAware. Allows us to capture the name of the bean, so we can load it into thisRepository.
+     * See getThisRepository() method.
+     * @param beanName name of ourselves
+     */
+    @Override
+    public void setBeanName(String beanName) {
+        this.thisRepositoryBeanName = beanName;
+    }
+
+    /**
+     * Get access to our current DSpaceRestRepository bean. This is a trick to make inner-calls to ourselves that are
+     * checked by Spring Security
+     * See:
+     * https://stackoverflow.com/questions/13564627/spring-aop-not-working-for-method-call-inside-another-method
+     * https://docs.spring.io/spring-framework/docs/current/reference/html/core.html#aop-understanding-aop-proxies
+     * @return current DSpaceRestRepository
+     */
+    private DSpaceRestRepository<T, ID> getThisRepository() {
+        if (thisRepository == null) {
+            thisRepository = (DSpaceRestRepository<T, ID>) applicationContext.getBean(thisRepositoryBeanName);
+        }
+        return thisRepository;
+    }
+
     @Override
     public <S extends T> S save(S entity) {
         Context context = null;
@@ -108,7 +135,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
      */
     public Optional<T> findById(ID id) {
         Context context = obtainContext();
-        final T object = thisRepository.findOne(context, id);
+        final T object = getThisRepository().findOne(context, id);
         if (object == null) {
             return Optional.empty();
         } else {
@@ -171,7 +198,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
     public void deleteById(ID id) {
         Context context = obtainContext();
         try {
-            thisRepository.delete(context, id);
+            getThisRepository().delete(context, id);
             context.commit();
         } catch (AuthorizeException e) {
             throw new RESTAuthorizationException(e);
@@ -212,6 +239,14 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
 
     }
 
+    @Override
+    /**
+     * Deletes all instances of the type T with the given IDs.
+     */
+    public void deleteAllById(Iterable<? extends ID> ids) {
+        // TODO Auto-generated method stub
+    }
+
     @Override
     /**
      * Method to implement to support bulk delete of ALL entity instances
@@ -235,7 +270,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
      */
     public Page<T> findAll(Pageable pageable) {
         Context context = obtainContext();
-        return thisRepository.findAll(context, pageable);
+        return getThisRepository().findAll(context, pageable);
     }
 
     /**
@@ -263,7 +298,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
         Context context = null;
         try {
             context = obtainContext();
-            T entity = thisRepository.createAndReturn(context);
+            T entity = getThisRepository().createAndReturn(context);
             context.commit();
             return entity;
         } catch (AuthorizeException e) {
@@ -284,7 +319,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
         Context context = null;
         try {
             context = obtainContext();
-            T entity = thisRepository.createAndReturn(context, uuid);
+            T entity = getThisRepository().createAndReturn(context, uuid);
             context.commit();
             return entity;
         } catch (AuthorizeException e) {
@@ -305,7 +340,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
         Context context = null;
         try {
             context = obtainContext();
-            T entity = thisRepository.createAndReturn(context, list);
+            T entity = getThisRepository().createAndReturn(context, list);
             context.commit();
             return entity;
         } catch (AuthorizeException e) {
@@ -406,7 +441,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
         throws UnprocessableEntityException, DSpaceBadRequestException {
         Context context = obtainContext();
         try {
-            thisRepository.patch(context, request, apiCategory, model, id, patch);
+            getThisRepository().patch(context, request, apiCategory, model, id, patch);
             context.commit();
         } catch (AuthorizeException ae) {
             throw new RESTAuthorizationException(ae);
@@ -507,7 +542,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
     public T put(HttpServletRequest request, String apiCategory, String model, ID uuid, JsonNode jsonNode) {
         Context context = obtainContext();
         try {
-            thisRepository.put(context, request, apiCategory, model, uuid, jsonNode);
+            getThisRepository().put(context, request, apiCategory, model, uuid, jsonNode);
             context.commit();
         } catch (SQLException e) {
             throw new RuntimeException("Unable to update DSpace object " + model + " with id=" + uuid, e);
@@ -532,7 +567,7 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
                  List<String> stringList) {
         Context context = obtainContext();
         try {
-            thisRepository.put(context, request, apiCategory, model, id, stringList);
+            getThisRepository().put(context, request, apiCategory, model, id, stringList);
             context.commit();
         } catch (SQLException | AuthorizeException e) {
             throw new RuntimeException(e.getMessage(), e);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java
index 52224ef579..b5aaf3e567 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java
@@ -24,7 +24,7 @@ import org.dspace.app.rest.model.SearchResultsRest;
 import org.dspace.app.rest.model.SearchSupportRest;
 import org.dspace.app.rest.parameter.SearchFilter;
 import org.dspace.app.rest.projection.Projection;
-import org.dspace.app.rest.utils.DiscoverQueryBuilder;
+import org.dspace.app.rest.utils.RestDiscoverQueryBuilder;
 import org.dspace.app.rest.utils.ScopeResolver;
 import org.dspace.core.Context;
 import org.dspace.discovery.DiscoverQuery;
@@ -59,7 +59,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository {
     private ScopeResolver scopeResolver;
 
     @Autowired
-    private DiscoverQueryBuilder queryBuilder;
+    private RestDiscoverQueryBuilder queryBuilder;
 
     @Autowired
     private DiscoverResultConverter discoverResultConverter;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java
index a1cd6dd25f..062f7b7a94 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java
@@ -21,9 +21,9 @@ import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.DiscoverableEndpointsService;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
-import org.dspace.app.rest.authorization.AuthorizationFeatureService;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.EPersonNameNotProvidedException;
+import org.dspace.app.rest.exception.PasswordNotValidException;
 import org.dspace.app.rest.exception.RESTEmptyWorkflowGroupException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.EPersonRest;
@@ -34,7 +34,7 @@ import org.dspace.app.rest.model.patch.Patch;
 import org.dspace.app.util.AuthorizeUtil;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.service.SiteService;
+import org.dspace.authorize.service.ValidatePasswordService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.EmptyWorkflowGroupException;
@@ -74,10 +74,7 @@ public class EPersonRestRepository extends DSpaceObjectRestRepository<EPerson, E
     private AccountService accountService;
 
     @Autowired
-    private AuthorizationFeatureService authorizationFeatureService;
-
-    @Autowired
-    private SiteService siteService;
+    private ValidatePasswordService validatePasswordService;
 
     @Autowired
     private RegistrationDataService registrationDataService;
@@ -129,6 +126,9 @@ public class EPersonRestRepository extends DSpaceObjectRestRepository<EPerson, E
             eperson.setEmail(epersonRest.getEmail());
             eperson.setNetid(epersonRest.getNetid());
             if (epersonRest.getPassword() != null) {
+                if (!validatePasswordService.isPasswordValid(epersonRest.getPassword())) {
+                    throw new PasswordNotValidException();
+                }
                 es.setPassword(eperson, epersonRest.getPassword());
             }
             es.update(context, eperson);
@@ -207,8 +207,8 @@ public class EPersonRestRepository extends DSpaceObjectRestRepository<EPerson, E
             }
         }
         String password = epersonRest.getPassword();
-        if (!accountService.verifyPasswordStructure(password)) {
-            throw new DSpaceBadRequestException("The given password is invalid");
+        if (StringUtils.isBlank(password)) {
+            throw new DSpaceBadRequestException("A password is required");
         }
     }
 
@@ -336,6 +336,6 @@ public class EPersonRestRepository extends DSpaceObjectRestRepository<EPerson, E
     @Override
     public void afterPropertiesSet() throws Exception {
         discoverableEndpointsService.register(this, Arrays.asList(
-                new Link("/api/" + EPersonRest.CATEGORY + "/registrations", EPersonRest.NAME + "-registration")));
+                Link.of("/api/" + EPersonRest.CATEGORY + "/registrations", EPersonRest.NAME + "-registration")));
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemAccessStatusLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemAccessStatusLinkRepository.java
new file mode 100644
index 0000000000..b2660f51e0
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemAccessStatusLinkRepository.java
@@ -0,0 +1,61 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.UUID;
+import javax.annotation.Nullable;
+import javax.servlet.http.HttpServletRequest;
+
+import org.dspace.access.status.service.AccessStatusService;
+import org.dspace.app.rest.model.AccessStatusRest;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for calculating the access status of an Item
+ */
+@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.ACCESS_STATUS)
+public class ItemAccessStatusLinkRepository extends AbstractDSpaceRestRepository
+    implements LinkRestRepository {
+
+    @Autowired
+    ItemService itemService;
+
+    @Autowired
+    AccessStatusService accessStatusService;
+
+    @PreAuthorize("hasPermission(#itemId, 'ITEM', 'READ')")
+    public AccessStatusRest getAccessStatus(@Nullable HttpServletRequest request,
+                                            UUID itemId,
+                                            @Nullable Pageable optionalPageable,
+                                            Projection projection) {
+        try {
+            Context context = obtainContext();
+            Item item = itemService.find(context, itemId);
+            if (item == null) {
+                throw new ResourceNotFoundException("No such item: " + itemId);
+            }
+            AccessStatusRest accessStatusRest = new AccessStatusRest();
+            String accessStatus = accessStatusService.getAccessStatus(context, item);
+            accessStatusRest.setStatus(accessStatus);
+            return accessStatusRest;
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRelationshipLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRelationshipLinkRepository.java
index 3eae86361a..4a282ee466 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRelationshipLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRelationshipLinkRepository.java
@@ -52,10 +52,10 @@ public class ItemRelationshipLinkRepository extends AbstractDSpaceRestRepository
             if (item == null) {
                 throw new ResourceNotFoundException("No such item: " + itemId);
             }
-            int total = relationshipService.countByItem(context, item);
+            int total = relationshipService.countByItem(context, item, true, true);
             Pageable pageable = utils.getPageable(optionalPageable);
             List<Relationship> relationships = relationshipService.findByItem(context, item,
-                    pageable.getPageSize(), Math.toIntExact(pageable.getOffset()), true);
+                    pageable.getPageSize(), Math.toIntExact(pageable.getOffset()), true, true);
             return converter.toRestPage(relationships, pageable, total, projection);
         } catch (SQLException e) {
             throw new RuntimeException(e);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataFieldRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataFieldRestRepository.java
index 177d149fc7..157a80e264 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataFieldRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataFieldRestRepository.java
@@ -18,9 +18,9 @@ import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
@@ -296,9 +296,14 @@ public class MetadataFieldRestRepository extends DSpaceRestRepository<MetadataFi
     protected MetadataFieldRest put(Context context, HttpServletRequest request, String apiCategory, String model,
         Integer id, JsonNode jsonNode) throws SQLException, AuthorizeException {
 
-        MetadataFieldRest metadataFieldRest = new Gson().fromJson(jsonNode.toString(), MetadataFieldRest.class);
+        MetadataFieldRest metadataFieldRest;
+        try {
+            metadataFieldRest = new ObjectMapper().readValue(jsonNode.toString(), MetadataFieldRest.class);
+        } catch (JsonProcessingException e) {
+            throw new UnprocessableEntityException("Cannot parse JSON in request body", e);
+        }
 
-        if (isBlank(metadataFieldRest.getElement())) {
+        if (metadataFieldRest == null || isBlank(metadataFieldRest.getElement())) {
             throw new UnprocessableEntityException("metadata element (in request body) cannot be blank");
         }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataSchemaRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataSchemaRestRepository.java
index 8f29970b18..2865a2f1df 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataSchemaRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataSchemaRestRepository.java
@@ -15,9 +15,9 @@ import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.MetadataSchemaRest;
@@ -138,9 +138,14 @@ public class MetadataSchemaRestRepository extends DSpaceRestRepository<MetadataS
     protected MetadataSchemaRest put(Context context, HttpServletRequest request, String apiCategory, String model,
                                      Integer id, JsonNode jsonNode) throws SQLException, AuthorizeException {
 
-        MetadataSchemaRest metadataSchemaRest = new Gson().fromJson(jsonNode.toString(), MetadataSchemaRest.class);
+        MetadataSchemaRest metadataSchemaRest;
+        try {
+            metadataSchemaRest = new ObjectMapper().readValue(jsonNode.toString(), MetadataSchemaRest.class);
+        } catch (JsonProcessingException e) {
+            throw new UnprocessableEntityException("Cannot parse JSON in request body", e);
+        }
 
-        if (isBlank(metadataSchemaRest.getPrefix())) {
+        if (metadataSchemaRest == null || isBlank(metadataSchemaRest.getPrefix())) {
             throw new UnprocessableEntityException("metadata schema name cannot be blank");
         }
         if (isBlank(metadataSchemaRest.getNamespace())) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
new file mode 100644
index 0000000000..0c44baaf0d
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
@@ -0,0 +1,85 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+
+import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
+import org.dspace.app.rest.model.OrcidHistoryRest;
+import org.dspace.app.rest.repository.handler.service.UriListHandlerService;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository responsible of exposing OrcidHistory resources.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ *
+ */
+@Component(OrcidHistoryRest.CATEGORY  + "." + OrcidHistoryRest.NAME)
+@ConditionalOnProperty("orcid.synchronization-enabled")
+public class OrcidHistoryRestRepository extends DSpaceRestRepository<OrcidHistoryRest, Integer> {
+
+    @Autowired
+    private OrcidHistoryService orcidHistoryService;
+
+    @Autowired
+    private UriListHandlerService uriListHandlerService;
+
+    @Override
+    public Page<OrcidHistoryRest> findAll(Context context, Pageable pageable) {
+        throw new RepositoryMethodNotImplementedException("No implementation found; Method not allowed!", "");
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'ORCID_HISTORY', 'READ')")
+    public OrcidHistoryRest findOne(Context context, Integer id) {
+        OrcidHistory orcidHistory = null;
+        try {
+            orcidHistory = orcidHistoryService.find(context, id);
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        if (orcidHistory == null) {
+            return null;
+        }
+        return converter.toRest(orcidHistory, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#list, 'ORCID_HISTORY', 'ADD')")
+    protected OrcidHistoryRest createAndReturn(Context context, List<String> list)
+           throws AuthorizeException, SQLException, RepositoryMethodNotImplementedException {
+        OrcidHistory orcidHistory = null;
+        HttpServletRequest request = getRequestService().getCurrentRequest().getHttpServletRequest();
+        OrcidQueue orcidQueue = uriListHandlerService.handle(context, request, list, OrcidQueue.class);
+        if (orcidQueue == null) {
+            throw new IllegalArgumentException("No ORCID Queue record found, the uri-list does not contait a resource");
+        }
+        boolean forceAddition =  Boolean.parseBoolean(request.getParameter("forceAddition"));
+        orcidHistory = orcidHistoryService.synchronizeWithOrcid(context, orcidQueue, forceAddition);
+        return orcidHistory != null ? converter.toRest(orcidHistory, utils.obtainProjection()) : null;
+    }
+
+    @Override
+    public Class<OrcidHistoryRest> getDomainClass() {
+        return OrcidHistoryRest.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
new file mode 100644
index 0000000000..0a1614cded
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
@@ -0,0 +1,104 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository;
+
+import static java.lang.Math.toIntExact;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
+import org.dspace.app.rest.model.OrcidQueueRest;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository responsible of exposing Orcid queue resources.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component(OrcidQueueRest.CATEGORY + "." + OrcidQueueRest.NAME)
+@ConditionalOnProperty("orcid.synchronization-enabled")
+public class OrcidQueueRestRepository extends DSpaceRestRepository<OrcidQueueRest, Integer> {
+
+    @Autowired
+    private OrcidQueueService orcidQueueService;
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'ORCID_QUEUE', 'READ')")
+    public OrcidQueueRest findOne(Context context, Integer id) {
+        OrcidQueue orcidQueue = null;
+        try {
+            orcidQueue = orcidQueueService.find(context, id);
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        if (orcidQueue == null) {
+            return null;
+        }
+        return converter.toRest(orcidQueue, utils.obtainProjection());
+    }
+
+    @Override
+    public Page<OrcidQueueRest> findAll(Context context, Pageable pageable) {
+        throw new RepositoryMethodNotImplementedException("No implementation found; Method not allowed!", "");
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'ORCID_QUEUE', 'DELETE')")
+    protected void delete(Context context, Integer id) throws AuthorizeException {
+        OrcidQueue orcidQueue = null;
+        try {
+            orcidQueue = orcidQueueService.find(context, id);
+            if (orcidQueue == null) {
+                throw new ResourceNotFoundException(
+                    OrcidQueueRest.CATEGORY + "." + OrcidQueueRest.NAME + " with id: " + id + " not found");
+            }
+            orcidQueueService.deleteById(context, id);
+        } catch (SQLException e) {
+            throw new RuntimeException("Unable to delete OrcidQueue with id = " + id, e);
+        }
+    }
+
+    @SearchRestMethod(name = "findByProfileItem")
+    @PreAuthorize("hasPermission(#profileItemId, 'ORCID_QUEUE_SEARCH', 'READ')")
+    public Page<OrcidQueueRest> findByProfileItemId(
+        @Parameter(value = "profileItemId", required = true) String profileItemId, Pageable pageable) {
+
+        Context context = obtainContext();
+        try {
+            UUID id = UUID.fromString(profileItemId);
+            List<OrcidQueue> result = orcidQueueService.findByProfileItemId(context, id, pageable.getPageSize(),
+                toIntExact(pageable.getOffset()));
+            long totalCount = orcidQueueService.countByProfileItemId(context, id);
+            return converter.toRestPage(result, pageable, totalCount, utils.obtainProjection());
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+    }
+
+    @Override
+    public Class<OrcidQueueRest> getDomainClass() {
+        return OrcidQueueRest.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskRestRepository.java
index 22ebfe1610..da5253608e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskRestRepository.java
@@ -131,7 +131,7 @@ public class PoolTaskRestRepository extends DSpaceRestRepository<PoolTaskRest, I
     @Override
     public void afterPropertiesSet() throws Exception {
         discoverableEndpointsService.register(this, Arrays.asList(
-                new Link("/api/" + PoolTaskRest.CATEGORY + "/" + PoolTaskRest.PLURAL_NAME + "/search",
+                Link.of("/api/" + PoolTaskRest.CATEGORY + "/" + PoolTaskRest.PLURAL_NAME + "/search",
                         PoolTaskRest.PLURAL_NAME + "-search")));
     }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RegistrationRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RegistrationRestRepository.java
index a158fdfd8c..e6a794392a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RegistrationRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RegistrationRestRepository.java
@@ -7,6 +7,8 @@
  */
 package org.dspace.app.rest.repository;
 
+import static org.dspace.eperson.service.CaptchaService.REGISTER_ACTION;
+
 import java.io.IOException;
 import java.sql.SQLException;
 import javax.mail.MessagingException;
@@ -15,6 +17,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
@@ -26,10 +29,13 @@ import org.dspace.app.util.AuthorizeUtil;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.eperson.InvalidReCaptchaException;
 import org.dspace.eperson.RegistrationData;
 import org.dspace.eperson.service.AccountService;
+import org.dspace.eperson.service.CaptchaService;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.RegistrationDataService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.services.RequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -44,7 +50,7 @@ import org.springframework.stereotype.Component;
 @Component(RegistrationRest.CATEGORY + "." + RegistrationRest.NAME)
 public class RegistrationRestRepository extends DSpaceRestRepository<RegistrationRest, Integer> {
 
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(RegistrationRestRepository.class);
+    private static Logger log = LogManager.getLogger(RegistrationRestRepository.class);
 
     @Autowired
     private EPersonService ePersonService;
@@ -55,6 +61,12 @@ public class RegistrationRestRepository extends DSpaceRestRepository<Registratio
     @Autowired
     private RequestService requestService;
 
+    @Autowired
+    private CaptchaService captchaService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
     @Autowired
     private RegistrationDataService registrationDataService;
 
@@ -73,6 +85,18 @@ public class RegistrationRestRepository extends DSpaceRestRepository<Registratio
         HttpServletRequest request = requestService.getCurrentRequest().getHttpServletRequest();
         ObjectMapper mapper = new ObjectMapper();
         RegistrationRest registrationRest;
+
+        String captchaToken = request.getHeader("X-Recaptcha-Token");
+        boolean verificationEnabled = configurationService.getBooleanProperty("registration.verification.enabled");
+
+        if (verificationEnabled) {
+            try {
+                captchaService.processResponse(captchaToken, REGISTER_ACTION);
+            } catch (InvalidReCaptchaException e) {
+                throw new InvalidReCaptchaException(e.getMessage(), e);
+            }
+        }
+
         try {
             ServletInputStream input = request.getInputStream();
             registrationRest = mapper.readValue(input, RegistrationRest.class);
@@ -142,4 +166,9 @@ public class RegistrationRestRepository extends DSpaceRestRepository<Registratio
         }
         return registrationRest;
     }
+
+    public void setCaptchaService(CaptchaService captchaService) {
+        this.captchaService = captchaService;
+    }
+
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java
index 7f2409163f..21f43ddacd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java
@@ -168,25 +168,21 @@ public class RelationshipRestRepository extends DSpaceRestRepository<Relationshi
         }
         List<DSpaceObject> dSpaceObjects = utils.constructDSpaceObjectList(context, stringList);
         if (dSpaceObjects.size() == 1 && dSpaceObjects.get(0).getType() == Constants.ITEM) {
-
             Item replacementItemInRelationship = (Item) dSpaceObjects.get(0);
-            Item leftItem;
-            Item rightItem;
+            Item newLeftItem;
+            Item newRightItem;
+
             if (itemToReplaceIsRight) {
-                leftItem = relationship.getLeftItem();
-                rightItem = replacementItemInRelationship;
+                newLeftItem = null;
+                newRightItem = replacementItemInRelationship;
             } else {
-                leftItem = replacementItemInRelationship;
-                rightItem = relationship.getRightItem();
+                newLeftItem = replacementItemInRelationship;
+                newRightItem = null;
             }
 
-            if (isAllowedToModifyRelationship(context, relationship, leftItem, rightItem)) {
-                relationship.setLeftItem(leftItem);
-                relationship.setRightItem(rightItem);
-
+            if (isAllowedToModifyRelationship(context, relationship, newLeftItem, newRightItem)) {
                 try {
-                    relationshipService.updatePlaceInRelationship(context, relationship);
-                    relationshipService.update(context, relationship);
+                    relationshipService.move(context, relationship, newLeftItem, newRightItem);
                     context.commit();
                     context.reloadEntity(relationship);
                 } catch (AuthorizeException e) {
@@ -245,15 +241,17 @@ public class RelationshipRestRepository extends DSpaceRestRepository<Relationshi
             relationship.setLeftwardValue(relationshipRest.getLeftwardValue());
             relationship.setRightwardValue(relationshipRest.getRightwardValue());
 
+            Integer newRightPlace = null;
+            Integer newLeftPlace = null;
             if (jsonNode.hasNonNull("rightPlace")) {
-                relationship.setRightPlace(relationshipRest.getRightPlace());
+                newRightPlace = relationshipRest.getRightPlace();
             }
 
             if (jsonNode.hasNonNull("leftPlace")) {
-                relationship.setLeftPlace(relationshipRest.getLeftPlace());
+                newLeftPlace = relationshipRest.getLeftPlace();
             }
 
-            relationshipService.update(context, relationship);
+            relationshipService.move(context, relationship, newLeftPlace, newRightPlace);
             context.commit();
             context.reloadEntity(relationship);
 
@@ -275,10 +273,13 @@ public class RelationshipRestRepository extends DSpaceRestRepository<Relationshi
      */
     private boolean isAllowedToModifyRelationship(Context context, Relationship relationship, Item leftItem,
                                                   Item rightItem) throws SQLException {
-        return (authorizeService.authorizeActionBoolean(context, leftItem, Constants.WRITE) ||
-            authorizeService.authorizeActionBoolean(context, rightItem, Constants.WRITE)) &&
-            (authorizeService.authorizeActionBoolean(context, relationship.getLeftItem(), Constants.WRITE) ||
-                authorizeService.authorizeActionBoolean(context, relationship.getRightItem(), Constants.WRITE)
+        return (
+            // Authorized to write new Items (if specified)
+            (leftItem == null || authorizeService.authorizeActionBoolean(context, leftItem, Constants.WRITE))
+                || (rightItem == null || authorizeService.authorizeActionBoolean(context, rightItem, Constants.WRITE))
+            // Authorized to write old Items
+            && (authorizeService.authorizeActionBoolean(context, relationship.getLeftItem(), Constants.WRITE)
+                || authorizeService.authorizeActionBoolean(context, relationship.getRightItem(), Constants.WRITE))
             );
     }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRelationshipLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRelationshipLinkRepository.java
new file mode 100644
index 0000000000..a6c31d0c16
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRelationshipLinkRepository.java
@@ -0,0 +1,56 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import javax.annotation.Nullable;
+import javax.servlet.http.HttpServletRequest;
+
+import org.dspace.app.rest.model.RelationshipRest;
+import org.dspace.app.rest.model.RelationshipTypeRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.Relationship;
+import org.dspace.content.RelationshipType;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for "relationshipType" subresource of an individual Relationship.
+ */
+@Component(RelationshipRest.CATEGORY + "." + RelationshipRest.NAME + "." + RelationshipRest.RELATIONSHIP_TYPE)
+public class RelationshipTypeRelationshipLinkRepository extends AbstractDSpaceRestRepository
+        implements LinkRestRepository {
+
+    @Autowired
+    RelationshipService relationshipService;
+
+    @PreAuthorize("permitAll()")
+    public RelationshipTypeRest getRelationshipType(@Nullable HttpServletRequest request,
+                                                            Integer relationshipId,
+                                                            @Nullable Pageable optionalPageable,
+                                                            Projection projection) {
+        try {
+            Context context = obtainContext();
+            Relationship relationship = relationshipService.find(context, relationshipId);
+            if (relationship == null) {
+                throw new ResourceNotFoundException("No such relationship: " + relationshipId);
+            }
+            int total = relationshipService.countByRelationshipType(context, relationship.getRelationshipType());
+            Pageable pageable = utils.getPageable(optionalPageable);
+            RelationshipType relationshipType = relationship.getRelationshipType();
+            return converter.toRest(relationshipType, projection);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java
index d013566a2c..82f9ed3318 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java
@@ -15,7 +15,9 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 
@@ -229,14 +231,20 @@ public class RequestItemRepository
         }
 
         // Check for authorized user
-        RequestItemAuthor authorizer;
+        List<RequestItemAuthor> authorizers;
         try {
-            authorizer = requestItemAuthorExtractor.getRequestItemAuthor(context, ri.getItem());
+            authorizers = requestItemAuthorExtractor.getRequestItemAuthor(context, ri.getItem());
         } catch (SQLException ex) {
             LOG.warn("Failed to find an authorizer:  {}", ex.getMessage());
-            authorizer = new RequestItemAuthor("", "");
+            authorizers = Collections.EMPTY_LIST;
         }
-        if (!authorizer.getEmail().equals(context.getCurrentUser().getEmail())) {
+
+        boolean authorized = false;
+        String requester = context.getCurrentUser().getEmail();
+        for (RequestItemAuthor authorizer : authorizers) {
+            authorized |= authorizer.getEmail().equals(requester);
+        }
+        if (!authorized) {
             throw new AuthorizeException("Not authorized to approve this request");
         }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
new file mode 100644
index 0000000000..92bbf6996d
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
@@ -0,0 +1,78 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.UUID;
+import javax.annotation.Nullable;
+import javax.servlet.http.HttpServletRequest;
+
+import org.dspace.app.rest.model.EPersonRest;
+import org.dspace.app.rest.model.ResearcherProfileRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for "ePerson" subresource of an individual researcher
+ * profile.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.NAME + "." + ResearcherProfileRest.EPERSON)
+public class ResearcherProfileEPersonLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
+
+    @Autowired
+    private EPersonService ePersonService;
+
+    @Autowired
+    private ResearcherProfileService researcherProfileService;
+
+    /**
+     * Returns the ePerson related to the Research profile with the given UUID.
+     *
+     * @param request    the http servlet request
+     * @param id         the profile UUID
+     * @param pageable   the optional pageable
+     * @param projection the projection object
+     * @return the ePerson rest representation
+     */
+    @PreAuthorize("hasPermission(#id, 'EPERSON', 'READ')")
+    public EPersonRest getEPerson(@Nullable HttpServletRequest request, UUID id,
+        @Nullable Pageable pageable, Projection projection) {
+
+        try {
+            Context context = obtainContext();
+
+            ResearcherProfile profile = researcherProfileService.findById(context, id);
+            if (profile == null) {
+                throw new ResourceNotFoundException("No such profile with UUID: " + id);
+            }
+
+            EPerson ePerson = ePersonService.find(context, id);
+            if (ePerson == null) {
+                throw new ResourceNotFoundException("No such eperson related to a profile with EPerson UUID: " + id);
+            }
+
+            return converter.toRest(ePerson, projection);
+        } catch (SQLException | AuthorizeException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
new file mode 100644
index 0000000000..5f212b966f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
@@ -0,0 +1,67 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.UUID;
+import javax.annotation.Nullable;
+import javax.servlet.http.HttpServletRequest;
+
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.model.ResearcherProfileRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for "item" subresource of an individual researcher profile.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.NAME + "." + ResearcherProfileRest.ITEM)
+public class ResearcherProfileItemLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
+
+    @Autowired
+    private ResearcherProfileService researcherProfileService;
+
+    /**
+     * Returns the item related to the Research profile with the given UUID.
+     *
+     * @param request    the http servlet request
+     * @param id         the profile UUID
+     * @param pageable   the optional pageable
+     * @param projection the projection object
+     * @return the item rest representation
+     */
+    @PreAuthorize("hasPermission(#id, 'PROFILE', 'READ')")
+    public ItemRest getItem(@Nullable HttpServletRequest request, UUID id,
+        @Nullable Pageable pageable, Projection projection) {
+
+        try {
+            Context context = obtainContext();
+
+            ResearcherProfile profile = researcherProfileService.findById(context, id);
+            if (profile == null) {
+                throw new ResourceNotFoundException("No such item related to a profile with EPerson UUID: " + id);
+            }
+
+            return converter.toRest(profile.getItem(), projection);
+        } catch (SQLException | AuthorizeException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
new file mode 100644
index 0000000000..37717f6268
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
@@ -0,0 +1,192 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository;
+
+import java.net.URI;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.ResearcherProfileRest;
+import org.dspace.app.rest.model.patch.Patch;
+import org.dspace.app.rest.repository.patch.ResourcePatch;
+import org.dspace.app.rest.security.DSpacePermissionEvaluator;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.dspace.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository responsible of exposing researcher profiles.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.NAME)
+@ConditionalOnProperty(value = "researcher-profile.entity-type")
+public class ResearcherProfileRestRepository extends DSpaceRestRepository<ResearcherProfileRest, UUID> {
+
+    public static final String NO_VISIBILITY_CHANGE_MSG = "Refused to perform the Researcher Profile patch based "
+        + "on a token without changing the visibility";
+
+    @Autowired
+    private ResearcherProfileService researcherProfileService;
+
+    @Autowired
+    private DSpacePermissionEvaluator permissionEvaluator;
+
+    @Autowired
+    private EPersonService ePersonService;
+
+    @Autowired
+    private ResourcePatch<ResearcherProfile> resourcePatch;
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'PROFILE', 'READ')")
+    public ResearcherProfileRest findOne(Context context, UUID id) {
+        try {
+            ResearcherProfile profile = researcherProfileService.findById(context, id);
+            if (profile == null) {
+                return null;
+            }
+            return converter.toRest(profile, utils.obtainProjection());
+        } catch (SQLException | AuthorizeException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Create a new researcher profile from scratch.
+     */
+    @Override
+    @PreAuthorize("isAuthenticated()")
+    protected ResearcherProfileRest createAndReturn(Context context) throws AuthorizeException, SQLException {
+
+        UUID id = getEPersonIdFromRequest(context);
+        if (isNotAuthorized(id, "WRITE")) {
+            throw new AuthorizeException("User unauthorized to create a new profile for user " + id);
+        }
+
+        EPerson ePerson = ePersonService.find(context, id);
+        if (ePerson == null) {
+            throw new UnprocessableEntityException("No EPerson exists with id: " + id);
+        }
+
+        try {
+            ResearcherProfile newProfile = researcherProfileService.createAndReturn(context, ePerson);
+            return converter.toRest(newProfile, utils.obtainProjection());
+        } catch (SearchServiceException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+    }
+
+    /**
+     * Create a new researcher profile claiming an already existing item.
+     */
+    @Override
+    protected ResearcherProfileRest createAndReturn(final Context context, final List<String> list)
+        throws AuthorizeException, SQLException, RepositoryMethodNotImplementedException {
+        if (CollectionUtils.isEmpty(list) || list.size() > 1) {
+            throw new IllegalArgumentException("Uri list must contain exactly one element");
+        }
+
+
+        UUID id = getEPersonIdFromRequest(context);
+        if (isNotAuthorized(id, "WRITE")) {
+            throw new AuthorizeException("User unauthorized to create a new profile for user " + id);
+        }
+
+        EPerson ePerson = ePersonService.find(context, id);
+        if (ePerson == null) {
+            throw new UnprocessableEntityException("No EPerson exists with id: " + id);
+        }
+
+        try {
+            ResearcherProfile newProfile = researcherProfileService
+                                               .claim(context, ePerson, URI.create(list.get(0)));
+            return converter.toRest(newProfile, utils.obtainProjection());
+        } catch (SearchServiceException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public Page<ResearcherProfileRest> findAll(Context context, Pageable pageable) {
+        throw new RepositoryMethodNotImplementedException("No implementation found; Method not allowed!", "");
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'PROFILE', 'DELETE')")
+    protected void delete(Context context, UUID id) {
+        try {
+            researcherProfileService.deleteById(context, id);
+        } catch (SQLException | AuthorizeException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'PROFILE', #patch)")
+    protected void patch(Context context, HttpServletRequest request, String apiCategory, String model,
+        UUID id, Patch patch) throws SQLException, AuthorizeException {
+
+        ResearcherProfile profile = researcherProfileService.findById(context, id);
+        if (profile == null) {
+            throw new ResourceNotFoundException(apiCategory + "." + model + " with id: " + id + " not found");
+        }
+
+        resourcePatch.patch(context, profile, patch.getOperations());
+
+    }
+
+    @Override
+    public Class<ResearcherProfileRest> getDomainClass() {
+        return ResearcherProfileRest.class;
+    }
+
+
+    private UUID getEPersonIdFromRequest(Context context) {
+        HttpServletRequest request = getRequestService().getCurrentRequest().getHttpServletRequest();
+
+        String ePersonId = request.getParameter("eperson");
+        if (ePersonId == null) {
+            return context.getCurrentUser().getID();
+        }
+
+        UUID uuid = UUIDUtils.fromString(ePersonId);
+        if (uuid == null) {
+            throw new DSpaceBadRequestException("The provided eperson parameter is not a valid uuid");
+        }
+        return uuid;
+    }
+
+    private boolean isNotAuthorized(UUID id, String permission) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        return !permissionEvaluator.hasPermission(authentication, id, "PROFILE", permission);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResourcePolicyRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResourcePolicyRestRepository.java
index 7e0f3c2458..0b77f96b9b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResourcePolicyRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResourcePolicyRestRepository.java
@@ -324,7 +324,7 @@ public class ResourcePolicyRestRepository extends DSpaceRestRepository<ResourceP
     @Override
     public void afterPropertiesSet() throws Exception {
         discoverableEndpointsService.register(this, Arrays.asList(
-                      new Link("/api/" + ResourcePolicyRest.CATEGORY + "/" + ResourcePolicyRest.PLURAL_NAME + "/search",
+                      Link.of("/api/" + ResourcePolicyRest.CATEGORY + "/" + ResourcePolicyRest.PLURAL_NAME + "/search",
                                          ResourcePolicyRest.PLURAL_NAME + "-search")));
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java
index eb2afc0e54..13d5a560dc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -109,7 +110,8 @@ public class ScriptRestRepository extends DSpaceRestRepository<ScriptRest, Strin
             throw new AuthorizeException("Current user is not eligible to execute script with name: " + scriptName);
         }
         RestDSpaceRunnableHandler restDSpaceRunnableHandler = new RestDSpaceRunnableHandler(
-            context.getCurrentUser(), scriptToExecute.getName(), dSpaceCommandLineParameters);
+            context.getCurrentUser(), scriptToExecute.getName(), dSpaceCommandLineParameters,
+            new HashSet<>(context.getSpecialGroups()));
         List<String> args = constructArgs(dSpaceCommandLineParameters);
         runDSpaceScript(files, context, scriptToExecute, restDSpaceRunnableHandler, args);
         return converter.toRest(restDSpaceRunnableHandler.getProcess(context), utils.obtainProjection());
@@ -147,8 +149,10 @@ public class ScriptRestRepository extends DSpaceRestRepository<ScriptRest, Strin
         DSpaceRunnable dSpaceRunnable = scriptService.createDSpaceRunnableForScriptConfiguration(scriptToExecute);
         try {
             dSpaceRunnable.initialize(args.toArray(new String[0]), restDSpaceRunnableHandler, context.getCurrentUser());
-            checkFileNames(dSpaceRunnable, files);
-            processFiles(context, restDSpaceRunnableHandler, files);
+            if (files != null && !files.isEmpty()) {
+                checkFileNames(dSpaceRunnable, files);
+                processFiles(context, restDSpaceRunnableHandler, files);
+            }
             restDSpaceRunnableHandler.schedule(dSpaceRunnable);
         } catch (ParseException e) {
             dSpaceRunnable.printHelp();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCCLicenseRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCCLicenseRestRepository.java
index 0dab42f9bd..356b3f22bf 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCCLicenseRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCCLicenseRestRepository.java
@@ -8,11 +8,14 @@
 package org.dspace.app.rest.repository;
 
 import java.util.List;
+import java.util.Locale;
 
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.model.SubmissionCCLicenseRest;
 import org.dspace.core.Context;
 import org.dspace.license.CCLicense;
 import org.dspace.license.service.CreativeCommonsService;
+import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -29,10 +32,23 @@ public class SubmissionCCLicenseRestRepository extends DSpaceRestRepository<Subm
     @Autowired
     protected CreativeCommonsService creativeCommonsService;
 
+    @Autowired
+    protected ConfigurationService configurationService;
+
     @Override
     @PreAuthorize("hasAuthority('AUTHENTICATED')")
     public SubmissionCCLicenseRest findOne(final Context context, final String licenseId) {
-        CCLicense ccLicense = creativeCommonsService.findOne(licenseId);
+
+        String defaultCCLocale = configurationService.getProperty("cc.license.locale");
+
+        Locale currentLocale = context.getCurrentLocale();
+        CCLicense  ccLicense;
+        // when no default CC locale is defined, current locale is used
+        if (currentLocale != null && StringUtils.isBlank(defaultCCLocale)) {
+            ccLicense = creativeCommonsService.findOne(licenseId, currentLocale.toString());
+        } else {
+            ccLicense = creativeCommonsService.findOne(licenseId);
+        }
         if (ccLicense == null) {
             throw new ResourceNotFoundException("No CC license could be found for ID: " + licenseId );
         }
@@ -43,7 +59,16 @@ public class SubmissionCCLicenseRestRepository extends DSpaceRestRepository<Subm
     @PreAuthorize("hasAuthority('AUTHENTICATED')")
     public Page<SubmissionCCLicenseRest> findAll(final Context context, final Pageable pageable) {
 
-        List<CCLicense> allCCLicenses = creativeCommonsService.findAllCCLicenses();
+        String defaultCCLocale = configurationService.getProperty("cc.license.locale");
+
+        Locale currentLocale = context.getCurrentLocale();
+        List<CCLicense> allCCLicenses;
+        // when no default CC locale is defined, current locale is used
+        if (currentLocale != null && StringUtils.isBlank(defaultCCLocale)) {
+            allCCLicenses = creativeCommonsService.findAllCCLicenses(currentLocale.toString());
+        } else {
+            allCCLicenses = creativeCommonsService.findAllCCLicenses();
+        }
         return converter.toRestPage(allCCLicenses, pageable, utils.obtainProjection());
     }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionRestRepository.java
index 9a7de903e2..585fc1de9f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionRestRepository.java
@@ -110,21 +110,13 @@ public class VersionRestRepository extends DSpaceRestRepository<VersionRest, Int
             throw new UnprocessableEntityException("The given URI list could not be properly parsed to one result");
         }
 
-        boolean hasEntityType = StringUtils.isNotBlank(itemService.
-                                getMetadataFirstValue(item, "dspace", "entity", "type", Item.ANY));
-        boolean isBlockEntity = configurationService.getBooleanProperty("versioning.block.entity", true);
-
         EPerson submitter = item.getSubmitter();
-        boolean isAdmin = authorizeService.isAdmin(context);
+        boolean isAdmin = authorizeService.isAdmin(context, item);
         boolean canCreateVersion = configurationService.getBooleanProperty("versioning.submitterCanCreateNewVersion");
 
         if (!isAdmin && !(canCreateVersion && Objects.equals(submitter, context.getCurrentUser()))) {
             throw new AuthorizeException("The logged user doesn't have the rights to create a new version.");
         }
-        if (hasEntityType  && isBlockEntity) {
-            throw new AuthorizeException("You are trying to create a new version for an entity" +
-                                         " which is blocked by the configuration");
-        }
 
         WorkflowItem workflowItem = null;
         WorkspaceItem workspaceItem = null;
@@ -204,4 +196,4 @@ public class VersionRestRepository extends DSpaceRestRepository<VersionRest, Int
         return Integer.class;
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ViewEventRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ViewEventRestRepository.java
index 2cefd4eedb..e4214a4c92 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ViewEventRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ViewEventRestRepository.java
@@ -37,7 +37,7 @@ public class ViewEventRestRepository extends AbstractDSpaceRestRepository {
     @Autowired
     private EventService eventService;
 
-    private List<String> typeList = Arrays.asList(Constants.typeText);
+    private final List<String> typeList = Arrays.asList(Constants.typeText);
 
     public ViewEventRest createViewEvent() throws AuthorizeException, SQLException {
 
@@ -54,7 +54,7 @@ public class ViewEventRestRepository extends AbstractDSpaceRestRepository {
         if (viewEventRest.getTargetId() == null || StringUtils.isBlank(viewEventRest.getTargetType()) ||
             !typeList.contains(viewEventRest.getTargetType().toUpperCase())) {
             throw new DSpaceBadRequestException("The given ViewEvent was invalid, one or more properties are either" +
-                                                    "wrong or missing");
+                                                    " wrong or missing");
         }
         DSpaceObjectService dSpaceObjectService = ContentServiceFactory.getInstance().getDSpaceObjectService(
             Constants.getTypeID(viewEventRest.getTargetType().toUpperCase(Locale.getDefault())));
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsRestRepository.java
index c206721361..bc7c60d62b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsRestRepository.java
@@ -56,7 +56,7 @@ public class VocabularyEntryDetailsRestRepository extends DSpaceRestRepository<V
     @Override
     public void afterPropertiesSet() throws Exception {
         discoverableEndpointsService.register(this, Arrays.asList(
-                new Link("/api/" + VocabularyRest.CATEGORY + "/" + VocabularyEntryDetailsRest.PLURAL_NAME + "/search",
+                Link.of("/api/" + VocabularyRest.CATEGORY + "/" + VocabularyEntryDetailsRest.PLURAL_NAME + "/search",
                         VocabularyEntryDetailsRest.PLURAL_NAME + "-search")));
     }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
new file mode 100644
index 0000000000..0965058449
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
@@ -0,0 +1,75 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.handler;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.servlet.http.HttpServletRequest;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class extends the {@link ExternalSourceEntryItemUriListHandler} abstract class and implements it specifically
+ * for the List<OrcidQueue> objects.
+ * 
+ * @author mykhaylo boychuk (mykhaylo.boychuk at 4science.it)
+ */
+@Component
+public class ExternalSourceEntryOrcidQueueUriListHandler
+    extends ExternalSourceEntryItemUriListHandler<OrcidQueue> {
+
+    @Autowired
+    private OrcidQueueService orcidQueueService;
+
+    @Override
+    public boolean supports(List<String> uriList, String method, Class clazz) {
+        if (clazz != OrcidQueue.class) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean validate(Context context, HttpServletRequest request, List<String> uriList)
+        throws AuthorizeException {
+        if (uriList.size() > 1) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public OrcidQueue handle(Context context, HttpServletRequest request, List<String> uriList)
+        throws SQLException, AuthorizeException {
+        return getObjectFromUriList(context, uriList);
+    }
+
+    private OrcidQueue getObjectFromUriList(Context context, List<String> uriList) {
+        OrcidQueue orcidQueue = null;
+        String url = uriList.get(0);
+        Pattern pattern = Pattern.compile("\\/api\\/eperson\\/orcidqueues\\/(.*)");
+        Matcher matcher = pattern.matcher(url);
+
+        matcher.find();
+        String id = matcher.group(1);
+        int queueId = Integer.parseInt(id);
+        try {
+            orcidQueue = orcidQueueService.find(context, queueId);
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        return orcidQueue;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/service/UriListHandlerService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/service/UriListHandlerService.java
index 30887fd4b1..5366428b1c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/service/UriListHandlerService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/service/UriListHandlerService.java
@@ -11,6 +11,8 @@ import java.sql.SQLException;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.repository.handler.UriListHandler;
 import org.dspace.authorize.AuthorizeException;
@@ -18,6 +20,7 @@ import org.dspace.core.Context;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+
 /**
  * This class is a wrapper Service class for the {@link UriListHandler} objects. It will find the right one and try to
  * execute it for the given arguments
@@ -25,6 +28,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class UriListHandlerService {
 
+    private final static Logger log = LogManager.getLogger();
+
     @Autowired
     private List<UriListHandler> uriListHandlers;
 
@@ -60,4 +65,5 @@ public class UriListHandlerService {
 
         throw new DSpaceBadRequestException("No UriListHandler was found that supports the inputs given");
     }
-}
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/EPersonPasswordAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/EPersonPasswordAddOperation.java
index a4f2614dfa..e130969014 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/EPersonPasswordAddOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/EPersonPasswordAddOperation.java
@@ -8,13 +8,21 @@
 package org.dspace.app.rest.repository.patch.operation;
 
 import java.sql.SQLException;
+import java.util.Optional;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.PasswordNotValidException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.exception.WrongCurrentPasswordException;
+import org.dspace.app.rest.model.patch.JsonValueEvaluator;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.util.AuthorizeUtil;
+import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.service.ValidatePasswordService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.factory.EPersonServiceFactory;
@@ -26,13 +34,14 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation for EPerson password patches. This Add Operation will add a new password the an eperson if it had
- * no password before, or will replace the existing password with the new value.
+ * Implementation for EPerson password patches. This Add Operation will add a
+ * new password the an eperson if it had no password before, or will replace the
+ * existing password with the new value.
  *
  * Example: <code>
  * curl -X PATCH http://${dspace.server.url}/api/epersons/eperson/<:id-eperson> -H "
  * Content-Type: application/json" -d '[{ "op": "add", "path": "
- * /password", "value": "newpassword"]'
+ * /password", "value": {"new_password": "newpassword", "current_password": "currentpassword"}]'
  * </code>
  */
 @Component
@@ -53,24 +62,58 @@ public class EPersonPasswordAddOperation<R> extends PatchOperation<R> {
     @Autowired
     private AccountService accountService;
 
+    @Autowired
+    private ValidatePasswordService validatePasswordService;
+
+    @Autowired
+    private AuthenticationService authenticationService;
+
     @Override
     public R perform(Context context, R object, Operation operation) {
-        checkOperationValue(operation.getValue());
-        if (supports(object, operation)) {
-            EPerson eperson = (EPerson) object;
-            if (!AuthorizeUtil.authorizeUpdatePassword(context, eperson.getEmail())) {
-                throw new DSpaceBadRequestException("Password cannot be updated for the given EPerson with email: " +
-                                                        eperson.getEmail());
-            }
-            String token = requestService.getCurrentRequest().getHttpServletRequest().getParameter("token");
-            if (StringUtils.isNotBlank(token)) {
-                verifyAndDeleteToken(context, eperson, token, operation);
-            }
-            ePersonService.setPassword(eperson, (String) operation.getValue());
-            return object;
-        } else {
+
+        if (!supports(object, operation)) {
             throw new DSpaceBadRequestException(this.getClass().getName() + " does not support this operation");
         }
+
+        PasswordVO passwordVO = parseOperationValue(operation);
+
+        String newPassword = passwordVO.getNewPassword()
+            .orElseThrow(() -> new DSpaceBadRequestException("No password provided"));
+
+        EPerson eperson = (EPerson) object;
+        if (!AuthorizeUtil.authorizeUpdatePassword(context, eperson.getEmail())) {
+            throw new DSpaceBadRequestException("Password cannot be updated for the given EPerson with email: " +
+                                                    eperson.getEmail());
+        }
+
+        if (!validatePasswordService.isPasswordValid(newPassword)) {
+            throw new PasswordNotValidException();
+        }
+
+        String token = requestService.getCurrentRequest().getHttpServletRequest().getParameter("token");
+        if (StringUtils.isNotBlank(token)) {
+            verifyAndDeleteToken(context, eperson, token, operation);
+        } else if (eperson.hasPasswordSet()) {
+            verifyCurrentPassword(context, eperson, passwordVO);
+        }
+
+        ePersonService.setPassword(eperson, newPassword);
+
+        return object;
+    }
+
+    private PasswordVO parseOperationValue(Operation operation) {
+
+        if (operation.getValue() == null) {
+            throw new UnprocessableEntityException("No value provided for operation " + operation.getPath());
+        }
+
+        try {
+            return (PasswordVO) ((JsonValueEvaluator) operation.getValue()).evaluate(PasswordVO.class);
+        } catch (Exception ex) {
+            throw new UnprocessableEntityException("Invalid value provided for operation " + operation.getPath(), ex);
+        }
+
     }
 
     private void verifyAndDeleteToken(Context context, EPerson eperson, String token, Operation operation) {
@@ -91,9 +134,54 @@ public class EPersonPasswordAddOperation<R> extends PatchOperation<R> {
         }
     }
 
+    private void verifyCurrentPassword(Context context, EPerson eperson, PasswordVO passwordVO) {
+
+        String currentPassword = passwordVO.getCurrentPassword()
+            .orElseThrow(() -> new WrongCurrentPasswordException("No current password provided"));
+
+        boolean canChangePassword = authenticationService.canChangePassword(context, eperson, currentPassword);
+        if (!canChangePassword) {
+            throw new WrongCurrentPasswordException("The provided password is wrong");
+        }
+
+    }
+
     @Override
     public boolean supports(Object objectToMatch, Operation operation) {
         return (objectToMatch instanceof EPerson && operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD)
                 && operation.getPath().trim().equalsIgnoreCase(OPERATION_PASSWORD_CHANGE));
     }
+
+    /**
+     * Value object that stores the new password to set and the current password to
+     * verify. This object models the value of the operation.
+     *
+     * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+     *
+     */
+    public static class PasswordVO {
+
+        @JsonProperty("new_password")
+        private String newPassword;
+
+        @JsonProperty("current_password")
+        private String currentPassword;
+
+        public Optional<String> getNewPassword() {
+            return Optional.ofNullable(newPassword);
+        }
+
+        public void setNewPassword(String newPassword) {
+            this.newPassword = newPassword;
+        }
+
+        public Optional<String> getCurrentPassword() {
+            return Optional.ofNullable(currentPassword);
+        }
+
+        public void setCurrentPassword(String currentPassword) {
+            this.currentPassword = currentPassword;
+        }
+
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileAddOrcidOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileAddOrcidOperation.java
new file mode 100644
index 0000000000..976d057915
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileAddOrcidOperation.java
@@ -0,0 +1,85 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.patch.operation;
+
+import java.sql.SQLException;
+
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.core.Context;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.ResearcherProfile;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation of the PATCH operation used to establish the ORCID connection.
+ *
+ * Example: <code><br/>
+ * curl -X PATCH http://${dspace.server.url}/api/eperson/profiles/<:id-eperson> -H "
+ * Content-Type: application/json" -d '[{ "op": "add", "path": "/orcid", value: "code" }]'
+ * </code> <br/>
+ * The value to be provided is the authorization code for an ORCID iD and
+ * 3-legged access token.
+ */
+@Component
+public class ResearcherProfileAddOrcidOperation extends PatchOperation<ResearcherProfile> {
+
+    private static final String OPERATION_ORCID = "/orcid";
+
+    @Autowired
+    private OrcidClient orcidClient;
+
+    @Autowired
+    private OrcidSynchronizationService orcidSynchronizationService;
+
+    @Override
+    public ResearcherProfile perform(Context context, ResearcherProfile profile, Operation operation)
+        throws SQLException {
+
+        Object code = operation.getValue();
+        if (code == null | !(code instanceof String)) {
+            throw new UnprocessableEntityException("The /code value must be a string");
+        }
+
+        OrcidTokenResponseDTO accessToken = getAccessToken((String) code);
+
+        orcidSynchronizationService.linkProfile(context, profile.getItem(), accessToken);
+
+        return profile;
+    }
+
+    private OrcidTokenResponseDTO getAccessToken(String code) {
+        try {
+            return orcidClient.getAccessToken((String) code);
+        } catch (OrcidClientException ex) {
+
+            if (ex.isInvalidGrantException()) {
+                throw new UnprocessableEntityException("The provided ORCID authorization code is not valid", ex);
+            }
+
+            throw ex;
+
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return objectToMatch instanceof ResearcherProfile
+            && operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD)
+            && operation.getPath().trim().toLowerCase().startsWith(OPERATION_ORCID);
+    }
+
+    public void setOrcidClient(OrcidClient orcidClient) {
+        this.orcidClient = orcidClient;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileRemoveOrcidOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileRemoveOrcidOperation.java
new file mode 100644
index 0000000000..992ad6afb2
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileRemoveOrcidOperation.java
@@ -0,0 +1,106 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.patch.operation;
+
+import static org.dspace.profile.OrcidProfileDisconnectionMode.ADMIN_AND_OWNER;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.DISABLED;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.ONLY_ADMIN;
+import static org.dspace.profile.OrcidProfileDisconnectionMode.ONLY_OWNER;
+
+import java.sql.SQLException;
+
+import org.dspace.app.rest.exception.RESTAuthorizationException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.OrcidProfileDisconnectionMode;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for ResearcherProfile ORCID disconnection.
+ *
+ * Example: <code><br/>
+ * curl -X PATCH http://${dspace.server.url}/api/eperson/profiles/<:id-eperson> -H "
+ * Content-Type: application/json" -d '[{ "op": "remove", "path": "/orcid" }]'
+ * </code>
+ */
+@Component
+public class ResearcherProfileRemoveOrcidOperation extends PatchOperation<ResearcherProfile> {
+
+    private static final String OPERATION_ORCID = "/orcid";
+
+    @Autowired
+    private ResearcherProfileService profileService;
+
+    @Autowired
+    private OrcidSynchronizationService synchronizationService;
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    @Override
+    public ResearcherProfile perform(Context context, ResearcherProfile profile, Operation operation)
+        throws SQLException {
+
+        checkProfileDisconnectionPermissions(context, profile);
+
+        synchronizationService.unlinkProfile(context, profile.getItem());
+
+        try {
+            return profileService.findById(context, profile.getId());
+        } catch (AuthorizeException e) {
+            throw new RESTAuthorizationException(e);
+        }
+
+    }
+
+    private void checkProfileDisconnectionPermissions(Context context, ResearcherProfile profile) throws SQLException {
+
+        OrcidProfileDisconnectionMode mode = synchronizationService.getDisconnectionMode();
+
+        if (mode == ADMIN_AND_OWNER) {
+            return;
+        }
+
+        if (mode == DISABLED) {
+            throw new RESTAuthorizationException("Profile disconnection from ORCID is disabled");
+        }
+
+        if (mode == ONLY_OWNER && isNotOwner(context, profile)) {
+            throw new RESTAuthorizationException("Only the profile's owner can perform the ORCID disconnection");
+        }
+
+        if (mode == ONLY_ADMIN && isNotAdmin(context)) {
+            throw new RESTAuthorizationException("Only admins can perform the profile disconnection from ORCID");
+        }
+
+    }
+
+    private boolean isNotAdmin(Context context) throws SQLException {
+        return !authorizeService.isAdmin(context);
+    }
+
+    private boolean isNotOwner(Context context, ResearcherProfile profile) {
+        EPerson currentUser = context.getCurrentUser();
+        return currentUser == null || !currentUser.getID().equals(profile.getId());
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return objectToMatch instanceof ResearcherProfile
+            && operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE)
+            && operation.getPath().trim().toLowerCase().startsWith(OPERATION_ORCID);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileReplaceOrcidSyncPreferencesOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileReplaceOrcidSyncPreferencesOperation.java
new file mode 100644
index 0000000000..5084931382
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileReplaceOrcidSyncPreferencesOperation.java
@@ -0,0 +1,188 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.patch.operation;
+
+import static org.dspace.orcid.model.OrcidEntityType.FUNDING;
+import static org.dspace.orcid.model.OrcidEntityType.PUBLICATION;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.exception.RESTAuthorizationException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.orcid.model.OrcidEntityType;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidSynchronizationService;
+import org.dspace.profile.OrcidEntitySyncPreference;
+import org.dspace.profile.OrcidProfileSyncPreference;
+import org.dspace.profile.OrcidSynchronizationMode;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for ResearcherProfile ORCID synchronization preferences
+ * patches.
+ *
+ * Example:
+ * <code> curl -X PATCH http://${dspace.server.url}/api/eperson/profiles/<:id-eperson> -H "
+ * Content-Type: application/json" -d '[{
+ *  "op": "replace",
+ *  "path": "/orcid/publications",
+ *  "value": "ALL"
+ *  }]'
+ * </code>
+ */
+@Component
+public class ResearcherProfileReplaceOrcidSyncPreferencesOperation extends PatchOperation<ResearcherProfile> {
+
+    private static final String OPERATION_ORCID_SYNCH = "/orcid";
+
+    private static final String PUBLICATIONS_PREFERENCES = "/publications";
+
+    private static final String FUNDINGS_PREFERENCES = "/fundings";
+
+    private static final String PROFILE_PREFERENCES = "/profile";
+
+    private static final String MODE_PREFERENCES = "/mode";
+
+    @Autowired
+    private ResearcherProfileService profileService;
+
+    @Autowired
+    private OrcidSynchronizationService synchronizationService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private OrcidQueueService orcidQueueService;
+
+    @Override
+    public ResearcherProfile perform(Context context, ResearcherProfile profile, Operation operation)
+        throws SQLException {
+
+        String path = StringUtils.removeStart(operation.getPath(), OPERATION_ORCID_SYNCH);
+        String value = getNewValueFromOperation(operation);
+
+        Item profileItem = profile.getItem();
+
+        // Permission check already performed on patch endpoint invocation
+        context.turnOffAuthorisationSystem();
+
+        try {
+
+            boolean updated = updatePreferences(context, path, value, profileItem);
+
+            if (updated) {
+                reloadOrcidQueue(context, path, value, profileItem);
+            }
+
+            return profileService.findById(context, profile.getId());
+
+        } catch (AuthorizeException e) {
+            throw new RESTAuthorizationException(e);
+        } finally {
+            context.restoreAuthSystemState();
+        }
+
+    }
+
+    private String getNewValueFromOperation(Operation operation) {
+        Object valueObject = operation.getValue();
+        if (valueObject == null | !(valueObject instanceof String)) {
+            throw new UnprocessableEntityException("The /orcid value must be a string");
+        }
+        return (String) valueObject;
+    }
+
+    /**
+     * Update the ORCID synchronization preference related to the given path.
+     * Returns true if the value has actually been updated, false if the value to be
+     * set is the same as the one already configured.
+     */
+    private boolean updatePreferences(Context context, String path, String value, Item profileItem)
+        throws SQLException {
+        switch (path) {
+            case PUBLICATIONS_PREFERENCES:
+                OrcidEntitySyncPreference preference = parsePreference(value);
+                return synchronizationService.setEntityPreference(context, profileItem, PUBLICATION, preference);
+            case FUNDINGS_PREFERENCES:
+                OrcidEntitySyncPreference fundingPreference = parsePreference(value);
+                return synchronizationService.setEntityPreference(context, profileItem, FUNDING, fundingPreference);
+            case PROFILE_PREFERENCES:
+                List<OrcidProfileSyncPreference> profilePreferences = parseProfilePreferences(value);
+                return synchronizationService.setProfilePreference(context, profileItem, profilePreferences);
+            case MODE_PREFERENCES:
+                return synchronizationService.setSynchronizationMode(context, profileItem, parseMode(value));
+            default:
+                throw new UnprocessableEntityException("Invalid path starting with " + OPERATION_ORCID_SYNCH);
+        }
+    }
+
+    private void reloadOrcidQueue(Context context, String path, String value, Item profileItem)
+        throws SQLException, AuthorizeException {
+
+        if (path.equals(PUBLICATIONS_PREFERENCES) || path.equals(FUNDINGS_PREFERENCES)) {
+            OrcidEntitySyncPreference preference = parsePreference(value);
+            OrcidEntityType entityType = path.equals(PUBLICATIONS_PREFERENCES) ? PUBLICATION : FUNDING;
+            orcidQueueService.recalculateOrcidQueue(context, profileItem, entityType, preference);
+        }
+
+        itemService.update(context, profileItem);
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return objectToMatch instanceof ResearcherProfile
+            && operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE)
+            && operation.getPath().trim().toLowerCase().startsWith(OPERATION_ORCID_SYNCH);
+    }
+
+    private List<OrcidProfileSyncPreference> parseProfilePreferences(String value) {
+        return Arrays.stream(value.split(","))
+            .map(String::trim)
+            .filter(StringUtils::isNotEmpty)
+            .map(this::parseProfilePreference)
+            .collect(Collectors.toList());
+    }
+
+    private OrcidProfileSyncPreference parseProfilePreference(String value) {
+        try {
+            return OrcidProfileSyncPreference.valueOf(value.toUpperCase());
+        } catch (IllegalArgumentException ex) {
+            throw new UnprocessableEntityException("Invalid profile's synchronization preference value: " + value, ex);
+        }
+    }
+
+    private OrcidSynchronizationMode parseMode(String value) {
+        try {
+            return OrcidSynchronizationMode.valueOf(value.toUpperCase());
+        } catch (IllegalArgumentException ex) {
+            throw new UnprocessableEntityException("Invalid synchronization mode value: " + value, ex);
+        }
+    }
+
+    private OrcidEntitySyncPreference parsePreference(String value) {
+        try {
+            return OrcidEntitySyncPreference.valueOf(value.toUpperCase());
+        } catch (IllegalArgumentException ex) {
+            throw new UnprocessableEntityException("Invalid synchronization preference value: " + value, ex);
+        }
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileVisibleReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileVisibleReplaceOperation.java
new file mode 100644
index 0000000000..3e3c0c82f2
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileVisibleReplaceOperation.java
@@ -0,0 +1,67 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.patch.operation;
+
+import java.sql.SQLException;
+
+import org.dspace.app.rest.exception.RESTAuthorizationException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.profile.ResearcherProfile;
+import org.dspace.profile.service.ResearcherProfileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for ResearcherProfile visibility patches.
+ *
+ * Example:
+ * <code> curl -X PATCH http://${dspace.server.url}/api/eperson/profiles/<:id-eperson> -H "
+ * Content-Type: application/json" -d '[{ "op": "replace", "path": "
+ * /visible", "value": true]'
+ * </code>
+ */
+@Component
+public class ResearcherProfileVisibleReplaceOperation extends PatchOperation<ResearcherProfile> {
+
+    @Autowired
+    private ResearcherProfileService researcherProfileService;
+
+    /**
+     * Path in json body of patch that uses this operation.
+     */
+    public static final String OPERATION_VISIBLE_CHANGE = "/visible";
+
+    @Override
+    public ResearcherProfile perform(Context context, ResearcherProfile profile, Operation operation)
+        throws SQLException {
+
+        Object value = operation.getValue();
+        if (value == null | !(value instanceof Boolean)) {
+            throw new UnprocessableEntityException("The /visible value must be a boolean (true|false)");
+        }
+
+        try {
+            researcherProfileService.changeVisibility(context, profile, (boolean) value);
+        } catch (AuthorizeException e) {
+            throw new RESTAuthorizationException("Unauthorized user for profile visibility change");
+        }
+
+        return profile;
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof ResearcherProfile
+            && operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE)
+            && operation.getPath().trim().equalsIgnoreCase(OPERATION_VISIBLE_CHANGE));
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyActionAddOrReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyActionAddOrReplaceOperation.java
new file mode 100644
index 0000000000..2227c4e075
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyActionAddOrReplaceOperation.java
@@ -0,0 +1,70 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.patch.operation.resourcePolicy;
+
+import static org.dspace.app.rest.repository.patch.operation.resourcePolicy.ResourcePolicyUtils.OPERATION_PATH_ACTION;
+
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for ResourcePolicy action ADD or REPLACE patch.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/authz/resourcepolicies/<:id-resourcepolicy> -H "
+ * Content-Type: application/json" -d '[{ "op": "replace", "path": "
+ * /action", "value": 2]'
+ * </code>
+ *
+ * @author Emanuele Ballarini (emanuele.ballarini@4science.com)
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+@Component
+public class ResourcePolicyActionAddOrReplaceOperation<R> extends PatchOperation<R> {
+
+    @Override
+    public R perform(Context context, R resource, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (this.supports(resource, operation)) {
+            ResourcePolicy resourcePolicy = (ResourcePolicy) resource;
+            this.replace(resourcePolicy, operation);
+            return resource;
+        } else {
+            throw new DSpaceBadRequestException(this.getClass() + " does not support this operation");
+        }
+    }
+
+    /**
+     * Performs the actual add or replace action of resourcePolicy operation. Both
+     * actions are allowed since the starting value of action is a defined int.
+     * 
+     * @param resourcePolicy resourcePolicy being patched
+     * @param operation      patch operation
+     */
+    private void replace(ResourcePolicy resourcePolicy, Operation operation) {
+        int action = Constants.getActionID(operation.getValue().toString());
+        if (action < 0 || action > Constants.actionText.length) {
+            throw new UnprocessableEntityException(action + "is not defined");
+        }
+        resourcePolicy.setAction(action);
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof ResourcePolicy
+                && (operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD)
+                        || operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE))
+                && operation.getPath().trim().equalsIgnoreCase(OPERATION_PATH_ACTION));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyEndDateAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyEndDateAddOperation.java
index 54572614c9..b06637bad2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyEndDateAddOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyEndDateAddOperation.java
@@ -43,7 +43,6 @@ public class ResourcePolicyEndDateAddOperation<R> extends PatchOperation<R> {
         checkOperationValue(operation.getValue());
         if (this.supports(resource, operation)) {
             ResourcePolicy resourcePolicy = (ResourcePolicy) resource;
-            resourcePolicyUtils.checkResourcePolicyForExistingEndDateValue(resourcePolicy, operation);
             resourcePolicyUtils.checkResourcePolicyForConsistentEndDateValue(resourcePolicy, operation);
             this.add(resourcePolicy, operation);
             return resource;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeAddOperation.java
new file mode 100644
index 0000000000..afdcef6656
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeAddOperation.java
@@ -0,0 +1,81 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.patch.operation.resourcePolicy;
+
+import static org.dspace.app.rest.repository.patch.operation.resourcePolicy.ResourcePolicyUtils.OPERATION_PATH_POLICY_TYPE;
+
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for ResourcePolicy policyType ADD patch.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/authz/resourcepolicies/<:id-resourcepolicy> -H "
+ * Content-Type: application/json" -d '[{ "op": "add", "path": "
+ * /policyType", "value": "TYPE_SUBMISSION"]'
+ * </code>
+ *
+ * @author Emanuele Ballarini (emanuele.ballarini@4science.com)
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+@Component
+public class ResourcePolicyPolicyTypeAddOperation<R> extends PatchOperation<R> {
+
+    @Autowired
+    ResourcePolicyUtils resourcePolicyUtils;
+
+    @Override
+    public R perform(Context context, R resource, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (this.supports(resource, operation)) {
+            ResourcePolicy resourcePolicy = (ResourcePolicy) resource;
+            this.checkResourcePolicyForNonExistingPolicyTypeValue(resourcePolicy);
+            this.add(resourcePolicy, operation);
+            return resource;
+        } else {
+            throw new DSpaceBadRequestException(this.getClass() + " does not support this operation");
+        }
+    }
+
+    /**
+     * Performs the actual add policyType of resourcePolicy operation
+     *
+     * @param resourcePolicy resourcePolicy being patched
+     * @param operation      patch operation
+     */
+    private void add(ResourcePolicy resourcePolicy, Operation operation) {
+        String policyType = (String) operation.getValue();
+        resourcePolicy.setRpType(policyType);
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof ResourcePolicy && operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD)
+                && operation.getPath().trim().equalsIgnoreCase(OPERATION_PATH_POLICY_TYPE));
+    }
+
+    /**
+     * Throws DSpaceBadRequestException if a value is already set in the /policyType
+     * path.
+     *
+     * @param resource the resource to update
+     * 
+     */
+    void checkResourcePolicyForNonExistingPolicyTypeValue(ResourcePolicy resource) {
+        if (resource.getRpType() != null) {
+            throw new DSpaceBadRequestException("Attempting to add a value to an already existing path.");
+        }
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeRemoveOperation.java
new file mode 100644
index 0000000000..e4f661781d
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeRemoveOperation.java
@@ -0,0 +1,73 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.patch.operation.resourcePolicy;
+
+import static org.dspace.app.rest.repository.patch.operation.resourcePolicy.ResourcePolicyUtils.OPERATION_PATH_POLICY_TYPE;
+
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.core.Context;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for ResourcePolicy policyType DELETE patch.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/authz/resourcepolicies/<:id-resourcepolicy> -H "
+ * Content-Type: application/json" -d '[{ "op": "remove", "path": "
+ * /policyType"]'
+ * </code>
+ *
+ * @author Emanuele Ballarini (emanuele.ballarini@4science.com)
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+@Component
+public class ResourcePolicyPolicyTypeRemoveOperation<R> extends PatchOperation<R> {
+
+    @Override
+    public R perform(Context context, R resource, Operation operation) {
+        if (this.supports(resource, operation)) {
+            ResourcePolicy resourcePolicy = (ResourcePolicy) resource;
+            this.checkResourcePolicyForExistingPolicyTypeValue(resourcePolicy, operation);
+            this.delete(resourcePolicy);
+            return resource;
+        } else {
+            throw new DSpaceBadRequestException(this.getClass() + " does not support this operation");
+        }
+    }
+
+    /**
+     * Performs the actual delete policyType of resourcePolicy operation
+     * 
+     * @param resourcePolicy resourcePolicy being patched
+     */
+    private void delete(ResourcePolicy resourcePolicy) {
+        resourcePolicy.setRpType(null);
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof ResourcePolicy && operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE)
+                && operation.getPath().trim().equalsIgnoreCase(OPERATION_PATH_POLICY_TYPE));
+    }
+
+    /**
+     * Throws DSpaceBadRequestException if attempting to delete a non-existent value
+     * in /policyType path.
+     *
+     * @param resource the resource to update
+     */
+    void checkResourcePolicyForExistingPolicyTypeValue(ResourcePolicy resource, Operation operation) {
+        if (resource.getRpType() == null) {
+            throw new DSpaceBadRequestException(
+                    "Attempting to " + operation.getOp() + " a non-existent policyType value.");
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeReplaceOperation.java
new file mode 100644
index 0000000000..8606db181d
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyPolicyTypeReplaceOperation.java
@@ -0,0 +1,77 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.repository.patch.operation.resourcePolicy;
+
+import static org.dspace.app.rest.repository.patch.operation.resourcePolicy.ResourcePolicyUtils.OPERATION_PATH_POLICY_TYPE;
+
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.core.Context;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for ResourcePolicy policyType REPLACE patch.
+ *
+ * Example: Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/authz/resourcepolicies/<:id-resourcepolicy> -H "
+ * Content-Type: application/json" -d '[{ "op": "replace", "path": "
+ * /policyType", "value": "TYPE_CUSTOM"]'
+ * </code>
+ *
+ * @author Emanuele Ballarini (emanuele.ballarini@4science.com)
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+@Component
+public class ResourcePolicyPolicyTypeReplaceOperation<R> extends PatchOperation<R> {
+
+    @Override
+    public R perform(Context context, R resource, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (this.supports(resource, operation)) {
+            ResourcePolicy resourcePolicy = (ResourcePolicy) resource;
+            this.checkResourcePolicyForExistingPolicyTypeValue(resourcePolicy, operation);
+            this.replace(resourcePolicy, operation);
+            return resource;
+        } else {
+            throw new DSpaceBadRequestException(this.getClass() + " does not support this operation");
+        }
+    }
+
+    /**
+     * Performs the actual replace policyType of resourcePolicy operation
+     * 
+     * @param resourcePolicy resourcePolicy being patched
+     * @param operation      patch operation
+     */
+    private void replace(ResourcePolicy resourcePolicy, Operation operation) {
+        String newPolicyType = (String) operation.getValue();
+        resourcePolicy.setRpType(newPolicyType);
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof ResourcePolicy && operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE)
+                && operation.getPath().trim().equalsIgnoreCase(OPERATION_PATH_POLICY_TYPE));
+    }
+
+    /**
+     * Throws DSpaceBadRequestException when attempting to replace a non-existent
+     * value in /policyType path
+     * 
+     * @param resource
+     * @param operation
+     */
+    private void checkResourcePolicyForExistingPolicyTypeValue(ResourcePolicy resource, Operation operation) {
+        if (resource.getRpType() == null) {
+            throw new DSpaceBadRequestException(
+                    "Attempting to " + operation.getOp() + " a non-existent policyType value.");
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyUtils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyUtils.java
index 5902841669..435480e318 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyUtils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/resourcePolicy/ResourcePolicyUtils.java
@@ -34,6 +34,8 @@ public class ResourcePolicyUtils {
     public static final String OPERATION_PATH_ENDDATE = "/endDate";
     public static final String OPERATION_PATH_DESCRIPTION = "/description";
     public static final String OPERATION_PATH_NAME = "/name";
+    public static final String OPERATION_PATH_POLICY_TYPE = "/policyType";
+    public static final String OPERATION_PATH_ACTION = "/action";
 
     /**
      * Throws PatchBadRequestException for missing value in the /startDate path.
@@ -134,7 +136,7 @@ public class ResourcePolicyUtils {
         String dateS = (String) operation.getValue();
         try {
             Date date = simpleDateFormat.parse(dateS);
-            if (resource.getEndDate() != null && resource.getStartDate().after(date)) {
+            if (resource.getStartDate() != null && resource.getStartDate().after(date)) {
                 throw new DSpaceBadRequestException("Attempting to set an invalid endDate smaller than the startDate.");
             }
         } catch (ParseException e) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/scripts/handler/impl/RestDSpaceRunnableHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/scripts/handler/impl/RestDSpaceRunnableHandler.java
index 5b778c47fd..596ab44290 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/scripts/handler/impl/RestDSpaceRunnableHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/scripts/handler/impl/RestDSpaceRunnableHandler.java
@@ -12,8 +12,10 @@ import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.cli.HelpFormatter;
@@ -27,6 +29,7 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.scripts.DSpaceCommandLineParameter;
@@ -59,12 +62,15 @@ public class RestDSpaceRunnableHandler implements DSpaceRunnableHandler {
      * @param ePerson       The eperson that creates the process
      * @param scriptName    The name of the script for which is a process will be created
      * @param parameters    The parameters for this process
+     * @param specialGroups specialGroups The list of special groups related to eperson
+     *                      creating process at process creation time
      */
-    public RestDSpaceRunnableHandler(EPerson ePerson, String scriptName, List<DSpaceCommandLineParameter> parameters) {
+    public RestDSpaceRunnableHandler(EPerson ePerson, String scriptName, List<DSpaceCommandLineParameter> parameters,
+                                     final Set<Group> specialGroups) {
         Context context = new Context();
         try {
             ePersonId = ePerson.getID();
-            Process process = processService.create(context, ePerson, scriptName, parameters);
+            Process process = processService.create(context, ePerson, scriptName, parameters, specialGroups);
             processId = process.getID();
             this.scriptName = process.getName();
 
@@ -304,4 +310,23 @@ public class RestDSpaceRunnableHandler implements DSpaceRunnableHandler {
             log.error("RestDSpaceRunnableHandler with process: " + processId + " could not write log to process", e);
         }
     }
+
+    @Override
+    public List<UUID> getSpecialGroups() {
+        Context context = new Context();
+        List<UUID> specialGroups = new ArrayList<>();
+        try {
+            Process process = processService.find(context, processId);
+            for (Group group : process.getGroups()) {
+                specialGroups.add(group.getID());
+            }
+        } catch (SQLException e) {
+            log.error("RestDSpaceRunnableHandler with process: " + processId + " could not find the process", e);
+        } finally {
+            if (context.isValid()) {
+                context.abort();
+            }
+        }
+        return specialGroups;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ClaimedTaskRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ClaimedTaskRestPermissionEvaluatorPlugin.java
index f900fe0f59..1741d94ea8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ClaimedTaskRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ClaimedTaskRestPermissionEvaluatorPlugin.java
@@ -27,7 +27,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
- * An authenticated user is allowed to interact with a claimed task only if he own it
+ * An authenticated user is allowed to interact with a claimed task only if they own it
  * claim.
  * 
  * @author Andrea Bollini (andrea.bollini at 4science.it)
@@ -62,14 +62,14 @@ public class ClaimedTaskRestPermissionEvaluatorPlugin extends RestObjectPermissi
             if (ePerson == null) {
                 return false;
             }
-            Integer dsoId = Integer.parseInt(targetId.toString());
+            int dsoId = Integer.parseInt(targetId.toString());
             ClaimedTask claimedTask = claimedTaskService.find(context, dsoId);
             // If the claimed task is null then we give permission so we can throw another status code instead
             if (claimedTask == null) {
                 return true;
             }
             // task's owner can interact with it
-            if (claimedTask != null && ePerson.equals(claimedTask.getOwner())) {
+            if (ePerson.equals(claimedTask.getOwner())) {
                 return true;
             }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java
index 20844ec946..e55734e513 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java
@@ -11,14 +11,16 @@ import static org.dspace.app.rest.security.WebSecurityConfiguration.ADMIN_GRANT;
 import static org.dspace.app.rest.security.WebSecurityConfiguration.AUTHENTICATED_GRANT;
 
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.login.PostLoggedInAction;
 import org.dspace.app.rest.utils.ContextUtil;
-import org.dspace.app.util.AuthorizeUtil;
 import org.dspace.authenticate.AuthenticationMethod;
 import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.authorize.service.AuthorizeService;
@@ -62,6 +64,16 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
     @Autowired
     private HttpServletRequest request;
 
+    @Autowired(required = false)
+    private List<PostLoggedInAction> postLoggedInActions;
+
+    @PostConstruct
+    public void postConstruct() {
+        if (postLoggedInActions == null) {
+            postLoggedInActions = Collections.emptyList();
+        }
+    }
+
     @Override
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {
         Context context = ContextUtil.obtainContext(request);
@@ -122,6 +134,15 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
                                      .getHeader(newContext, "login", "type=explicit"));
 
                         output = createAuthentication(newContext);
+
+                        for (PostLoggedInAction action : postLoggedInActions) {
+                            try {
+                                action.loggedIn(newContext);
+                            } catch (Exception ex) {
+                                log.error("An error occurs performing post logged in action", ex);
+                            }
+                        }
+
                     } else {
                         log.info(LogHelper.getHeader(newContext, "failed_login", "email="
                             + name + ", result="
@@ -176,20 +197,15 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
         EPerson eperson = context.getCurrentUser();
         if (eperson != null) {
             boolean isAdmin = false;
-            boolean isCommunityAdmin = false;
-            boolean isCollectionAdmin = false;
             try {
                 isAdmin = authorizeService.isAdmin(context, eperson);
-                isCommunityAdmin = authorizeService.isCommunityAdmin(context);
-                isCollectionAdmin = authorizeService.isCollectionAdmin(context);
             } catch (SQLException e) {
                 log.error("SQL error while checking for admin rights", e);
             }
 
             if (isAdmin) {
                 authorities.add(new SimpleGrantedAuthority(ADMIN_GRANT));
-            } else if ((isCommunityAdmin && AuthorizeUtil.canCommunityAdminManageAccounts())
-                       || (isCollectionAdmin && AuthorizeUtil.canCollectionAdminManageAccounts())) {
+            } else if (authorizeService.isAccountManager(context)) {
                 authorities.add(new SimpleGrantedAuthority(MANAGE_ACCESS_GROUP));
             }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java
index 0e208a68a2..ce6783ae15 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java
@@ -34,7 +34,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
- * An authenticated user is allowed to view, update or delete his or her own data. This {@link RestPermissionEvaluatorPlugin}
+ * An authenticated user is allowed to view, update or delete their own data. This {@link RestPermissionEvaluatorPlugin}
  * implements that requirement.
  */
 @Component
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/GroupRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/GroupRestPermissionEvaluatorPlugin.java
index 6f168efc91..d6d3bc82c7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/GroupRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/GroupRestPermissionEvaluatorPlugin.java
@@ -29,7 +29,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
- * An authenticated user is allowed to view information on all the groups he or she is a member of (READ permission).
+ * An authenticated user is allowed to view information on all the groups they are a member of (READ permission).
  * This {@link RestPermissionEvaluatorPlugin} implements that requirement by validating the group membership.
  */
 @Component
@@ -68,6 +68,11 @@ public class GroupRestPermissionEvaluatorPlugin extends RestObjectPermissionEval
 
             Group group = groupService.find(context, dsoId);
 
+            // if the group is one of the special groups of the context it is readable
+            if (context.getSpecialGroups().contains(group)) {
+                return true;
+            }
+
             // anonymous user
             if (ePerson == null) {
                 return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin.java
new file mode 100644
index 0000000000..9f6d836952
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin.java
@@ -0,0 +1,100 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.security;
+
+import java.io.Serializable;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.dspace.app.rest.model.OrcidQueueRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.services.RequestService;
+import org.dspace.services.model.Request;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+/**
+ * Permission evaluator plugin that check if the current user can perform an
+ * ORCID synchronization.
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+@Component
+public class OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
+
+    @Autowired
+    private RequestService requestService;
+
+    @Autowired
+    private OrcidQueueService orcidQueueService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    public boolean hasDSpacePermission(Authentication authentication, Serializable targetId, String targetType,
+            DSpaceRestPermission permission) {
+
+        DSpaceRestPermission restPermission = DSpaceRestPermission.convert(permission);
+        if (!DSpaceRestPermission.ADD.equals(restPermission)) {
+            return false;
+        }
+        if (!targetType.equals(OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.ORCID_HISTORY)) {
+            return false;
+        }
+
+        Request request = requestService.getCurrentRequest();
+        Context context = ContextUtil.obtainContext(request.getHttpServletRequest());
+
+        EPerson currentUser = context.getCurrentUser();
+        String url = targetId.toString();
+        Pattern pattern = Pattern
+            .compile("\\[.*\\/api\\/" + OrcidQueueRest.CATEGORY + "\\/" + OrcidQueueRest.PLURAL_NAME + "\\/(.*)\\]");
+        Matcher matcher = pattern.matcher(url);
+
+        matcher.find();
+        String id = matcher.group(1);
+        int queueId = Integer.parseInt(id);
+        OrcidQueue orcidQueue = null;
+        try {
+            orcidQueue = orcidQueueService.find(context, queueId);
+            // anonymous user
+            if (currentUser == null) {
+                return false;
+            } else if (orcidQueue == null) {
+                return true;
+            } else if (hasAccess(context, currentUser, orcidQueue)) {
+                return true;
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        return false;
+    }
+
+    private boolean hasAccess(Context context, EPerson currentUser, OrcidQueue orcidQueue) {
+        if (orcidQueue != null) {
+            List<MetadataValue> value = itemService.getMetadata(orcidQueue.getProfileItem(),
+                "dspace", "object", "owner", null);
+            if (value.get(0).getAuthority().equals(currentUser.getID().toString())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidLoginFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidLoginFilter.java
new file mode 100644
index 0000000000..9fdef6b050
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidLoginFilter.java
@@ -0,0 +1,135 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.security;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.authenticate.OrcidAuthentication;
+import org.dspace.authenticate.OrcidAuthenticationBean;
+import org.dspace.core.Context;
+import org.dspace.core.Utils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
+import org.dspace.web.ContextUtil;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.ProviderNotFoundException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+
+/**
+ * This class will filter ORCID requests and try and authenticate them.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+
+public class OrcidLoginFilter extends StatelessLoginFilter {
+
+    private static final Logger log = LogManager.getLogger(OrcidLoginFilter.class);
+
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    private OrcidAuthenticationBean orcidAuthentication = new DSpace().getServiceManager()
+        .getServiceByName("orcidAuthentication", OrcidAuthenticationBean.class);
+
+    public OrcidLoginFilter(String url, AuthenticationManager authenticationManager,
+                                     RestAuthenticationService restAuthenticationService) {
+        super(url, authenticationManager, restAuthenticationService);
+    }
+
+    @Override
+    public Authentication attemptAuthentication(HttpServletRequest req, HttpServletResponse res)
+        throws AuthenticationException {
+
+        if (!OrcidAuthentication.isEnabled()) {
+            throw new ProviderNotFoundException("Orcid login is disabled.");
+        }
+
+        return authenticationManager.authenticate(new DSpaceAuthentication());
+
+    }
+
+    @Override
+    protected void successfulAuthentication(HttpServletRequest req, HttpServletResponse res, FilterChain chain,
+        Authentication auth) throws IOException, ServletException {
+
+
+        DSpaceAuthentication dSpaceAuthentication = (DSpaceAuthentication) auth;
+
+        log.debug("Orcid authentication successful for EPerson {}. Sending back temporary auth cookie",
+            dSpaceAuthentication.getName());
+
+        restAuthenticationService.addAuthenticationDataForUser(req, res, dSpaceAuthentication, true);
+
+        redirectAfterSuccess(req, res);
+    }
+
+    @Override
+    protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
+        AuthenticationException failed) throws IOException, ServletException {
+
+        Context context = ContextUtil.obtainContext(request);
+
+        if (orcidAuthentication.isUsed(context, request)) {
+            String baseRediredirectUrl = configurationService.getProperty("dspace.ui.url");
+            String redirectUrl = baseRediredirectUrl + "/error?status=401&code=orcid.generic-error";
+            response.sendRedirect(redirectUrl); // lgtm [java/unvalidated-url-redirection]
+        } else {
+            super.unsuccessfulAuthentication(request, response, failed);
+        }
+
+    }
+
+    /**
+     * After successful login, redirect to the DSpace URL specified by this Orcid
+     * request (in the "redirectUrl" request parameter). If that 'redirectUrl' is
+     * not valid or trusted for this DSpace site, then return a 400 error.
+     * @param  request
+     * @param  response
+     * @throws IOException
+     */
+    private void redirectAfterSuccess(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        // Get redirect URL from request parameter
+        String redirectUrl = request.getParameter("redirectUrl");
+
+        // If redirectUrl unspecified, default to the configured UI
+        if (StringUtils.isEmpty(redirectUrl)) {
+            redirectUrl = configurationService.getProperty("dspace.ui.url");
+        }
+
+        // Validate that the redirectURL matches either the server or UI hostname. It
+        // *cannot* be an arbitrary URL.
+        String redirectHostName = Utils.getHostName(redirectUrl);
+        String serverHostName = Utils.getHostName(configurationService.getProperty("dspace.server.url"));
+        ArrayList<String> allowedHostNames = new ArrayList<>();
+        allowedHostNames.add(serverHostName);
+        String[] allowedUrls = configurationService.getArrayProperty("rest.cors.allowed-origins");
+        for (String url : allowedUrls) {
+            allowedHostNames.add(Utils.getHostName(url));
+        }
+
+        if (StringUtils.equalsAnyIgnoreCase(redirectHostName, allowedHostNames.toArray(new String[0]))) {
+            log.debug("Orcid redirecting to " + redirectUrl);
+            response.sendRedirect(redirectUrl);
+        } else {
+            log.error("Invalid Orcid redirectURL=" + redirectUrl +
+                ". URL doesn't match hostname of server or UI!");
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST,
+                "Invalid redirectURL! Must match server or ui hostname.");
+        }
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
new file mode 100644
index 0000000000..0139f3b336
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
@@ -0,0 +1,117 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.security;
+
+import java.io.Serializable;
+import java.sql.SQLException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.services.RequestService;
+import org.dspace.services.model.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+/**
+ * Class that evaluate DELETE and READ permissions
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+@Component
+public class OrcidQueueAndHistoryRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
+
+    private static final Logger log = LoggerFactory.getLogger(OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.class);
+
+    public static final String ORCID_QUEUE = "ORCID_QUEUE";
+    public static final String ORCID_HISTORY = "ORCID_HISTORY";
+
+    @Autowired
+    private RequestService requestService;
+
+    @Autowired
+    private OrcidQueueService orcidQueueService;
+
+    @Autowired
+    private OrcidHistoryService orcidHistoryService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    public boolean hasDSpacePermission(Authentication authentication, Serializable targetId, String targetType,
+            DSpaceRestPermission permission) {
+
+        DSpaceRestPermission restPermission = DSpaceRestPermission.convert(permission);
+        if (!DSpaceRestPermission.READ.equals(restPermission) &&
+            !DSpaceRestPermission.DELETE.equals(restPermission)) {
+            return false;
+        }
+        if (!ORCID_QUEUE.equals(targetType) && !ORCID_HISTORY.equals(targetType)) {
+            return false;
+        }
+
+        Request request = requestService.getCurrentRequest();
+        Context context = ContextUtil.obtainContext(request.getHttpServletRequest());
+
+        EPerson currentUser = context.getCurrentUser();
+        Integer orcidObjectId = Integer.parseInt(targetId.toString());
+
+        // anonymous user
+        if (currentUser == null || currentUser.getID() == null) {
+            return false;
+        } else if (StringUtils.isBlank(targetId.toString())) {
+            return true;
+        } else if (hasAccess(context, currentUser, orcidObjectId, targetType.equals(ORCID_QUEUE))) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean hasAccess(Context context, EPerson currentUser, Integer orcidObjectId, boolean isOrcidQueueRecord) {
+
+        try {
+
+            Item profileItem = findProfileItem(context, orcidObjectId, isOrcidQueueRecord);
+            if (profileItem == null) {
+                return true;
+            }
+
+            return itemService.getMetadata(profileItem, "dspace", "object", "owner", Item.ANY).stream()
+                .map(metadataValue -> metadataValue.getAuthority())
+                .anyMatch(authority -> currentUser.getID().toString().equals(authority));
+
+        } catch (SQLException e) {
+            log.error(e.getMessage(), e);
+        }
+
+        return false;
+    }
+
+    private Item findProfileItem(Context context, Integer orcidObjectId, boolean isOrcidQueueRecord)
+        throws SQLException {
+        if (isOrcidQueueRecord) {
+            OrcidQueue orcidQueue = orcidQueueService.find(context, orcidObjectId);
+            return orcidQueue != null ? orcidQueue.getProfileItem() : null;
+        } else {
+            OrcidHistory orcidHistory = orcidHistoryService.find(context, orcidObjectId);
+            return orcidHistory != null ? orcidHistory.getProfileItem() : null;
+        }
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueSearchRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueSearchRestPermissionEvaluatorPlugin.java
new file mode 100644
index 0000000000..d8566143c4
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueSearchRestPermissionEvaluatorPlugin.java
@@ -0,0 +1,91 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.security;
+
+import java.io.Serializable;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.services.RequestService;
+import org.dspace.services.model.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+/**
+ * Permission evaluator plugin that check if the current user can search for
+ * ORCID queue records by owner.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+@Component
+public class OrcidQueueSearchRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
+
+    private static final Logger log = LoggerFactory.getLogger(OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.class);
+
+    public static final String ORCID_QUEUE_SEARCH = "ORCID_QUEUE_SEARCH";
+
+    @Autowired
+    private RequestService requestService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    public boolean hasDSpacePermission(Authentication authentication, Serializable targetId, String targetType,
+            DSpaceRestPermission permission) {
+
+        DSpaceRestPermission restPermission = DSpaceRestPermission.convert(permission);
+        if (!DSpaceRestPermission.READ.equals(restPermission)) {
+            return false;
+        }
+        if (!targetType.equals(ORCID_QUEUE_SEARCH)) {
+            return false;
+        }
+
+        Request request = requestService.getCurrentRequest();
+        Context context = ContextUtil.obtainContext(request.getHttpServletRequest());
+        EPerson ePerson = null;
+        try {
+            ePerson = context.getCurrentUser();
+            UUID ownerUUID = UUID.fromString(targetId.toString());
+            Item owner = itemService.find(context, ownerUUID);
+
+            // anonymous user
+            if (ePerson == null) {
+                return false;
+            } else if (owner == null || StringUtils.isBlank(targetId.toString()) || ownerUUID == null) {
+                return false;
+            } else if (hasAccess(ePerson, owner)) {
+                return true;
+            }
+        } catch (SQLException e) {
+            log.error(e.getMessage(), e);
+        }
+        return false;
+    }
+
+    private boolean hasAccess(EPerson ePerson, Item owner) {
+        List<MetadataValue> values = itemService.getMetadata(owner, "dspace", "object", "owner", Item.ANY);
+        if (values.get(0).getAuthority().equals(ePerson.getID().toString())) {
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java
index b1ea6b5e8c..d145dae449 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java
@@ -30,7 +30,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
- * An authenticated user is allowed to interact with a pool task only if it is in his list.
+ * An authenticated user is allowed to interact with a pool task only if it is in their list.
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
@@ -64,7 +64,7 @@ public class PoolTaskRestPermissionEvaluatorPlugin extends RestObjectPermissionE
             if (ePerson == null) {
                 return false;
             }
-            Integer dsoId = Integer.parseInt(targetId.toString());
+            int dsoId = Integer.parseInt(targetId.toString());
 
             PoolTask poolTask = poolTaskService.find(context, dsoId);
             // If the pool task is null then we give permission so we can throw another status code instead
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java
new file mode 100644
index 0000000000..0e0f608078
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java
@@ -0,0 +1,76 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.security;
+
+import static org.dspace.app.rest.security.DSpaceRestPermission.DELETE;
+import static org.dspace.app.rest.security.DSpaceRestPermission.READ;
+import static org.dspace.app.rest.security.DSpaceRestPermission.WRITE;
+
+import java.io.Serializable;
+import java.util.UUID;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.model.ResearcherProfileRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.services.RequestService;
+import org.dspace.services.model.Request;
+import org.dspace.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * An authenticated user is allowed to view, update or delete their own
+ * data. This {@link RestPermissionEvaluatorPlugin} implements that requirement.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component
+public class ResearcherProfileRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
+
+    @Autowired
+    private RequestService requestService;
+
+    @Override
+    public boolean hasDSpacePermission(Authentication authentication, Serializable targetId, String targetType,
+        DSpaceRestPermission restPermission) {
+
+        if (!READ.equals(restPermission) && !WRITE.equals(restPermission) && !DELETE.equals(restPermission)) {
+            return false;
+        }
+
+        if (!StringUtils.equalsIgnoreCase(targetType, ResearcherProfileRest.NAME)) {
+            return false;
+        }
+
+        UUID id = UUIDUtils.fromString(targetId.toString());
+        if (id == null) {
+            return false;
+        }
+
+        Request request = requestService.getCurrentRequest();
+        Context context = ContextUtil.obtainContext((HttpServletRequest) request.getServletRequest());
+
+        EPerson currentUser = context.getCurrentUser();
+        if (currentUser == null) {
+            return false;
+        }
+
+        if (id.equals(currentUser.getID())) {
+            return true;
+        }
+
+        return false;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyAdminPermissionEvalutatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyAdminPermissionEvalutatorPlugin.java
index 0b49d87396..421d25f940 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyAdminPermissionEvalutatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyAdminPermissionEvalutatorPlugin.java
@@ -64,7 +64,7 @@ public class ResourcePolicyAdminPermissionEvalutatorPlugin extends RestObjectPer
         Context context = ContextUtil.obtainContext(request.getHttpServletRequest());
 
         try {
-            Integer resourcePolicyID = Integer.parseInt(targetId.toString());
+            int resourcePolicyID = Integer.parseInt(targetId.toString());
             ResourcePolicy resourcePolicy =  resourcePolicyService.find(context, resourcePolicyID);
             if (resourcePolicy == null) {
                 throw new ResourceNotFoundException(
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/RestAuthenticationService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/RestAuthenticationService.java
index 6b106d1b77..dd464edfcd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/RestAuthenticationService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/RestAuthenticationService.java
@@ -53,7 +53,7 @@ public interface RestAuthenticationService {
      * Checks the current request for a valid authentication token. If found, extracts that token and obtains the
      * currently logged in EPerson.
      * @param request current request
-     * @param request current response
+     * @param response current response
      * @param context current DSpace Context
      * @return EPerson of the logged in user (if auth token found), or null if no auth token is found
      */
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java
index 38e8c1d7f4..fad60c20d2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java
@@ -11,9 +11,12 @@ import org.dspace.app.rest.exception.DSpaceAccessDeniedHandler;
 import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.services.RequestService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -63,6 +66,9 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
     @Autowired
     private DSpaceAccessDeniedHandler accessDeniedHandler;
 
+    @Value("${management.endpoints.web.base-path:/actuator}")
+    private String actuatorBasePath;
+
     @Override
     public void configure(WebSecurity webSecurity) throws Exception {
         // Define URL patterns which Spring Security will ignore entirely.
@@ -81,7 +87,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
         // Configure authentication requirements for ${dspace.server.url}/api/ URL only
         // NOTE: REST API is hardcoded to respond on /api/. Other modules (OAI, SWORD, IIIF, etc) use other root paths.
         http.requestMatchers()
-            .antMatchers("/api/**", "/iiif/**")
+            .antMatchers("/api/**", "/iiif/**", actuatorBasePath + "/**")
             .and()
             // Enable Spring Security authorization on these paths
             .authorizeRequests()
@@ -89,6 +95,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .antMatchers(HttpMethod.POST,"/api/authn/login").permitAll()
                 // Everyone can call GET on the status endpoint (used to check your authentication status)
                 .antMatchers(HttpMethod.GET, "/api/authn/status").permitAll()
+                .antMatchers(HttpMethod.GET, actuatorBasePath + "/info").hasAnyAuthority(ADMIN_GRANT)
             .and()
             // Tell Spring to not create Sessions
             .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
@@ -102,7 +109,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
             // (both are defined below as methods).
             // While we primarily use JWT in headers, CSRF protection is needed because we also support JWT via Cookies
             .csrf()
-                .csrfTokenRepository(this.getCsrfTokenRepository())
+                .csrfTokenRepository(this.csrfTokenRepository())
                 .sessionAuthenticationStrategy(this.sessionAuthenticationStrategy())
             .and()
             .exceptionHandling()
@@ -137,6 +144,11 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
             .addFilterBefore(new ShibbolethLoginFilter("/api/authn/shibboleth", authenticationManager(),
                                                        restAuthenticationService),
                              LogoutFilter.class)
+            //Add a filter before our ORCID endpoints to do the authentication based on the data in the
+            // HTTP request
+            .addFilterBefore(new OrcidLoginFilter("/api/authn/orcid", authenticationManager(),
+                                                       restAuthenticationService),
+                             LogoutFilter.class)
             //Add a filter before our OIDC endpoints to do the authentication based on the data in the
             // HTTP request
             .addFilterBefore(new OidcLoginFilter("/api/authn/oidc", authenticationManager(),
@@ -168,7 +180,9 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
      *
      * @return CsrfTokenRepository as described above
      */
-    public CsrfTokenRepository getCsrfTokenRepository() {
+    @Lazy
+    @Bean
+    public CsrfTokenRepository csrfTokenRepository() {
         return new DSpaceCsrfTokenRepository();
     }
 
@@ -177,7 +191,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
      * is only refreshed when it is used (or attempted to be used) by the client.
      */
     private SessionAuthenticationStrategy sessionAuthenticationStrategy() {
-        return new DSpaceCsrfAuthenticationStrategy(getCsrfTokenRepository());
+        return new DSpaceCsrfAuthenticationStrategy(csrfTokenRepository());
     }
 
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkflowRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkflowRestPermissionEvaluatorPlugin.java
index 137b59fda5..e225df067d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkflowRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkflowRestPermissionEvaluatorPlugin.java
@@ -31,7 +31,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
- * An authenticated user is allowed to interact with workflow item only if they belong to a task that she own or could
+ * An authenticated user is allowed to interact with workflow item only if they belong to a task that they own or could
  * claim.
  * 
  * @author Andrea Bollini (andrea.bollini at 4science.it)
@@ -75,7 +75,7 @@ public class WorkflowRestPermissionEvaluatorPlugin extends RestObjectPermissionE
             if (ePerson == null) {
                 return false;
             }
-            Integer dsoId = Integer.parseInt(targetId.toString());
+            int dsoId = Integer.parseInt(targetId.toString());
             XmlWorkflowItem workflowItem = workflowItemService.find(context, dsoId);
             // submitter can see their inprogress submission
             if (ePerson.equals(workflowItem.getSubmitter())) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkspaceItemRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkspaceItemRestPermissionEvaluatorPlugin.java
index 2084805662..9a8de3675c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkspaceItemRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkspaceItemRestPermissionEvaluatorPlugin.java
@@ -62,7 +62,7 @@ public class WorkspaceItemRestPermissionEvaluatorPlugin extends RestObjectPermis
         WorkspaceItem witem = null;
         try {
             ePerson = context.getCurrentUser();
-            Integer dsoId = Integer.parseInt(targetId.toString());
+            int dsoId = Integer.parseInt(targetId.toString());
 
             // anonymous user
             if (ePerson == null) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenRestAuthenticationServiceImpl.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenRestAuthenticationServiceImpl.java
index 5c685f61af..c28729ff83 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenRestAuthenticationServiceImpl.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenRestAuthenticationServiceImpl.java
@@ -21,7 +21,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.model.wrapper.AuthenticationToken;
 import org.dspace.app.rest.security.DSpaceAuthentication;
 import org.dspace.app.rest.security.RestAuthenticationService;
-import org.dspace.app.rest.security.WebSecurityConfiguration;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authenticate.AuthenticationMethod;
 import org.dspace.authenticate.service.AuthenticationService;
@@ -32,6 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.ResponseCookie;
 import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
@@ -65,8 +65,9 @@ public class JWTTokenRestAuthenticationServiceImpl implements RestAuthentication
     @Autowired
     private AuthenticationService authenticationService;
 
+    @Lazy
     @Autowired
-    private WebSecurityConfiguration webSecurityConfiguration;
+    private CsrfTokenRepository csrfTokenRepository;
 
     @Override
     public void afterPropertiesSet() throws Exception {
@@ -331,9 +332,6 @@ public class JWTTokenRestAuthenticationServiceImpl implements RestAuthentication
      * @param response current response
      */
     private void resetCSRFToken(HttpServletRequest request, HttpServletResponse response) {
-        // Get access to our enabled CSRF token repository
-        CsrfTokenRepository csrfTokenRepository = webSecurityConfiguration.getCsrfTokenRepository();
-
         // Remove current CSRF token & generate a new one
         // We do this as we want the token to change anytime you login or logout
         csrfTokenRepository.saveToken(null, request, response);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/AbstractProcessingStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/AbstractProcessingStep.java
index 9d7ea86db1..8c03f4ef82 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/AbstractProcessingStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/AbstractProcessingStep.java
@@ -35,5 +35,4 @@ public abstract class AbstractProcessingStep implements DataProcessingStep {
     protected MetadataFieldService metadataFieldService = ContentServiceFactory.getInstance().getMetadataFieldService();
     protected ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
     protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService();
-
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java
index 8eb1c1c119..76de36dde6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java
@@ -63,6 +63,7 @@ import org.dspace.workflow.WorkflowItemService;
 import org.dspace.workflow.WorkflowService;
 import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.rest.webmvc.json.patch.PatchException;
 import org.springframework.jdbc.datasource.init.UncategorizedScriptException;
 import org.springframework.stereotype.Component;
@@ -94,6 +95,7 @@ public class SubmissionService {
     protected CreativeCommonsService creativeCommonsService;
     @Autowired
     private RequestService requestService;
+    @Lazy
     @Autowired
     private ConverterService converter;
     @Autowired
@@ -304,7 +306,9 @@ public class SubmissionService {
         result.setRights(creativeCommonsService.getLicenseName(item));
 
         Bitstream licenseRdfBitstream = creativeCommonsService.getLicenseRdfBitstream(item);
-        result.setFile(converter.toRest(licenseRdfBitstream, Projection.DEFAULT));
+        if (licenseRdfBitstream != null) {
+            result.setFile(converter.toRest(licenseRdfBitstream, Projection.DEFAULT));
+        }
 
         return result;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueRemovePatchOperation.java
index 03c35f126f..6bbb7bb032 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueRemovePatchOperation.java
@@ -49,7 +49,7 @@ public class BitstreamMetadataValueRemovePatchOperation extends MetadataValueRem
         bitstreamMetadataValuePathUtils.validate(absolutePath);
         Item item = source.getItem();
         List<Bundle> bundle = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
-        ;
+
         for (Bundle bb : bundle) {
             int idx = 0;
             for (Bitstream b : bb.getBitstreams()) {
@@ -58,7 +58,7 @@ public class BitstreamMetadataValueRemovePatchOperation extends MetadataValueRem
                     if (split.length == 4) {
                         deleteValue(context, b, split[3], -1);
                     } else {
-                        Integer toDelete = Integer.parseInt(split[4]);
+                        int toDelete = Integer.parseInt(split[4]);
                         deleteValue(context, b, split[3], toDelete);
                     }
                 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyAddPatchOperation.java
index 5bbb0f0da5..5e6274d78f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyAddPatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyAddPatchOperation.java
@@ -8,8 +8,6 @@
 package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
@@ -49,31 +47,31 @@ public class BitstreamResourcePolicyAddPatchOperation extends AddPatchOperation<
     @Override
     void add(Context context, HttpServletRequest currentRequest, InProgressSubmission source, String path, Object value)
             throws Exception {
+        //"absolutePath": "files/0/accessConditions"
         //"path": "/sections/upload/files/0/accessConditions"
-        String[] split = getAbsolutePath(path).split("/");
+        String[] splitAbsPath = getAbsolutePath(path).split("/");
+        String[] splitPath = path.split("/");
         Item item = source.getItem();
 
         List<Bundle> bundle = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
         ;
-        Collection<UploadConfiguration>  uploadConfigsCollection = uploadConfigurationService.getMap().values();
-        Iterator<UploadConfiguration> uploadConfigs = uploadConfigsCollection.iterator();
+        UploadConfiguration uploadConfig = uploadConfigurationService.getMap().get(splitPath[2]);
         for (Bundle bb : bundle) {
             int idx = 0;
             for (Bitstream bitstream : bb.getBitstreams()) {
-                if (idx == Integer.parseInt(split[1])) {
+                if (idx == Integer.parseInt(splitAbsPath[1])) {
 
                     List<AccessConditionDTO> newAccessConditions = new ArrayList<AccessConditionDTO>();
-                    if (split.length == 3) {
+                    if (splitAbsPath.length == 3) {
                         resourcePolicyService.removePolicies(context, bitstream, ResourcePolicy.TYPE_CUSTOM);
                         newAccessConditions = evaluateArrayObject((LateObjectEvaluator) value);
-                    } else if (split.length == 4) {
+                    } else if (splitAbsPath.length == 4) {
                         // contains "-", call index-based accessConditions it make not sense
                         newAccessConditions.add(evaluateSingleObject((LateObjectEvaluator) value));
                     }
 
-                    // TODO manage duplicate policy
                     if (CollectionUtils.isNotEmpty(newAccessConditions)) {
-                        BitstreamResourcePolicyUtils.findApplyResourcePolicy(context, uploadConfigs, bitstream,
+                        BitstreamResourcePolicyUtils.findApplyResourcePolicy(context, uploadConfig, bitstream,
                                                                              newAccessConditions);
                     }
                 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyRemovePatchOperation.java
index edb606b214..e936b0b0c7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyRemovePatchOperation.java
@@ -65,7 +65,7 @@ public class BitstreamResourcePolicyRemovePatchOperation
                                                                                    ResourcePolicy.TYPE_CUSTOM);
                         int index = 0;
                         for (ResourcePolicy policy : policies) {
-                            Integer toDelete = Integer.parseInt(rpIdx);
+                            int toDelete = Integer.parseInt(rpIdx);
                             if (index == toDelete) {
                                 b.getResourcePolicies().remove(policy);
                                 bitstream = b;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyReplacePatchOperation.java
index 6a6fd65d70..19acc7b9f2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyReplacePatchOperation.java
@@ -56,7 +56,7 @@ public class BitstreamResourcePolicyReplacePatchOperation extends ReplacePatchOp
         Item item = source.getItem();
 
         List<Bundle> bundle = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
-        ;
+
         Collection<UploadConfiguration> uploadConfigsCollection = uploadConfigurationService.getMap().values();
         Iterator<UploadConfiguration> uploadConfigs = uploadConfigsCollection.iterator();
         for (Bundle bb : bundle) {
@@ -70,7 +70,7 @@ public class BitstreamResourcePolicyReplacePatchOperation extends ReplacePatchOp
 
                     int index = 0;
                     for (ResourcePolicy policy : policies) {
-                        Integer toReplace = Integer.parseInt(rpIdx);
+                        int toReplace = Integer.parseInt(rpIdx);
                         if (index == toReplace) {
                             b.getResourcePolicies().remove(policy);
                             break;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyUtils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyUtils.java
index 3aa46fb8c8..3d989d0276 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyUtils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyUtils.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest.submit.factory.impl;
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
+import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.AccessConditionDTO;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
@@ -37,36 +37,34 @@ public class BitstreamResourcePolicyUtils {
      * This function applies the resource policies.
      *
      * @param context               The relevant DSpace Context.
-     * @param uploadConfigs         The configured UploadConfigurations
+     * @param uploadConfiguration   The configured UploadConfiguration
      * @param obj                   The applicable DSpace object whose policies should be determined
-     * @param newAccessCondition    The access condition containing the details for the desired policies
+     * @param newAccessConditions   The access condition containing the details for the desired policies
      * @throws SQLException         If a database error occurs
      * @throws AuthorizeException   If the user is not authorized
+     * @throws ParseException       If parse error
      */
-    public static void findApplyResourcePolicy(Context context, Iterator<UploadConfiguration> uploadConfigs,
+    public static void findApplyResourcePolicy(Context context, UploadConfiguration uploadConfiguration,
             DSpaceObject obj, List<AccessConditionDTO> newAccessConditions)
             throws SQLException, AuthorizeException, ParseException {
-        while (uploadConfigs.hasNext()) {
-            UploadConfiguration uploadConfiguration = uploadConfigs.next();
-            for (AccessConditionDTO newAccessCondition : newAccessConditions) {
-                String name = newAccessCondition.getName();
-                String description = newAccessCondition.getDescription();
+        for (AccessConditionDTO newAccessCondition : newAccessConditions) {
+            String name = newAccessCondition.getName();
+            String description = newAccessCondition.getDescription();
 
-                Date startDate = newAccessCondition.getStartDate();
-                Date endDate = newAccessCondition.getEndDate();
+            Date startDate = newAccessCondition.getStartDate();
+            Date endDate = newAccessCondition.getEndDate();
 
-                findApplyResourcePolicy(context, uploadConfiguration, obj, name, description, startDate, endDate);
-            }
+            findApplyResourcePolicy(context, uploadConfiguration, obj, name, description, startDate, endDate);
         }
+
     }
 
     /**
      * Based on the given name, find the resource policy to apply on the given DSpace object
-     * This function applies the resource policies.
-     * The description, start date and end date are applied as well
+     * This function applies the resource policies.The description, start date and end date are applied as well
      *
      * @param context               The relevant DSpace Context.
-     * @param uploadConfigs         The configured UploadConfigurations
+     * @param uploadConfiguration   The configured UploadConfiguration
      * @param obj                   The applicable DSpace object whose policies should be determined
      * @param name                  The name of the access condition matching the desired policies
      * @param description           An optional description for the policies
@@ -74,16 +72,24 @@ public class BitstreamResourcePolicyUtils {
      * @param endDate               An optional end date for the policies
      * @throws SQLException         If a database error occurs
      * @throws AuthorizeException   If the user is not authorized
+     * @throws ParseException       If parse error
      */
     public static void findApplyResourcePolicy(Context context, UploadConfiguration uploadConfiguration,
             DSpaceObject obj, String name, String description,
                                                Date startDate, Date endDate)
             throws SQLException, AuthorizeException, ParseException {
+        boolean found = false;
         for (AccessConditionOption aco : uploadConfiguration.getOptions()) {
             if (aco.getName().equalsIgnoreCase(name)) {
                 aco.createResourcePolicy(context, obj, name, description, startDate, endDate);
-                return;
+                found = true;
+                break;
             }
         }
+        // unexisting/unconfigured access conditions are no longer accepted
+        if (!found) {
+            throw new UnprocessableEntityException("The provided access condition: " + name + " is not supported!");
+        }
+        return;
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueRemovePatchOperation.java
index aaa5a267e1..95206bc5ca 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueRemovePatchOperation.java
@@ -50,7 +50,7 @@ public class ItemMetadataValueRemovePatchOperation extends MetadataValueRemovePa
         if (split.length == 1) {
             deleteValue(context, source.getItem(), split[0], -1);
         } else {
-            Integer toDelete = Integer.parseInt(split[1]);
+            int toDelete = Integer.parseInt(split[1]);
             deleteValue(context, source.getItem(), split[0], toDelete);
         }
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java
index 10a96a557f..6b66947c4b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java
@@ -31,6 +31,8 @@ import org.dspace.content.InProgressSubmission;
 import org.dspace.content.MetadataValue;
 import org.dspace.core.Context;
 import org.dspace.core.Utils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Describe step for DSpace Spring Rest. Expose and allow patching of the in progress submission metadata. It is
@@ -43,7 +45,11 @@ public class DescribeStep extends AbstractProcessingStep {
 
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(DescribeStep.class);
 
+    // Input reader for form configuration
     private DCInputsReader inputReader;
+    // Configuration service
+    private final ConfigurationService configurationService =
+            DSpaceServicesFactory.getInstance().getConfigurationService();
 
     public DescribeStep() throws DCInputsReaderException {
         inputReader = new DCInputsReader();
@@ -64,9 +70,19 @@ public class DescribeStep extends AbstractProcessingStep {
 
     private void readField(InProgressSubmission obj, SubmissionStepConfig config, DataDescribe data,
                            DCInputSet inputConfig) throws DCInputsReaderException {
+        String documentTypeValue = "";
+        List<MetadataValue> documentType = itemService.getMetadataByMetadataString(obj.getItem(),
+                configurationService.getProperty("submit.type-bind.field", "dc.type"));
+        if (documentType.size() > 0) {
+            documentTypeValue = documentType.get(0).getValue();
+        }
+
+        // Get list of all field names (including qualdrop names) allowed for this dc.type
+        List<String> allowedFieldNames = inputConfig.populateAllowedFieldNames(documentTypeValue);
+
+        // Loop input rows and process submitted metadata
         for (DCInput[] row : inputConfig.getFields()) {
             for (DCInput input : row) {
-
                 List<String> fieldsName = new ArrayList<String>();
                 if (input.isQualdropValue()) {
                     for (Object qualifier : input.getPairs()) {
@@ -91,20 +107,30 @@ public class DescribeStep extends AbstractProcessingStep {
                         String[] metadataToCheck = Utils.tokenize(md.getMetadataField().toString());
                         if (data.getMetadata().containsKey(
                             Utils.standardize(metadataToCheck[0], metadataToCheck[1], metadataToCheck[2], "."))) {
-                            data.getMetadata()
-                                .get(Utils.standardize(md.getMetadataField().getMetadataSchema().getName(),
-                                                       md.getMetadataField().getElement(),
-                                                       md.getMetadataField().getQualifier(),
-                                                       "."))
-                                .add(dto);
+                            // If field is allowed by type bind, add value to existing field set, otherwise remove
+                            // all values for this field
+                            if (allowedFieldNames.contains(fieldName)) {
+                                data.getMetadata()
+                                        .get(Utils.standardize(md.getMetadataField().getMetadataSchema().getName(),
+                                                md.getMetadataField().getElement(),
+                                                md.getMetadataField().getQualifier(),
+                                                "."))
+                                        .add(dto);
+                            } else {
+                                data.getMetadata().remove(Utils.standardize(metadataToCheck[0], metadataToCheck[1],
+                                        metadataToCheck[2], "."));
+                            }
                         } else {
-                            List<MetadataValueRest> listDto = new ArrayList<>();
-                            listDto.add(dto);
-                            data.getMetadata()
-                                .put(Utils.standardize(md.getMetadataField().getMetadataSchema().getName(),
-                                                       md.getMetadataField().getElement(),
-                                                       md.getMetadataField().getQualifier(),
-                                                       "."), listDto);
+                            // Add values only if allowed by type bind
+                            if (allowedFieldNames.contains(fieldName)) {
+                                List<MetadataValueRest> listDto = new ArrayList<>();
+                                listDto.add(dto);
+                                data.getMetadata()
+                                        .put(Utils.standardize(md.getMetadataField().getMetadataSchema().getName(),
+                                                md.getMetadataField().getElement(),
+                                                md.getMetadataField().getQualifier(),
+                                                "."), listDto);
+                            }
                         }
                     }
                 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/SherpaPolicyStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/SherpaPolicyStep.java
new file mode 100644
index 0000000000..d37182904b
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/SherpaPolicyStep.java
@@ -0,0 +1,63 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.submit.step;
+
+import java.util.Objects;
+import javax.servlet.http.HttpServletRequest;
+
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.model.step.SherpaPolicy;
+import org.dspace.app.rest.submit.AbstractProcessingStep;
+import org.dspace.app.rest.submit.SubmissionService;
+import org.dspace.app.sherpa.cache.SherpaCacheEvictService;
+import org.dspace.app.sherpa.submit.SHERPASubmitService;
+import org.dspace.app.sherpa.v2.SHERPAResponse;
+import org.dspace.app.util.SubmissionStepConfig;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.core.Context;
+import org.dspace.utils.DSpace;
+import org.dspace.web.ContextUtil;
+
+/**
+ * SherpaPolicy step for DSpace Spring Rest. Expose information about
+ * the Sherpa policies for the in progress submission.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class SherpaPolicyStep extends AbstractProcessingStep {
+
+    public static final String SHERPA_RETRIEVAL_TIME = "retrievalTime";
+
+    private SherpaCacheEvictService sherpaCacheEvictService = new DSpace().getSingletonService(
+                SherpaCacheEvictService.class);
+    private SHERPASubmitService sherpaSubmitService = new DSpace().getSingletonService(SHERPASubmitService.class);
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public SherpaPolicy getData(SubmissionService submissionService, InProgressSubmission obj,
+            SubmissionStepConfig config) throws Exception {
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        SHERPAResponse response = sherpaSubmitService.searchRelatedJournals(context, obj.getItem());
+        if (Objects.nonNull(response)) {
+            SherpaPolicy result = new SherpaPolicy();
+            result.setSherpaResponse(response);
+            return result;
+        }
+        return null;
+    }
+
+    @Override
+    public void doPatchProcessing(Context context, HttpServletRequest currentRequest, InProgressSubmission source,
+            Operation op, SubmissionStepConfig stepConf) throws Exception {
+        String path = op.getPath();
+        if (path.contains(SHERPA_RETRIEVAL_TIME)) {
+            sherpaCacheEvictService.evictCacheValues(context, source.getItem());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/AbstractValidation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/AbstractValidation.java
index 4bb0fd6099..cc285ead00 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/AbstractValidation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/AbstractValidation.java
@@ -7,7 +7,6 @@
  */
 package org.dspace.app.rest.submit.step.validation;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -22,8 +21,6 @@ public abstract class AbstractValidation implements Validation {
 
     private String name;
 
-    private List<ErrorRest> errors = new ArrayList<ErrorRest>();
-
     /**
      * An unique name to identify the validation implementation
      */
@@ -36,25 +33,29 @@ public abstract class AbstractValidation implements Validation {
     }
 
     /**
-     * Add an error message (i18nKey) for a specific json path
-     * 
-     * @param i18nKey
-     *            the validation error message as a key to internationalize
-     * @param path
-     *            the json path that identify the wrong data in the submission. It could be as specific as a single
-     *            value in a multivalued attribute or general of a "whole" section
+     * Add an error message (i18nKey) for a specific json path, to list provided in input.
+     *
+     * @param errors  the list to which error must be added
+     * @param i18nKey the validation error message as a key to internationalize
+     * @param path    the json path that identify the wrong data in the submission.
+     *                It could be as specific as a single value in a multivalued
+     *                attribute or general of a "whole" section
      */
-    public void addError(String i18nKey, String path) {
+    public void addError(List<ErrorRest> errors, String i18nKey, String path) {
+
+        if (StringUtils.isBlank(i18nKey)) {
+            return;
+        }
+
         boolean found = false;
-        if (StringUtils.isNotBlank(i18nKey)) {
-            for (ErrorRest error : errors) {
-                if (i18nKey.equals(error.getMessage())) {
-                    error.getPaths().add(path);
-                    found = true;
-                    break;
-                }
+        for (ErrorRest error : errors) {
+            if (i18nKey.equals(error.getMessage())) {
+                error.getPaths().add(path);
+                found = true;
+                break;
             }
         }
+
         if (!found) {
             ErrorRest error = new ErrorRest();
             error.setMessage(i18nKey);
@@ -62,13 +63,4 @@ public abstract class AbstractValidation implements Validation {
             errors.add(error);
         }
     }
-
-    /**
-     * Expose the identified errors
-     * 
-     * @return the list of identified {@link ErrorRest}
-     */
-    public List<ErrorRest> getErrors() {
-        return errors;
-    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/LicenseValidation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/LicenseValidation.java
index 68c80504ef..f237189ab1 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/LicenseValidation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/LicenseValidation.java
@@ -8,6 +8,7 @@
 package org.dspace.app.rest.submit.step.validation;
 
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
@@ -42,13 +43,14 @@ public class LicenseValidation extends AbstractValidation {
     public List<ErrorRest> validate(SubmissionService submissionService, InProgressSubmission obj,
                                     SubmissionStepConfig config) throws DCInputsReaderException, SQLException {
 
+        List<ErrorRest> errors = new ArrayList<>();
         Bitstream bitstream = bitstreamService
             .getBitstreamByName(obj.getItem(), Constants.LICENSE_BUNDLE_NAME, Constants.LICENSE_BITSTREAM_NAME);
         if (bitstream == null) {
-            addError(ERROR_VALIDATION_LICENSEREQUIRED,
+            addError(errors, ERROR_VALIDATION_LICENSEREQUIRED,
                 "/" + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS + "/" + config.getId());
         }
-        return getErrors();
+        return errors;
     }
 
     public BitstreamService getBitstreamService() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/MetadataValidation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/MetadataValidation.java
index 9a01326746..a0f9d9d845 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/MetadataValidation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/MetadataValidation.java
@@ -16,6 +16,7 @@ import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.ErrorRest;
 import org.dspace.app.rest.repository.WorkspaceItemRestRepository;
 import org.dspace.app.rest.submit.SubmissionService;
+import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.app.util.DCInput;
 import org.dspace.app.util.DCInputSet;
 import org.dspace.app.util.DCInputsReader;
@@ -25,6 +26,7 @@ import org.dspace.content.InProgressSubmission;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.authority.service.MetadataAuthorityService;
 import org.dspace.content.service.ItemService;
+import org.dspace.services.ConfigurationService;
 
 /**
  * Execute three validation check on fields validation:
@@ -50,11 +52,25 @@ public class MetadataValidation extends AbstractValidation {
 
     private MetadataAuthorityService metadataAuthorityService;
 
+    private ConfigurationService configurationService;
+
     @Override
     public List<ErrorRest> validate(SubmissionService submissionService, InProgressSubmission obj,
                                     SubmissionStepConfig config) throws DCInputsReaderException, SQLException {
 
+        List<ErrorRest> errors = new ArrayList<>();
+        String documentTypeValue = "";
         DCInputSet inputConfig = getInputReader().getInputsByFormName(config.getId());
+        List<MetadataValue> documentType = itemService.getMetadataByMetadataString(obj.getItem(),
+                configurationService.getProperty("submit.type-bind.field", "dc.type"));
+        if (documentType.size() > 0) {
+            documentTypeValue = documentType.get(0).getValue();
+        }
+
+        // Get list of all field names (including qualdrop names) allowed for this dc.type
+        List<String> allowedFieldNames = inputConfig.populateAllowedFieldNames(documentTypeValue);
+
+        // Begin the actual validation loop
         for (DCInput[] row : inputConfig.getFields()) {
             for (DCInput input : row) {
                 String fieldKey =
@@ -62,6 +78,7 @@ public class MetadataValidation extends AbstractValidation {
                 boolean isAuthorityControlled = metadataAuthorityService.isAuthorityControlled(fieldKey);
 
                 List<String> fieldsName = new ArrayList<String>();
+
                 if (input.isQualdropValue()) {
                     boolean foundResult = false;
                     List<Object> inputPairs = input.getPairs();
@@ -70,43 +87,75 @@ public class MetadataValidation extends AbstractValidation {
                     for (int i = 1; i < inputPairs.size(); i += 2) {
                         String fullFieldname = input.getFieldName() + "." + (String) inputPairs.get(i);
                         List<MetadataValue> mdv = itemService.getMetadataByMetadataString(obj.getItem(), fullFieldname);
-                        validateMetadataValues(mdv, input, config, isAuthorityControlled, fieldKey);
-                        if (mdv.size() > 0 && input.isVisible(DCInput.SUBMISSION_SCOPE)) {
-                            foundResult = true;
+
+                        // Check the lookup list. If no other inputs of the same field name allow this type,
+                        // then remove. This includes field name without qualifier.
+                        if (!input.isAllowedFor(documentTypeValue) &&  (!allowedFieldNames.contains(fullFieldname)
+                                && !allowedFieldNames.contains(input.getFieldName()))) {
+                            itemService.removeMetadataValues(ContextUtil.obtainCurrentRequestContext(),
+                                        obj.getItem(), mdv);
+                        } else {
+                            validateMetadataValues(mdv, input, config, isAuthorityControlled, fieldKey, errors);
+                            if (mdv.size() > 0 && input.isVisible(DCInput.SUBMISSION_SCOPE)) {
+                                foundResult = true;
+                            }
                         }
                     }
-                    if (input.isRequired() && ! foundResult) {
+                    if (input.isRequired() && !foundResult) {
                         // for this required qualdrop no value was found, add to the list of error fields
-                        addError(ERROR_VALIDATION_REQUIRED,
-                            "/" + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS + "/" + config.getId() + "/" +
-                                input.getFieldName());
+                        addError(errors, ERROR_VALIDATION_REQUIRED,
+                                "/" + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS + "/" + config.getId() + "/" +
+                                        input.getFieldName());
                     }
-
                 } else {
                     fieldsName.add(input.getFieldName());
                 }
 
                 for (String fieldName : fieldsName) {
+                    boolean valuesRemoved = false;
                     List<MetadataValue> mdv = itemService.getMetadataByMetadataString(obj.getItem(), fieldName);
-                    validateMetadataValues(mdv, input, config, isAuthorityControlled, fieldKey);
-                    if ((input.isRequired() && mdv.size() == 0) && input.isVisible(DCInput.SUBMISSION_SCOPE)) {
-                        // since this field is missing add to list of error
-                        // fields
-                        addError(ERROR_VALIDATION_REQUIRED,
-                            "/" + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS + "/" + config.getId() + "/" +
-                                input.getFieldName());
+                    if (!input.isAllowedFor(documentTypeValue)) {
+                        // Check the lookup list. If no other inputs of the same field name allow this type,
+                        // then remove. Otherwise, do not
+                        if (!(allowedFieldNames.contains(fieldName))) {
+                            itemService.removeMetadataValues(ContextUtil.obtainCurrentRequestContext(),
+                                    obj.getItem(), mdv);
+                            valuesRemoved = true;
+                            log.debug("Stripping metadata values for " + input.getFieldName() + " on type "
+                                    + documentTypeValue + " as it is allowed by another input of the same field " +
+                                    "name");
+                        } else {
+                            log.debug("Not removing unallowed metadata values for " + input.getFieldName() + " on type "
+                                    + documentTypeValue + " as it is allowed by another input of the same field " +
+                                    "name");
+                        }
+                    }
+                    validateMetadataValues(mdv, input, config, isAuthorityControlled, fieldKey, errors);
+                    if ((input.isRequired() && mdv.size() == 0) && input.isVisible(DCInput.SUBMISSION_SCOPE)
+                                                                && !valuesRemoved) {
+                        // Is the input required for *this* type? In other words, are we looking at a required
+                        // input that is also allowed for this document type
+                        if (input.isAllowedFor(documentTypeValue)) {
+                            // since this field is missing add to list of error
+                            // fields
+                            addError(errors, ERROR_VALIDATION_REQUIRED, "/"
+                                    + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS + "/" + config.getId() + "/" +
+                                            input.getFieldName());
+                        }
                     }
                 }
             }
         }
-        return getErrors();
+        return errors;
     }
 
+
     private void validateMetadataValues(List<MetadataValue> mdv, DCInput input, SubmissionStepConfig config,
-                                        boolean isAuthorityControlled, String fieldKey) {
+                                        boolean isAuthorityControlled, String fieldKey,
+                                        List<ErrorRest> errors) {
         for (MetadataValue md : mdv) {
             if (! (input.validate(md.getValue()))) {
-                addError(ERROR_VALIDATION_REGEX,
+                addError(errors, ERROR_VALIDATION_REGEX,
                     "/" + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS + "/" + config.getId() + "/" +
                         input.getFieldName() + "/" + md.getPlace());
             }
@@ -114,7 +163,7 @@ public class MetadataValidation extends AbstractValidation {
                 String authKey = md.getAuthority();
                 if (metadataAuthorityService.isAuthorityRequired(fieldKey) &&
                     StringUtils.isBlank(authKey)) {
-                    addError(ERROR_VALIDATION_AUTHORITY_REQUIRED,
+                    addError(errors, ERROR_VALIDATION_AUTHORITY_REQUIRED,
                         "/" + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS + "/" + config.getId() +
                             "/" + input.getFieldName() + "/" + md.getPlace());
                 }
@@ -122,6 +171,10 @@ public class MetadataValidation extends AbstractValidation {
         }
     }
 
+    public void setConfigurationService(ConfigurationService configurationService) {
+        this.configurationService = configurationService;
+    }
+
     public void setItemService(ItemService itemService) {
         this.itemService = itemService;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/UploadValidation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/UploadValidation.java
index 0c896db9aa..3734d6ffdd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/UploadValidation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/UploadValidation.java
@@ -8,6 +8,7 @@
 package org.dspace.app.rest.submit.step.validation;
 
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.logging.log4j.Logger;
@@ -40,14 +41,14 @@ public class UploadValidation extends AbstractValidation {
     public List<ErrorRest> validate(SubmissionService submissionService, InProgressSubmission obj,
                                     SubmissionStepConfig config) throws DCInputsReaderException, SQLException {
         //TODO MANAGE METADATA
-
+        List<ErrorRest> errors = new ArrayList<>();
         UploadConfiguration uploadConfig = uploadConfigurationService.getMap().get(config.getId());
         if (uploadConfig.isRequired() && !itemService.hasUploadedFiles(obj.getItem())) {
-            addError(ERROR_VALIDATION_FILEREQUIRED,
+            addError(errors, ERROR_VALIDATION_FILEREQUIRED,
                      "/" + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS + "/"
                          + config.getId());
         }
-        return getErrors();
+        return errors;
     }
 
     public ItemService getItemService() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java
index 7170072e13..c2136781f9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java
@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.web.config.EnableSpringDataWebSupport;
 
 /**
  * This class provides extra configuration for our Spring Boot Application
@@ -23,7 +22,6 @@ import org.springframework.data.web.config.EnableSpringDataWebSupport;
  * @author Tim Donohue
  */
 @Configuration
-@EnableSpringDataWebSupport
 @ComponentScan( {"org.dspace.app.rest.converter", "org.dspace.app.rest.repository", "org.dspace.app.rest.utils",
         "org.dspace.app.configuration", "org.dspace.iiif", "org.dspace.app.iiif"})
 public class ApplicationConfig {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/AuthorityUtils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/AuthorityUtils.java
index 1a2a071fe1..dabb0448a9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/AuthorityUtils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/AuthorityUtils.java
@@ -17,6 +17,7 @@ import org.dspace.content.authority.Choice;
 import org.dspace.content.authority.ChoiceAuthority;
 import org.dspace.content.authority.service.ChoiceAuthorityService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
@@ -38,6 +39,9 @@ public class AuthorityUtils {
     @Autowired
     private ChoiceAuthorityService cas;
 
+    // Lazy load required so that AuthorityUtils can be used from DSpaceConverter components
+    // (because ConverterService autowires all DSpaceConverter components)
+    @Lazy
     @Autowired
     private ConverterService converter;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamResource.java
index 5b8c54629c..4e5545fabc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamResource.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamResource.java
@@ -7,11 +7,15 @@
  */
 package org.dspace.app.rest.utils;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.util.Set;
 import java.util.UUID;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
 import org.dspace.content.factory.ContentServiceFactory;
@@ -32,24 +36,48 @@ import org.springframework.core.io.AbstractResource;
  */
 public class BitstreamResource extends AbstractResource {
 
-    private Bitstream bitstream;
     private String name;
     private UUID uuid;
-    private long sizeBytes;
     private UUID currentUserUUID;
+    private boolean shouldGenerateCoverPage;
+    private byte[] file;
+    private Set<UUID> currentSpecialGroups;
 
     private BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
     private EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
     private CitationDocumentService citationDocumentService =
         new DSpace().getServiceManager()
-            .getServicesByType(CitationDocumentService.class).get(0);
+                    .getServicesByType(CitationDocumentService.class).get(0);
 
-    public BitstreamResource(Bitstream bitstream, String name, UUID uuid, long sizeBytes, UUID currentUserUUID) {
-        this.bitstream = bitstream;
+    public BitstreamResource(String name, UUID uuid, UUID currentUserUUID, Set<UUID> currentSpecialGroups,
+        boolean shouldGenerateCoverPage) {
         this.name = name;
         this.uuid = uuid;
-        this.sizeBytes = sizeBytes;
         this.currentUserUUID = currentUserUUID;
+        this.currentSpecialGroups = currentSpecialGroups;
+        this.shouldGenerateCoverPage = shouldGenerateCoverPage;
+    }
+
+    /**
+     * Get Potential cover page by array, this method should only be called when a coverpage should be generated
+     * In case of failure the original file will be returned
+     *
+     * @param context   the DSpace context
+     * @param bitstream the pdf for which we want to generate a coverpage
+     * @return a byte array containing the cover page
+     */
+    private byte[] getCoverpageByteArray(Context context, Bitstream bitstream)
+        throws IOException, SQLException, AuthorizeException {
+        if (file == null) {
+            try {
+                Pair<byte[], Long> citedDocument = citationDocumentService.makeCitedDocument(context, bitstream);
+                this.file = citedDocument.getLeft();
+            } catch (Exception e) {
+                // Return the original bitstream without the cover page
+                this.file = IOUtils.toByteArray(bitstreamService.retrieve(context, bitstream));
+            }
+        }
+        return file;
     }
 
     @Override
@@ -59,27 +87,21 @@ public class BitstreamResource extends AbstractResource {
 
     @Override
     public InputStream getInputStream() throws IOException {
-        Context context = new Context();
-        try {
-            EPerson currentUser = ePersonService.find(context, currentUserUUID);
-            context.setCurrentUser(currentUser);
+        try (Context context = initializeContext()) {
+
+            Bitstream bitstream = bitstreamService.find(context, uuid);
             InputStream out;
 
-            if (citationDocumentService.isCitationEnabledForBitstream(bitstream, context)) {
-                out = citationDocumentService.makeCitedDocument(context, bitstream).getLeft();
+            if (shouldGenerateCoverPage) {
+                out = new ByteArrayInputStream(getCoverpageByteArray(context, bitstream));
             } else {
                 out = bitstreamService.retrieve(context, bitstream);
             }
 
+            this.file = null;
             return out;
         } catch (SQLException | AuthorizeException e) {
             throw new IOException(e);
-        } finally {
-            try {
-                context.complete();
-            } catch (SQLException e) {
-                throw new IOException(e);
-            }
         }
     }
 
@@ -90,6 +112,23 @@ public class BitstreamResource extends AbstractResource {
 
     @Override
     public long contentLength() throws IOException {
-        return sizeBytes;
+        try (Context context = initializeContext()) {
+            Bitstream bitstream = bitstreamService.find(context, uuid);
+            if (shouldGenerateCoverPage) {
+                return getCoverpageByteArray(context, bitstream).length;
+            } else {
+                return bitstream.getSizeBytes();
+            }
+        } catch (SQLException | AuthorizeException e) {
+            throw new IOException(e);
+        }
+    }
+
+    private Context initializeContext() throws SQLException {
+        Context context = new Context();
+        EPerson currentUser = ePersonService.find(context, currentUserUUID);
+        context.setCurrentUser(currentUser);
+        currentSpecialGroups.forEach(context::setSpecialGroup);
+        return context;
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceVersionConfigurationEnricher.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceVersionConfigurationEnricher.java
new file mode 100644
index 0000000000..a2e27bb5bc
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceVersionConfigurationEnricher.java
@@ -0,0 +1,35 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.utils;
+
+import org.dspace.app.util.Util;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * Class that use the configuration service to add a property named
+ * 'dspace.version' with the current DSpace application version.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component
+public class DSpaceVersionConfigurationEnricher implements ApplicationRunner {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        configurationService.addPropertyValue("dspace.version", Util.getSourceVersion());
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java
index 22ae8ad3d9..ffe2acc2e0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java
@@ -9,6 +9,7 @@ package org.dspace.app.rest.utils;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
+import static javax.mail.internet.MimeUtility.encodeText;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -163,7 +164,8 @@ public class HttpHeadersInitializer {
         }
 
         httpHeaders.put(CONTENT_DISPOSITION, Collections.singletonList(String.format(CONTENT_DISPOSITION_FORMAT,
-                                                                                     disposition, fileName)));
+                                                                                     disposition,
+                                                                                     encodeText(fileName))));
         log.debug("Content-Disposition : {}", disposition);
 
         // Content phase
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RestDiscoverQueryBuilder.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RestDiscoverQueryBuilder.java
new file mode 100644
index 0000000000..fe2df79b72
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RestDiscoverQueryBuilder.java
@@ -0,0 +1,183 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.utils;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.converter.query.SearchQueryConverter;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.InvalidSearchRequestException;
+import org.dspace.app.rest.parameter.SearchFilter;
+import org.dspace.core.Context;
+import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.discovery.configuration.DiscoveryConfiguration;
+import org.dspace.discovery.utils.DiscoverQueryBuilder;
+import org.dspace.discovery.utils.parameter.QueryBuilderSearchFilter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class builds the queries for the /search and /facet endpoints.
+ */
+@Component
+public class RestDiscoverQueryBuilder {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(RestDiscoverQueryBuilder.class);
+
+    @Autowired
+    private DiscoverQueryBuilder discoverQueryBuilder;
+
+    /**
+     * Build a discovery query
+     *
+     * @param context                the DSpace context
+     * @param scope                  the scope for this discovery query
+     * @param discoveryConfiguration the discovery configuration for this discovery query
+     * @param query                  the query string for this discovery query
+     * @param searchFilters          the search filters for this discovery query
+     * @param dsoType                only include search results with this type
+     * @param page                   the pageable for this discovery query
+     */
+    public DiscoverQuery buildQuery(Context context, IndexableObject scope,
+                                    DiscoveryConfiguration discoveryConfiguration,
+                                    String query, List<SearchFilter> searchFilters,
+                                    String dsoType, Pageable page)
+            throws DSpaceBadRequestException {
+
+        List<String> dsoTypes = dsoType != null ? singletonList(dsoType) : emptyList();
+
+        return buildQuery(context, scope, discoveryConfiguration, query, searchFilters, dsoTypes, page);
+    }
+
+    /**
+     * Build a discovery query
+     *
+     * @param context                the DSpace context
+     * @param scope                  the scope for this discovery query
+     * @param discoveryConfiguration the discovery configuration for this discovery query
+     * @param query                  the query string for this discovery query
+     * @param searchFilters          the search filters for this discovery query
+     * @param dsoTypes               only include search results with one of these types
+     * @param page                   the pageable for this discovery query
+     */
+    public DiscoverQuery buildQuery(Context context, IndexableObject scope,
+                                    DiscoveryConfiguration discoveryConfiguration,
+                                    String query, List<SearchFilter> searchFilters,
+                                    List<String> dsoTypes, Pageable page)
+            throws DSpaceBadRequestException {
+
+        try {
+            List<QueryBuilderSearchFilter> transformedFilters = transformRestFilters(searchFilters);
+            //Read the Pageable object if there is one
+            if (page != null) {
+                String sortBy = null;
+                String sortOrder = null;
+
+                Sort sort = page.getSort();
+                if (sort != null && sort.iterator().hasNext()) {
+                    Sort.Order order = sort.iterator().next();
+                    sortBy = order.getProperty();
+                    sortOrder = order.getDirection().name();
+                }
+                return discoverQueryBuilder.buildQuery(context, scope, discoveryConfiguration, query,
+                                                       transformedFilters, dsoTypes, page.getPageSize(),
+                                                       page.getOffset(), sortBy, sortOrder);
+            } else {
+                return discoverQueryBuilder.buildQuery(context, scope, discoveryConfiguration, query,
+                                                       transformedFilters, dsoTypes, null, null, null, null);
+            }
+        } catch (IllegalArgumentException e) {
+            throw new DSpaceBadRequestException(e.getMessage());
+        } catch (SearchServiceException e) {
+            throw new InvalidSearchRequestException(e.getMessage());
+        }
+    }
+
+    /**
+     * Create a discovery facet query.
+     *
+     * @param context                the DSpace context
+     * @param scope                  the scope for this discovery query
+     * @param discoveryConfiguration the discovery configuration for this discovery query
+     * @param prefix                 limit the facets results to those starting with the given prefix.
+     * @param query                  the query string for this discovery query
+     * @param searchFilters          the search filters for this discovery query
+     * @param dsoType                only include search results with this type
+     * @param page                   the pageable for this discovery query
+     * @param facetName              the facet field
+     */
+    public DiscoverQuery buildFacetQuery(Context context, IndexableObject scope,
+                                         DiscoveryConfiguration discoveryConfiguration,
+                                         String prefix, String query, List<SearchFilter> searchFilters,
+                                         String dsoType, Pageable page, String facetName)
+            throws DSpaceBadRequestException {
+
+        List<String> dsoTypes = dsoType != null ? singletonList(dsoType) : emptyList();
+
+        return buildFacetQuery(
+                context, scope, discoveryConfiguration, prefix, query, searchFilters, dsoTypes, page, facetName);
+    }
+
+    /**
+     * Create a discovery facet query.
+     *
+     * @param context                the DSpace context
+     * @param scope                  the scope for this discovery query
+     * @param discoveryConfiguration the discovery configuration for this discovery query
+     * @param prefix                 limit the facets results to those starting with the given prefix.
+     * @param query                  the query string for this discovery query
+     * @param searchFilters          the search filters for this discovery query
+     * @param dsoTypes               only include search results with one of these types
+     * @param page                   the pageable for this discovery query
+     * @param facetName              the facet field
+     */
+    public DiscoverQuery buildFacetQuery(Context context, IndexableObject scope,
+                                         DiscoveryConfiguration discoveryConfiguration,
+                                         String prefix, String query, List<SearchFilter> searchFilters,
+                                         List<String> dsoTypes, Pageable page, String facetName)
+            throws DSpaceBadRequestException {
+
+        try {
+            List<QueryBuilderSearchFilter> transformedFilters = transformRestFilters(searchFilters);
+
+            //Read the Pageable object if there is one
+            if (page != null) {
+                return discoverQueryBuilder
+                        .buildFacetQuery(context, scope, discoveryConfiguration, prefix, query, transformedFilters,
+                                         dsoTypes, page.getPageSize(), page.getOffset(), facetName);
+
+            } else {
+                return discoverQueryBuilder
+                        .buildFacetQuery(context, scope, discoveryConfiguration, prefix, query, transformedFilters,
+                                         dsoTypes, null, null, facetName);
+            }
+        } catch (IllegalArgumentException e) {
+            throw new DSpaceBadRequestException(e.getMessage());
+        }
+    }
+
+    private List<QueryBuilderSearchFilter> transformRestFilters(List<SearchFilter> searchFilters)
+            throws DSpaceBadRequestException {
+        SearchQueryConverter searchQueryConverter = new SearchQueryConverter();
+        List<SearchFilter> filters = searchQueryConverter.convert(searchFilters);
+        return filters.stream().map((searchFilter -> new QueryBuilderSearchFilter(searchFilter.getName(),
+                                                                                  searchFilter.getOperator(),
+                                                                                  searchFilter.getValue())))
+                      .collect(Collectors.toList());
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/UsageReportUtils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/UsageReportUtils.java
index ca10b9face..4603569da8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/UsageReportUtils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/UsageReportUtils.java
@@ -251,7 +251,10 @@ public class UsageReportUtils {
             for (int i = 0; i < dataset.getColLabels().size(); i++) {
                 UsageReportPointDsoTotalVisitsRest totalDownloadsPoint = new UsageReportPointDsoTotalVisitsRest();
                 totalDownloadsPoint.setType("bitstream");
-                totalDownloadsPoint.setId(dataset.getColLabels().get(i));
+
+                totalDownloadsPoint.setId(dataset.getColLabelsAttrs().get(i).get("id"));
+                totalDownloadsPoint.setLabel(dataset.getColLabels().get(i));
+
                 totalDownloadsPoint.addValue("views", Integer.valueOf(dataset.getMatrix()[0][i]));
                 usageReportRest.addPoint(totalDownloadsPoint);
             }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
index 99c350214c..237550326f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
@@ -23,10 +23,12 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,6 +57,8 @@ import org.dspace.app.rest.model.BaseObjectRest;
 import org.dspace.app.rest.model.CommunityRest;
 import org.dspace.app.rest.model.LinkRest;
 import org.dspace.app.rest.model.LinksRest;
+import org.dspace.app.rest.model.OrcidHistoryRest;
+import org.dspace.app.rest.model.OrcidQueueRest;
 import org.dspace.app.rest.model.ProcessRest;
 import org.dspace.app.rest.model.PropertyRest;
 import org.dspace.app.rest.model.ResourcePolicyRest;
@@ -84,6 +88,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.domain.Page;
@@ -131,6 +136,8 @@ public class Utils {
     @Autowired
     private BitstreamFormatService bitstreamFormatService;
 
+    // Must be loaded @Lazy, as ConverterService also autowires Utils
+    @Lazy
     @Autowired
     private ConverterService converter;
 
@@ -283,6 +290,12 @@ public class Utils {
         if (StringUtils.equals(modelPlural, "vocabularies")) {
             return VocabularyRest.NAME;
         }
+        if (StringUtils.equals(modelPlural, OrcidQueueRest.PLURAL_NAME)) {
+            return OrcidQueueRest.NAME;
+        }
+        if (StringUtils.equals(modelPlural, "orcidhistories")) {
+            return OrcidHistoryRest.NAME;
+        }
         return modelPlural.replaceAll("s$", "");
     }
 
@@ -357,9 +370,10 @@ public class Utils {
             }
         }
         File file = File.createTempFile(prefixTempName + "-" + suffixTempName, ".temp", uploadDir);
-        InputStream io = new BufferedInputStream(multipartFile.getInputStream());
-        BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
-        org.dspace.core.Utils.bufferedCopy(io, out);
+        try (InputStream io = new BufferedInputStream(multipartFile.getInputStream());
+            BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));) {
+            org.dspace.core.Utils.bufferedCopy(io, out);
+        }
         return file;
     }
 
@@ -467,7 +481,7 @@ public class Utils {
 
                 String line = scanner.nextLine();
                 if (org.springframework.util.StringUtils.hasText(line)) {
-                    list.add(line);
+                    list.add(decodeUrl(line));
                 }
             }
 
@@ -477,6 +491,14 @@ public class Utils {
         return list;
     }
 
+    private String decodeUrl(String url) {
+        try {
+            return URLDecoder.decode(url, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            log.warn("The following url could not be decoded: " + url);
+        }
+        return StringUtils.EMPTY;
+    }
 
     /**
      * This method will retrieve a list of DSpaceObjects from the Request by reading in the Request's InputStream
diff --git a/dspace-server-webapp/src/main/resources/application.properties b/dspace-server-webapp/src/main/resources/application.properties
index c695fe2fba..f6fba076c0 100644
--- a/dspace-server-webapp/src/main/resources/application.properties
+++ b/dspace-server-webapp/src/main/resources/application.properties
@@ -38,11 +38,6 @@
 # interact with or read its configuration from dspace.cfg.
 dspace.dir=${dspace.dir}
 
-########################
-# Spring DATA Rest settings
-#
-spring.data.rest.basePath=
-
 ########################
 # Jackson serialization settings
 #
@@ -60,11 +55,9 @@ spring.messages.encoding=UTF-8
 #
 #
 # Charset of HTTP requests and responses. Added to the "Content-Type" header if not set explicitly.
-spring.http.encoding.charset=UTF-8
-# Enable http encoding support.
-spring.http.encoding.enabled=true
+server.servlet.encoding.charset=UTF-8
 # Force the encoding to the configured charset on HTTP requests and responses.
-spring.http.encoding.force=true
+server.servlet.encoding.force=true
 
 ###########################
 # Server Properties
@@ -77,6 +70,9 @@ spring.http.encoding.force=true
 # However, you may wish to set this to "always" in your 'local.cfg' for development or debugging purposes.
 server.error.include-stacktrace = never
 
+# When to include the error message in error responses (introduced in Spring 2.3.x)
+server.error.include-message = always
+
 # Spring Boot proxy configuration (can be overridden in local.cfg).
 # By default, Spring Boot does not automatically use X-Forwarded-* Headers when generating links (and similar) in the
 # DSpace REST API. Three options are currently supported by Spring Boot:
@@ -117,6 +113,8 @@ spring.main.allow-bean-definition-overriding = true
 #########################
 # Spring Boot Logging levels
 #
+# NOTE: The below settings can be uncommented to debug issues in Spring Boot/WebMVC.
+# These "logging.level" settings will also override defaults in "logging.config" below.
 #logging.level.org.springframework.boot=DEBUG
 #logging.level.org.springframework.web=DEBUG
 #logging.level.org.hibernate=ERROR
diff --git a/dspace-server-webapp/src/main/resources/spring/spring-dspace-addon-validation-services.xml b/dspace-server-webapp/src/main/resources/spring/spring-dspace-addon-validation-services.xml
index 359f0a7a3e..f39d553c96 100644
--- a/dspace-server-webapp/src/main/resources/spring/spring-dspace-addon-validation-services.xml
+++ b/dspace-server-webapp/src/main/resources/spring/spring-dspace-addon-validation-services.xml
@@ -16,6 +16,7 @@
     <bean name="metadataValidation" class="org.dspace.app.rest.submit.step.validation.MetadataValidation"
           scope="prototype">
         <property name="name" value="submission-form"/>
+        <property name="configurationService" ref="org.dspace.services.ConfigurationService"/>
         <property name="itemService" ref="org.dspace.content.ItemServiceImpl"/>
         <property name="metadataAuthorityService" ref="org.dspace.content.authority.MetadataAuthorityServiceImpl"/>
     </bean>
@@ -25,4 +26,8 @@
         <property name="itemService" ref="org.dspace.content.ItemServiceImpl"/>
         <property name="uploadConfigurationService" ref="uploadConfigurationService"/>
     </bean>
+
+    <bean name="licenseValidation" class="org.dspace.app.rest.submit.step.validation.LicenseValidation">
+        <property name="name" value="license"/>
+    </bean>
 </beans>
diff --git a/dspace-server-webapp/src/main/webapp/index.html b/dspace-server-webapp/src/main/webapp/index.html
index 829c614393..c780286107 100644
--- a/dspace-server-webapp/src/main/webapp/index.html
+++ b/dspace-server-webapp/src/main/webapp/index.html
@@ -6,51 +6,54 @@
 * This DSpace version has be customized to include:
 *     * Download file functionality (see new downloadFile() method)
 *     * Improved AuthorizationHeader parsing (see new getAuthorizationHeader() method)
-*     * Upgraded third party dependencies (JQuery)
+*     * Upgraded third party dependencies via WebJars
+*     * Updated to use Bootstrap 4, based loosely on this PR to HAL Browser:
+        https://github.com/mikekelly/hal-browser/pull/102
 -->
 <!doctype html>
 <head>
     <meta charset="utf-8">
-    <title>The HAL Browser (customized for DSpace Server Webapp)</title>
-    <link rel="stylesheet" media="screen" href="browser/vendor/css/bootstrap.css" />
+    <title>The HAL Browser (customized for DSpace)</title>
+    <link rel="stylesheet" media="screen" href="webjars/bootstrap/dist/css/bootstrap.min.css" />
     <style type="text/css">
         body {
-            padding-top: 60px;
-            padding-bottom: 40px;
+           height: 100vh;
         }
         .sidebar-nav {
             padding: 9px 0;
         }
     </style>
-    <link rel="stylesheet" media="screen" href="browser/vendor/css/bootstrap-responsive.css" />
-    <link rel="stylesheet" media="screen" href="browser/styles.css" />
+    <link rel="stylesheet" media="screen" href="styles.css" />
 </head>
 
 <body>
 
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container-fluid">
-            <a class="brand">The HAL Browser</a>
-            <div class="nav-collapse">
-                <ul class="nav">
-                    <li><a href="#/" id="entryPointLink">Go To Entry Point</a></li>
-                    <li><a href="https://github.com/mikekelly/hal-browser">About The HAL Browser</a></li>
-                    <li><a href="login.html">Login</a></li>
-                </ul>
-            </div>
-        </div>
+<nav class="navbar sticky-top navbar-expand-md navbar-light bg-light">
+    <a class="navbar-brand" href="#">The HAL Browser</a>
+    <div class="collapse navbar-collapse">
+        <ul class="navbar-nav">
+            <li class="nav-item">
+                <a class="nav-link" href="#/" id="entryPointLink">Go To Entry Point</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="https://github.com/mikekelly/hal-browser">About The HAL Browser</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="login.html">Login</a>
+            </li>
+        </ul>
     </div>
-</div>
+</nav>
 
 <div id="browser" class="container-fluid"></div>
 
 <script id="location-bar-template" type="text/template">
     <form>
-        <div class="input-append span12 location-bar-container">
-            <input class="span11" id="appendedInputButton" type="text" value="<%= _.escape(url) %>">
-            <button class="btn" type="submit">Go!</button>
-            <span class="ajax-loader"></span>
+        <div class="input-group mb-3">
+            <input type="text" class="form-control" id="appendedInputButton" type="text" value="<%= _.escape(url) %>">
+            <div class="input-group-append">
+                <button class="btn btn-outline-secondary input-group-text" type="submit">Go!</button>
+            </div>
         </div>
     </form>
 </script>
@@ -60,12 +63,12 @@
     <table class="table">
         <thead>
         <tr>
-            <th>rel</th>
-            <th>title</th>
-            <th>name / index</th>
-            <th>docs</th>
-            <th>GET</th>
-            <th>NON-GET</th>
+            <th scope="col">rel</th>
+            <th scope="col">title</th>
+            <th scope="col">name / index</th>
+            <th scope="col">docs</th>
+            <th scope="col">GET</th>
+            <th scope="col">NON-GET</th>
         </tr>
         </thead>
         <tbody>
@@ -78,14 +81,14 @@
             <td><%= link.name ? 'name: ' + link.name : 'index: ' + i %></td>
             <td>
                 <% if (HAL.isUrl(rel)) { %>
-                <a class="dox" href="<%= HAL.normalizeUrl(HAL.buildUrl(rel)) %>"><i class="icon-book"></i></a>
+                <a class="dox" href="<%= HAL.normalizeUrl(HAL.buildUrl(rel)) %>">&#128366;</a>
                 <% } %>
             </td>
             <td>
                 <% if (link.templated === true) { %>
-                <a class="query btn btn-success" href="<%= HAL.normalizeUrl(link.href) %>" title="Query URI template"><i class="icon-question-sign"></i></a>
+                <a class="query btn btn-success" href="<%= HAL.normalizeUrl(link.href) %>" title="Query URI template">?</a>
                 <% } else { %>
-                <a class="follow btn btn-success" href="<%= HAL.normalizeUrl(link.href) %>" title="Follow link"><i class="icon-arrow-right"></i></a>
+                <a class="follow btn btn-success" href="<%= HAL.normalizeUrl(link.href) %>" title="Follow link">&#10140;</a>
                 <% } %>
             </td>
             <td>
@@ -100,14 +103,14 @@
             <td><%= obj.name || '' %></td>
             <td>
                 <% if (HAL.isUrl(rel)) { %>
-                <a class="dox" href="<%= HAL.normalizeUrl(HAL.buildUrl(rel)) %>"><i class="icon-book"></i></a>
+                <a class="dox btn btn-success" href="<%= HAL.normalizeUrl(HAL.buildUrl(rel)) %>">&#128366;</a>
                 <% } %>
             </td>
             <td>
                 <% if (obj.templated === true) { %>
-                <a class="query btn btn-success" href="<%= HAL.normalizeUrl(obj.href) %>" title="Query URI template"><i class="icon-question-sign"></i></a>
+                <a class="query btn btn-success" href="<%= HAL.normalizeUrl(obj.href) %>" title="Query URI template">?</a>
                 <% } else { %>
-                <a class="follow btn btn-success" href="<%= HAL.normalizeUrl(obj.href) %>" title="Follow link"><i class="icon-arrow-right"></i></a>
+                <a class="follow btn btn-success" href="<%= HAL.normalizeUrl(obj.href) %>" title="Follow link">&#10140;</a>
                 <% } %>
             </td>
             <td>
@@ -122,17 +125,25 @@
 
 <script id="properties-template" type="text/template">
     <h2>Properties</h2>
-    <pre><%= properties %></pre>
+    <div class="card read-only">
+        <div class="card-body">
+            <pre><%= properties %></pre>
+        </div>
+    </div>
 </script>
 
 <script id="request-headers-template" type="text/template">
     <h2>Custom Request Headers</h2>
-    <textarea class="span12"></textarea>
+    <div class="input-group">
+        <textarea class="form-control"></textarea>
+    </div>
 </script>
 
 <script id="response-headers-template" type="text/template">
     <h2>Response Headers</h2>
-    <pre><%= status.code %> <%= status.text %>
+    <div class="card read-only">
+        <div class="card-body">
+            <pre><%= status.code %> <%= status.text %>
 
 <% _.each(headers, function(value, name) {
       %><%= _.escape(name) %>: <%
@@ -143,97 +154,119 @@
             %><% if(HAL.isFollowableHeader(name)) {
             %></a><%
            } %>
-<% }) %></pre>
+<% }) %>
+            </pre>
+        </div>
+    </div>
 </script>
 
 <script id="response-body-template" type="text/template">
     <h2>Response Body</h2>
-    <pre><%= _.escape(body) %></pre>
+    <div class="card read-only">
+        <div class="card-body">
+            <pre><%= _.escape(body) %></pre>
+        </div>
+    </div>
 </script>
 
 <script id="query-uri-template" type="text/template">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Expand URI Template</h3>
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5>Expand URI Template</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            </div>
+            <form id="query" action="<%= href %>">
+                <div class="modal-body">
+                    <label for="uri">URI Template:</label>
+                    <div class="card read-only" id="uri">
+                        <div class="card-body">
+                            <pre><%- href %></pre>
+                        </div>
+                    </div>
+                    <label for="input">Input (JSON):</label>
+                    <textarea class="form-control" id="input"><%= input %></textarea>
+                    <label for="preview">Expanded URI:</label>
+                    <div class="card read-only" id="preview">
+                        <div class="card-body">
+                            <pre class="preview">&nbsp;</pre>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-primary">Follow URI</button>
+                </div>
+            </form>
+        </div>
     </div>
-
-    <form id="query" action="<%= href %>">
-        <div class="modal-body">
-            <p>URI Template:</p>
-            <pre><%- href %></pre>
-            <p>Input (JSON):</p>
-            <textarea><%= input %></textarea>
-            <p>Expanded URI:</p>
-            <pre class="preview">&nbsp;</pre>
-        </div>
-
-        <div class="modal-footer">
-            <button type="submit" class="btn btn-primary">Follow URI</button>
-        </div>
-    </form>
 </script>
 
 
 <script id="non-safe-request-template" type="text/template">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Make a non-GET request</h3>
-    </div>
-
-    <form class="non-safe" action="<%= _.escape(href) %>">
-        <div class="modal-body">
-            <p>Target URI</p>
-            <input name="url" type="text" class="url" value="<%= _.escape(href) %>" />
-            <p>Method:</p>
-            <input name="method" type="text" class="method" value="POST" />
-            <p>Headers:</p>
-<textarea name="headers" class="headers" style="height: 100px">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Make a NON-GET request</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            </div>
+            <form class="non-safe" action="<%= href %>">
+                <div class="modal-body">
+                    <label for="url">Target URI</label>
+                    <input name="url" type="text" class="url form-control" id="url" value="<%= href %>" />
+                    <label for="method">Method:</label>
+                    <input name="method" type="text" class="method form-control" id="method" value="POST" />
+                    <label for="headers">Headers:</label>
+                    <textarea name="headers" class="headers form-control" style="height: 100px" id="headers">
 Content-Type: application/json
 <%= user_defined_headers %>
-</textarea>
-            <p>Body:</p>
-<textarea name="body" class="body" style="height: 200px">
+                    </textarea>
+                    <label for="body">Body:</label>
+                    <textarea name="body" class="body form-control" style="height: 200px" id="body">
 {
 
 }
-</textarea>
+                    </textarea>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-primary">Make Request</button>
+                </div>
+            </form>
         </div>
-
-        <div class="modal-footer">
-            <button type="submit" class="btn btn-primary">Make Request</button>
-        </div>
-    </form>
+    </div>
 </script>
 
 <script id="dynamic-request-template" type="text/template">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Create/Update</h3>
-    </div>
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Create/Update</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            </div>
 
-    <form class="non-safe" action="<%= href %>">
-        <div class="modal-body" style="padding-top: 0px">
-            <div id="jsoneditor"></div>
+            <form class="non-safe" action="<%= href %>">
+                <div class="modal-body">
+                    <div id="jsoneditor"></div>
 
-            <div class="well well-small" style="padding-bottom: 0px;">
-                <div class="container-fluid">
-                    <div class="row-fluid">
-                        <div class="control-group">
-                            <label class="control-label" style="display: inline-block; font-weight: bold;">Action:</label>
-                            <input name="method" type="text" class="method controls" style="width: 98%" value="POST" />
-                            <input name="url" type="text" class="url controls" style="width: 98%" value="<%= href %>" />
+                    <div class="card card-body bg-light">
+                        <div class="container-fluid">
+                            <div class="row-fluid">
+                                <div class="form-group">
+                                    <label class="col-form-label" style="display: inline-block; font-weight: bold;">Action:</label>
+                                    <input name="method" type="text" class="method form-control" style="width: 98%" value="POST" />
+                                    <input name="url" type="text" class="url form-control" style="width: 98%" value="<%= href %>" />
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-primary">Make Request</button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer">
-            <button type="submit" class="btn btn-primary">Make Request</button>
-        </div>
-    </form>
+    </div>
 </script>
 
-
 <script id="embedded-resources-template" type="text/template">
     <h2>Embedded Resources</h2>
 </script>
@@ -250,13 +283,13 @@ Content-Type: application/json
     </div>
 </script>
 
-<!-- Customized (to use WebJars) for DSpace -->
+<!-- Pull in updated versions of "vendor" libraries using WebJars -->
 <script src="webjars/jquery/dist/jquery.min.js"></script>
-<script src="browser/vendor/js/underscore.js"></script>
-<script src="browser/vendor/js/backbone.js"></script>
+<script src="webjars/underscore/underscore-min.js"></script>
+<script src="webjars/backbone/backbone-min.js"></script>
 <script src="browser/vendor/js/uritemplates.js"></script>
-<script src="browser/vendor/js/URI.min.js"></script>
-<script src="browser/vendor/js/bootstrap.js"></script>
+<script src="webjars/urijs/src/URI.min.js"></script>
+<script src="webjars/bootstrap/dist/js/bootstrap.min.js"></script>
 
 <script src="browser/js/hal.js"></script>
 <script src="browser/js/hal/browser.js"></script>
@@ -288,8 +321,8 @@ Content-Type: application/json
 
 <script src="browser/js/hal/views/documentation.js"></script>
 
-<script src="browser/vendor/js/jsoneditor.js"></script>
-<script src="browser/js/CustomPostForm.js"></script>
+<script src="webjars/json-editor__json-editor/2.6.1/dist/jsoneditor.js"></script>
+<script src="js/vendor/CustomPostForm.js"></script>
 
 <script>
     var browser = new HAL.Browser({
diff --git a/dspace-server-webapp/src/main/webapp/js/vendor/CustomPostForm.js b/dspace-server-webapp/src/main/webapp/js/vendor/CustomPostForm.js
new file mode 100644
index 0000000000..68d95cb489
--- /dev/null
+++ b/dspace-server-webapp/src/main/webapp/js/vendor/CustomPostForm.js
@@ -0,0 +1,208 @@
+/**
+ * Custom Backbone view that uses JSON Schema metadata to create pop-up dialog with actual field names instead of
+ * asking user to input raw JSON.
+ *
+ * NOTE: Because JSON Schema lists all properties, including those that are links, they have to be filtered out.
+ * Links have to be set via a PUT operation with the proper media type.
+ *
+ * @author Greg Turnquist
+ * @author Gregory Frank
+ * @since 2.4
+ * @see DATAREST-627, DATAREST-1077
+ *
+ * This code was copied/borrowed from Spring Data REST version 3.3.x:
+ * https://github.com/spring-projects/spring-data-rest/blob/3.3.x/spring-data-rest-hal-browser/src/main/resources/META-INF/spring-data-rest/hal-browser/js/CustomPostForm.js
+ * NOTE: For DSpace, we made minor style/theme updates to align with Bootstrap 4.
+ * This script requires json-editor (https://github.com/json-editor/json-editor) which we pull in via WebJars
+ */
+/* jshint strict: true */
+/* globals HAL, Backbone, _, $, window, jqxhr */
+
+'use strict';
+
+var CustomPostForm = Backbone.View.extend({
+	initialize: function (opts) {
+		this.href = opts.href.split('{')[0];
+		this.vent = opts.vent;
+		_.bindAll(this, 'createNewResource');
+	},
+
+	events: {
+		'submit form': 'createNewResource'
+	},
+
+	className: 'modal fade',
+
+	/**
+	 * Perform a POST/PUT operation on the resource.
+	 *
+	 * @param e
+	 */
+	createNewResource: function (e) {
+		e.preventDefault();
+
+		var self = this;
+
+		var opts = {
+			url: this.$('.url').val(),
+			headers: _.defaults({'Content-Type': 'application/json'}, HAL.client.getHeaders()),
+			method: this.$('.method').val(),
+			data: this.getNewResourceData()
+		};
+
+		HAL.client.request(opts).done(function (response) {
+			self.vent.trigger('response', {resource: response, jqxhr: jqxhr});
+		}).fail(function (e) {
+			self.vent.trigger('fail-response', {jqxhr: jqxhr});
+		}).always(function (e) {
+			self.vent.trigger('response-headers', {jqxhr: jqxhr});
+			window.location.hash = 'NON-GET:' + opts.url;
+		});
+
+		this.$el.modal('hide');
+	},
+
+	/**
+	 * Draw the dialog after fetching the resource's JSON Schema metadata. If no metadata is available, use the
+	 * fallback editor.
+	 *
+	 * @param opts
+	 * @returns {CustomPostForm}
+	 */
+	render: function (opts) {
+		var self = this;
+
+		try {
+			HAL.client.request({
+				method: 'HEAD',
+				headers: HAL.client.getHeaders(),
+				url: this.href
+			}).done(function (message, text, jqXHR) {
+				self.$el.html(self.template({href: self.href}));
+
+				try {
+					var hal = self.w3cLinksToHalLinks(jqXHR.getResponseHeader('Link'));
+
+					HAL.client.request({
+						method: 'GET',
+						url: hal._links.profile.href,
+						headers: _.defaults({'Accept': 'application/schema+json'}, HAL.client.getHeaders())
+					}).done(function (schema) {
+						self.loadJsonEditor(schema);
+					});
+				} catch (e) {
+					self.loadFallbackEditor();
+				}
+
+				self.$el.modal();
+			});
+		} catch (e) {
+			self.loadFallbackEditor();
+			self.$el.modal();
+		}
+
+
+		return this;
+	},
+
+	/**
+	 * Load the JSON Schema-driven editor.
+	 *
+	 * @see https://github.com/jdorn/json-editor
+	 */
+	loadJsonEditor: function (schema) {
+		var self = this;
+
+		/**
+		 * Remove URI-based fields since this dialog doesn't handle relationships.
+		 */
+		Object.keys(schema.properties).forEach(function (property) {
+			if (schema.properties[property].hasOwnProperty('format') &&
+				schema.properties[property].format === 'uri') {
+				delete schema.properties[property];
+			}
+		});
+
+		/**
+		 * See https://github.com/jdorn/json-editor#options for more customizing options.
+		 */
+		this.editor = new window.JSONEditor(this.$('#jsoneditor')[0], {
+			theme: 'bootstrap4',
+			schema: schema,
+			disable_collapse: true,
+			disable_edit_json: true,
+			disable_properties: true
+		});
+
+		this.getNewResourceData = function() {
+			return JSON.stringify(self.editor.getValue());
+		}
+	},
+
+	/**
+	 * Load fallback editor that doesn't depend on any form of metadata.
+	 */
+	loadFallbackEditor: function () {
+		var editor = this.$('#jsoneditor');
+
+		editor.append($('<h5>' + this.href + '</h5>'));
+
+		var inputBox = $('<textarea name="body" class="body" style="height: 200px">{\n}</textarea>');
+		editor.append(inputBox);
+
+		this.getNewResourceData = function() {
+			return inputBox.val();
+		}
+	},
+
+	/**
+	 * Convert a W3C link header into a HAL-based set of _links.
+	 *
+	 * e.g.
+	 * <http://localhost:8080/persons>; rel="persons",<http://localhost:8080/profile/persons>; rel="profile"
+	 * to
+	 * {
+	 * 	_links: {
+	 * 		persons: {
+	 * 			href: http://localhost:8080/persons
+	 * 		},
+	 * 		profile: {
+	 *	 		href: http://localhost:8080/profile/persons
+	 * 		}
+	 * 	}
+	 * }
+	 *
+	 * @param linkHeader - HTTP Response header containing a list of W3C compliant links with rels.
+	 * @see https://www.w3.org/wiki/LinkHeader
+	 */
+	w3cLinksToHalLinks: function (linkHeader) {
+		var w3cLinks = linkHeader.split(',');
+
+		var halLinks = {_links: {}};
+
+		w3cLinks.forEach(function (w3cLink) {
+			var parts = w3cLink.split(';');
+
+			var hrefWrappedWithBrackets = parts[0];
+			var href = hrefWrappedWithBrackets.slice(1, parts[0].length - 1);
+
+			var w3cRel = parts[1];
+			var relWrappedWithQuotes = w3cRel.split('=')[1];
+			var rel = relWrappedWithQuotes.slice(1, relWrappedWithQuotes.length - 1);
+
+			halLinks._links[rel] = { "href": href };
+		});
+
+		return halLinks;
+	},
+
+	/**
+	 * Look up the HTML template.
+	 */
+	template: _.template($('#dynamic-request-template').html())
+});
+
+/**
+ * Inject the form into the HAL Browser.
+ */
+HAL.customPostForm = CustomPostForm;
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/webapp/login.html b/dspace-server-webapp/src/main/webapp/login.html
index 47752ded07..50d95b8047 100644
--- a/dspace-server-webapp/src/main/webapp/login.html
+++ b/dspace-server-webapp/src/main/webapp/login.html
@@ -6,7 +6,7 @@
 * This DSpace version has be customized to include:
 *     * Shibboleth login functionality
 *     * Other customization to use DSpace's login endpoint
-*     * Upgraded third party dependencies (JQuery)
+*     * Upgraded third party dependencies (Bootstrap, JQuery, Toastr) using webjars
 -->
 <!DOCTYPE html>
 <html lang="en">
@@ -14,9 +14,9 @@
     <meta charset="utf-8">
     <title>Sign in - HAL Browser</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="webjars/toastr/build/toastr.min.css" rel="stylesheet"/>
-    <link href="browser/vendor/css/bootstrap.css" rel="stylesheet">
-    <link href="browser/vendor/css/bootstrap-responsive.css" rel="stylesheet">
+    <link rel="stylesheet" media="screen" href="webjars/bootstrap/dist/css/bootstrap.min.css" />
+    <!-- Toastr CSS must be loaded after Bootstrap -->
+    <link rel="stylesheet" href="webjars/toastr/build/toastr.min.css"/>
     <style type="text/css">
         body {
             padding-top: 40px;
@@ -24,16 +24,12 @@
             background-color: #f5f5f5;
         }
         .form-signin {
-            max-width: 300px;
+            max-width: 350px;
             padding: 19px 29px 29px;
             margin: 0 auto 20px;
             background-color: #fff;
             border: 1px solid #e5e5e5;
-            -webkit-border-radius: 5px;
-            -moz-border-radius: 5px;
             border-radius: 5px;
-            -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-            -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
             box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
         }
         .form-signin .form-signin-heading, .form-signin .checkbox {
@@ -51,17 +47,17 @@
         }
     </style>
     <script src="webjars/jquery/dist/jquery.min.js"></script>
-    <script src="browser/vendor/js/bootstrap.js"></script>
+    <script src="webjars/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="webjars/toastr/build/toastr.min.js"></script>
 </head>
 <body>
 <div class="container">
     <form id="login-form" class="form-signin">
         <h2 class="form-signin-heading">HAL Browser</h2>
-        <input type="text" class="input-block-level" placeholder="Username" id="username">
-        <input type="password" class="input-block-level" placeholder="Password" id="password">
-        <button type="submit" class="btn btn-large btn-primary" id="login">Sign in</button>
-        <div class="other-login-methods hidden">
+        <input type="text" class="form-control" placeholder="Username" id="username">
+        <input type="password" class="form-control" placeholder="Password" id="password">
+        <button type="submit" class="btn btn-large btn-primary form-signin-btn" id="login">Sign in</button>
+        <div class="other-login-methods d-none">
             <h3>Other login methods:</h3>
 
         </div>
@@ -158,7 +154,7 @@
         });
 
         function addLocationButton(realm, element){
-            element.removeClass("hidden");
+            element.removeClass("d-none");
             var loc = /location="([^,]*)"/.exec(realm);
             var name = /(\w+) (\w+=((".*?")|[^,]*)(, )?)*/.exec(realm);
             if (loc !== null && loc.length === 2) {
diff --git a/dspace-server-webapp/src/main/webapp/styles.css b/dspace-server-webapp/src/main/webapp/styles.css
new file mode 100644
index 0000000000..53c49b5f6c
--- /dev/null
+++ b/dspace-server-webapp/src/main/webapp/styles.css
@@ -0,0 +1,104 @@
+/**
+* Customized version of the HAL Browser styles.css provided from https://github.com/mikekelly/hal-browser
+* Copyright (c) 2012 Mike Kelly, http://stateless.co/
+* MIT LICENSE: https://github.com/mikekelly/hal-browser/blob/master/MIT-LICENSE.txt
+*
+* This DSpace version has be customized to include:
+*     * Updates to align with Bootstrap 4.
+**/
+html, body, #browser, .hal-browser { height: 100%; }
+
+#browser #location-bar { margin: 10px 0; }
+
+#browser #location-bar .address {
+  border: 1px solid #999;
+  padding: 4px; margin: 0;
+}
+
+#browser #headers-bar {
+ border: 1px solid #888;
+ padding: 5px
+}
+
+#request-headers {
+  border: 0;
+  outline: none;
+  padding: 0;
+  resize: vertical;
+  width: 100%;
+  height: 40px;
+  margin-bottom: 0px;
+
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+
+/* Updated to roughly match Bootstrap 4 'row' class */
+.hal-browser {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+/* Updated to roughly match Bootstrap 4 'col-6' class */
+.inspector { height: 100%;
+             flex: 0 0 49%;
+             max-width: 49%;
+             margin-left: 2%}
+
+/* Updated to roughly match Bootstrap 4 'col-6' class */
+.explorer { flex: 0 0 49%;
+             max-width: 49%;}
+
+.documentation { height: 100%; }
+.documentation iframe { width: 100%; height: 100%; border-color: transparent;}
+
+.modal input, .modal textarea {
+  width: 90%;
+}
+
+.modal textarea {
+  height: 100px;
+}
+
+.read-only {
+  background-color: #f5f5f5 !important;
+}
+
+.links .btn {
+  padding: 2px 5px 2px;
+  font-size: 12px;
+  line-height: 14px;
+}
+
+body table.table {
+  font-size: 14px;
+}
+
+.location-bar-container {
+  line-height: 30px;
+}
+
+.ajax-loader {
+  vertical-align: middle;
+  background-image: url("./vendor/img/ajax-loader.gif");
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 16px;
+  margin-left: 6px;
+  opacity: 0;
+  display: inline-block;
+  transition: opacity 1s;
+}
+.ajax-loader.visible {
+  opacity: 1;
+}
+.embedded-resource-title {
+  font-style: italic;
+}
+.embedded-resource-title:before {
+  content: "\"";
+}
+.embedded-resource-title:after {
+  content: "\"";
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/iiif-processing.xml b/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/iiif-processing.xml
new file mode 100644
index 0000000000..462fc23a0d
--- /dev/null
+++ b/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/iiif-processing.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-lazy-init="true">
+
+    <bean class="org.dspace.iiif.MockIIIFApiQueryServiceImpl" id="org.dspace.iiif.IIIFApiQueryServiceImpl" autowire-candidate="true"/>
+
+</beans>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/rest/scripts.xml b/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/rest/scripts.xml
index ab9826b84d..fd218aa77a 100644
--- a/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/rest/scripts.xml
+++ b/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/rest/scripts.xml
@@ -27,4 +27,20 @@
         <property name="description" value="Delete all the values of the specified metadata field"/>
         <property name="dspaceRunnableClass" value="org.dspace.app.bulkedit.MetadataDeletion"/>
     </bean>
-</beans>
\ No newline at end of file
+
+     <bean id="type-conversion-test" class="org.dspace.app.scripts.TypeConversionTestScriptConfiguration" primary="true">
+        <property name="description" value="Test the type conversion different option types"/>
+        <property name="dspaceRunnableClass" value="org.dspace.app.scripts.TypeConversionTestScript"/>
+    </bean>
+
+    <bean id="import" class="org.dspace.app.itemimport.ItemImportScriptConfiguration" primary="true">
+        <property name="description" value="Batch Import from Simple Archive Format (SAF)" />
+        <property name="dspaceRunnableClass" value="org.dspace.app.itemimport.ItemImport"/>
+    </bean>
+
+    <bean id="export" class="org.dspace.app.itemexport.ItemExportScriptConfiguration" primary="true">
+        <property name="description" value="Batch Export to Simple Archive Format (SAF)"/>
+        <property name="dspaceRunnableClass" value="org.dspace.app.itemexport.ItemExport"/>
+    </bean>
+
+</beans>
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/itemexport/ItemExportIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/itemexport/ItemExportIT.java
new file mode 100644
index 0000000000..6d7cdc560b
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/itemexport/ItemExportIT.java
@@ -0,0 +1,358 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemexport;
+
+import static com.jayway.jsonpath.JsonPath.read;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.codec.CharEncoding;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.file.PathUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.converter.DSpaceRunnableParameterConverter;
+import org.dspace.app.rest.matcher.ProcessMatcher;
+import org.dspace.app.rest.model.ParameterValueRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.BitstreamBuilder;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.ProcessBuilder;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.ProcessStatus;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.ItemService;
+import org.dspace.scripts.DSpaceCommandLineParameter;
+import org.dspace.scripts.Process;
+import org.dspace.scripts.service.ProcessService;
+import org.dspace.services.ConfigurationService;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Basic integration testing for the SAF Export feature via UI {@link ItemExport}.
+ * https://wiki.lyrasis.org/display/DSDOC7x/Importing+and+Exporting+Items+via+Simple+Archive+Format
+ *
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemExportIT extends AbstractControllerIntegrationTest {
+
+    private static final String title = "A Tale of Two Cities";
+    private static final String dateIssued = "1990";
+    private static final String titleAlternative = "J'aime les Printemps";
+
+    @Autowired
+    private ItemService itemService;
+    @Autowired
+    private CollectionService collectionService;
+    @Autowired
+    private ConfigurationService configurationService;
+    @Autowired
+    private ProcessService processService;
+    @Autowired
+    private DSpaceRunnableParameterConverter dSpaceRunnableParameterConverter;
+    private Collection collection;
+    private Path workDir;
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection")
+                .withEntityType("Publication")
+                .build();
+        context.restoreAuthSystemState();
+
+        File file = new File(configurationService.getProperty("org.dspace.app.itemexport.work.dir"));
+        if (!file.exists()) {
+            Files.createDirectory(Path.of(file.getAbsolutePath()));
+        }
+        workDir = Path.of(file.getAbsolutePath());
+    }
+
+    @After
+    @Override
+    public void destroy() throws Exception {
+        for (Path path : Files.list(workDir).collect(Collectors.toList())) {
+            PathUtils.delete(path);
+        }
+        super.destroy();
+    }
+
+    @Test
+    public void exportCollection() throws Exception {
+        // create items
+        context.turnOffAuthorisationSystem();
+        Item item1 = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        Item item2 = ItemBuilder.createItem(context, collection)
+                .withTitle(title + " 2")
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-t", "COLLECTION"));
+        parameters.add(new DSpaceCommandLineParameter("-i", collection.getHandle()));
+        perfomExportScript(parameters);
+
+        checkCollection();
+    }
+
+    @Test
+    public void exportItemWithMetadataOnly() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-t", "ITEM"));
+        parameters.add(new DSpaceCommandLineParameter("-i", item.getHandle()));
+        perfomExportScript(parameters);
+
+        checkItem(item);
+    }
+
+    @Test
+    public void exportItemWithBitstreams() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        // create bitstream
+        String bitstreamContent = "TEST TEST TEST";
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            Bitstream bitstream = BitstreamBuilder.createBitstream(context, item, is)
+                    .withName("Bitstream")
+                    .withMimeType("text/plain")
+                    .build();
+        }
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-t", "ITEM"));
+        parameters.add(new DSpaceCommandLineParameter("-i", item.getHandle()));
+        perfomExportScript(parameters);
+
+        checkItem(item);
+    }
+
+    @Test
+    public void exportItemWithAnotherMetadataSchema() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .withMetadata("dcterms", "title", "", title)
+                .build();
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-t", "ITEM"));
+        parameters.add(new DSpaceCommandLineParameter("-i", item.getHandle()));
+        perfomExportScript(parameters);
+
+        checkItem(item);
+    }
+
+    @Test
+    public void migrateCollection() throws Exception {
+        // create items
+        context.turnOffAuthorisationSystem();
+        Item item1 = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        Item item2 = ItemBuilder.createItem(context, collection)
+                .withTitle(title + " 2")
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-t", "COLLECTION"));
+        parameters.add(new DSpaceCommandLineParameter("-i", collection.getHandle()));
+        parameters.add(new DSpaceCommandLineParameter("-m", ""));
+        perfomExportScript(parameters);
+
+        checkCollection();
+        checkItem(item1);
+        checkItem(item2);
+    }
+
+    @Test
+    public void migrateItemWithMetadataOnly() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-t", "ITEM"));
+        parameters.add(new DSpaceCommandLineParameter("-i", item.getHandle()));
+        parameters.add(new DSpaceCommandLineParameter("-m", ""));
+        perfomExportScript(parameters);
+
+        checkItem(item);
+    }
+
+    @Test
+    public void migrateItemWithBitstreams() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .build();
+        // create bitstream
+        String bitstreamContent = "TEST TEST TEST";
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            Bitstream bitstream = BitstreamBuilder.createBitstream(context, item, is)
+                    .withName("Bitstream")
+                    .withMimeType("text/plain")
+                    .build();
+        }
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-t", "ITEM"));
+        parameters.add(new DSpaceCommandLineParameter("-i", item.getHandle()));
+        parameters.add(new DSpaceCommandLineParameter("-m", ""));
+        perfomExportScript(parameters);
+
+        checkItem(item);
+    }
+
+    @Test
+    public void migrateItemWithAnotherMetadataSchema() throws Exception {
+        // create item
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, collection)
+                .withTitle(title)
+                .withMetadata("dc", "date", "issued", dateIssued)
+                .withMetadata("dc", "title", "alternative", titleAlternative)
+                .withMetadata("dcterms", "title", "", title)
+                .build();
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-t", "ITEM"));
+        parameters.add(new DSpaceCommandLineParameter("-i", item.getHandle()));
+        parameters.add(new DSpaceCommandLineParameter("-m", ""));
+        perfomExportScript(parameters);
+
+        checkItem(item);
+    }
+
+    /**
+     * Check collection exists
+     * @throws Exception
+     */
+    private void checkCollection() throws Exception {
+        assertNotNull(collectionService.find(context, collection.getID()));
+    }
+
+    /**
+     * Check item exists
+     * @param item
+     * @throws Exception
+     */
+    private void checkItem(Item item) throws Exception {
+        assertNotNull(itemService.find(context, item.getID()));
+    }
+
+    private void perfomExportScript(LinkedList<DSpaceCommandLineParameter> parameters)
+            throws Exception {
+        Process process = null;
+
+        List<ParameterValueRest> list = parameters.stream()
+                .map(dSpaceCommandLineParameter -> dSpaceRunnableParameterConverter
+                        .convert(dSpaceCommandLineParameter, Projection.DEFAULT))
+                .collect(Collectors.toList());
+
+        try {
+            AtomicReference<Integer> idRef = new AtomicReference<>();
+            String token = getAuthToken(admin.getEmail(), password);
+
+            getClient(token)
+                .perform(multipart("/api/system/scripts/export/processes")
+                        .param("properties", new ObjectMapper().writeValueAsString(list)))
+                .andExpect(status().isAccepted())
+                .andExpect(jsonPath("$", is(
+                        ProcessMatcher.matchProcess("export",
+                                String.valueOf(admin.getID()), parameters,
+                                ProcessStatus.COMPLETED))))
+                .andDo(result -> idRef
+                    .set(read(result.getResponse().getContentAsString(), "$.processId")));
+
+            process = processService.find(context, idRef.get());
+            checkProcess(process);
+        } finally {
+            ProcessBuilder.deleteProcess(process.getID());
+        }
+    }
+
+    private void checkProcess(Process process) {
+        assertNotNull(process.getBitstreams());
+        assertEquals(2, process.getBitstreams().size());
+        assertEquals(1,
+                process.getBitstreams().stream()
+                .filter(b -> StringUtils.contains(b.getName(), ".log"))
+                .count());
+        assertEquals(1,
+                process.getBitstreams().stream()
+                .filter(b -> StringUtils.contains(b.getName(), ".zip"))
+                .count());
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/itemimport/ItemImportIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/itemimport/ItemImportIT.java
new file mode 100644
index 0000000000..e9b130e703
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/itemimport/ItemImportIT.java
@@ -0,0 +1,260 @@
+/**
+ * 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/
+ */
+package org.dspace.app.itemimport;
+
+import static com.jayway.jsonpath.JsonPath.read;
+import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.file.PathUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.converter.DSpaceRunnableParameterConverter;
+import org.dspace.app.rest.matcher.ProcessMatcher;
+import org.dspace.app.rest.matcher.RelationshipMatcher;
+import org.dspace.app.rest.model.ParameterValueRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.rest.test.AbstractEntityIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.ProcessBuilder;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.ProcessStatus;
+import org.dspace.content.Relationship;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.scripts.DSpaceCommandLineParameter;
+import org.dspace.scripts.Process;
+import org.dspace.scripts.service.ProcessService;
+import org.dspace.services.ConfigurationService;
+import org.hamcrest.Matchers;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockMultipartFile;
+
+/**
+ * Basic integration testing for the SAF Import feature via UI {@link ItemImport}.
+ * https://wiki.lyrasis.org/display/DSDOC7x/Importing+and+Exporting+Items+via+Simple+Archive+Format
+ *
+ * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
+ */
+public class ItemImportIT extends AbstractEntityIntegrationTest {
+
+    private static final String publicationTitle = "A Tale of Two Cities";
+    private static final String personTitle = "Person Test";
+
+    @Autowired
+    private ItemService itemService;
+    @Autowired
+    private RelationshipService relationshipService;
+    @Autowired
+    private ConfigurationService configurationService;
+    @Autowired
+    private ProcessService processService;
+    @Autowired
+    private DSpaceRunnableParameterConverter dSpaceRunnableParameterConverter;
+    private Collection collection;
+    private Path workDir;
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection")
+                .withEntityType("Publication")
+                .build();
+        context.restoreAuthSystemState();
+
+        File file = new File(configurationService.getProperty("org.dspace.app.batchitemimport.work.dir"));
+        if (!file.exists()) {
+            Files.createDirectory(Path.of(file.getAbsolutePath()));
+        }
+        workDir = Path.of(file.getAbsolutePath());
+    }
+
+    @After
+    @Override
+    public void destroy() throws Exception {
+        for (Path path : Files.list(workDir).collect(Collectors.toList())) {
+            PathUtils.delete(path);
+        }
+        super.destroy();
+    }
+
+    @Test
+    public void importItemByZipSafWithBitstreams() throws Exception {
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-a", ""));
+        parameters.add(new DSpaceCommandLineParameter("-c", collection.getID().toString()));
+        parameters.add(new DSpaceCommandLineParameter("-z", "saf-bitstreams.zip"));
+        MockMultipartFile bitstreamFile = new MockMultipartFile("file", "saf-bitstreams.zip",
+                MediaType.APPLICATION_OCTET_STREAM_VALUE, getClass().getResourceAsStream("saf-bitstreams.zip"));
+        perfomImportScript(parameters, bitstreamFile);
+
+        checkMetadata();
+        checkMetadataWithAnotherSchema();
+        checkBitstream();
+    }
+
+    @Test
+    public void importItemByZipSafWithRelationships() throws Exception {
+        context.turnOffAuthorisationSystem();
+        // create collection that contains person
+        Collection collectionPerson = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection Person")
+                .withEntityType("Person")
+                .build();
+        // create person
+        Item person = ItemBuilder.createItem(context, collectionPerson)
+                .withTitle(personTitle)
+                .build();
+        context.restoreAuthSystemState();
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+        parameters.add(new DSpaceCommandLineParameter("-a", ""));
+        parameters.add(new DSpaceCommandLineParameter("-p", ""));
+        parameters.add(new DSpaceCommandLineParameter("-c", collection.getID().toString()));
+        parameters.add(new DSpaceCommandLineParameter("-z", "saf-relationships.zip"));
+        MockMultipartFile bitstreamFile = new MockMultipartFile("file", "saf-relationships.zip",
+                MediaType.APPLICATION_OCTET_STREAM_VALUE, getClass().getResourceAsStream("saf-relationships.zip"));
+        perfomImportScript(parameters, bitstreamFile);
+
+        checkMetadata();
+        checkRelationship();
+    }
+
+    /**
+     * Check metadata on imported item
+     * @throws Exception
+     */
+    private void checkMetadata() throws Exception {
+        Item item = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle).next();
+        getClient().perform(get("/api/core/items/" + item.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.metadata", allOf(
+                        matchMetadata("dc.title", publicationTitle),
+                        matchMetadata("dc.date.issued", "1990"),
+                        matchMetadata("dc.title.alternative", "J'aime les Printemps"))));
+    }
+
+    /**
+     * Check metadata on imported item
+     * @throws Exception
+     */
+    private void checkMetadataWithAnotherSchema() throws Exception {
+        Item item = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle).next();
+        getClient().perform(get("/api/core/items/" + item.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.metadata", allOf(
+                        matchMetadata("dcterms.title", publicationTitle))));
+    }
+
+    /**
+     * Check bitstreams on imported item
+     * @throws Exception
+     */
+    private void checkBitstream() throws Exception {
+        Bitstream bitstream = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle).next()
+                .getBundles("ORIGINAL").get(0).getBitstreams().get(0);
+        getClient().perform(get("/api/core/bitstreams/" + bitstream.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.metadata", allOf(
+                        matchMetadata("dc.title", "file1.txt"))));
+    }
+
+    /**
+     * Check relationships between imported items
+     * @throws Exception
+     */
+    private void checkRelationship() throws Exception {
+        Item item = itemService.findByMetadataField(context, "dc", "title", null, publicationTitle).next();
+        Item author = itemService.findByMetadataField(context, "dc", "title", null, personTitle).next();
+        List<Relationship> relationships = relationshipService.findByItem(context, item);
+        assertEquals(1, relationships.size());
+        getClient().perform(get("/api/core/relationships/" + relationships.get(0).getID()).param("projection", "full"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.leftPlace", is(0)))
+                   .andExpect(jsonPath("$._links.rightItem.href", containsString(author.getID().toString())))
+                   .andExpect(jsonPath("$.rightPlace", is(0)))
+                   .andExpect(jsonPath("$", Matchers.is(RelationshipMatcher.matchRelationship(relationships.get(0)))));
+    }
+
+    private void perfomImportScript(LinkedList<DSpaceCommandLineParameter> parameters, MockMultipartFile bitstreamFile)
+            throws Exception {
+        Process process = null;
+
+        List<ParameterValueRest> list = parameters.stream()
+                .map(dSpaceCommandLineParameter -> dSpaceRunnableParameterConverter
+                        .convert(dSpaceCommandLineParameter, Projection.DEFAULT))
+                .collect(Collectors.toList());
+
+        try {
+            AtomicReference<Integer> idRef = new AtomicReference<>();
+
+            getClient(getAuthToken(admin.getEmail(), password))
+                .perform(multipart("/api/system/scripts/import/processes")
+                        .file(bitstreamFile)
+                        .param("properties", new ObjectMapper().writeValueAsString(list)))
+                .andExpect(status().isAccepted())
+                .andExpect(jsonPath("$", is(
+                        ProcessMatcher.matchProcess("import",
+                                String.valueOf(admin.getID()), parameters,
+                                ProcessStatus.COMPLETED))))
+                .andDo(result -> idRef
+                        .set(read(result.getResponse().getContentAsString(), "$.processId")));
+
+            process = processService.find(context, idRef.get());
+            checkProcess(process);
+        } finally {
+            ProcessBuilder.deleteProcess(process.getID());
+        }
+    }
+
+    private void checkProcess(Process process) {
+        assertNotNull(process.getBitstreams());
+        assertEquals(3, process.getBitstreams().size());
+        assertEquals(1, process.getBitstreams().stream()
+                .filter(b -> StringUtils.equals(b.getName(), ItemImport.MAPFILE_FILENAME))
+                .count());
+        assertEquals(1,
+                process.getBitstreams().stream()
+                .filter(b -> StringUtils.contains(b.getName(), ".log"))
+                .count());
+        assertEquals(1,
+                process.getBitstreams().stream()
+                .filter(b -> StringUtils.contains(b.getName(), ".zip"))
+                .count());
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/matcher/GoogleAnalyticsEventMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/matcher/GoogleAnalyticsEventMatcher.java
new file mode 100644
index 0000000000..6b26944e56
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/matcher/GoogleAnalyticsEventMatcher.java
@@ -0,0 +1,82 @@
+/**
+ * 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/
+ */
+package org.dspace.app.matcher;
+
+import static org.hamcrest.Matchers.any;
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.google.GoogleAnalyticsEvent;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+/**
+ * Matcher for {@link GoogleAnalyticsEvent}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GoogleAnalyticsEventMatcher extends TypeSafeMatcher<GoogleAnalyticsEvent> {
+
+    private final Matcher<String> clientIdMatcher;
+
+    private final Matcher<String> userIpMatcher;
+
+    private final Matcher<String> userAgentMatcher;
+
+    private final Matcher<String> documentReferrerMatcher;
+
+    private final Matcher<String> documentPathMatcher;
+
+    private final Matcher<String> documentTitleMatcher;
+
+    private final Matcher<Long> timeMatcher;
+
+    public static GoogleAnalyticsEventMatcher event(String clientId, String userIp, String userAgent,
+        String documentReferrer, String documentPath, String documentTitle) {
+
+        return new GoogleAnalyticsEventMatcher(is(clientId), is(userIp), is(userAgent),
+            is(documentReferrer), is(documentPath), is(documentTitle), any(Long.class));
+    }
+
+    private GoogleAnalyticsEventMatcher(Matcher<String> clientIdMatcher, Matcher<String> userIpMatcher,
+        Matcher<String> userAgentMatcher, Matcher<String> documentReferrerMatcher, Matcher<String> documentPathMatcher,
+        Matcher<String> documentTitleMatcher, Matcher<Long> timeMatcher) {
+        this.clientIdMatcher = clientIdMatcher;
+        this.userIpMatcher = userIpMatcher;
+        this.userAgentMatcher = userAgentMatcher;
+        this.documentReferrerMatcher = documentReferrerMatcher;
+        this.documentPathMatcher = documentPathMatcher;
+        this.documentTitleMatcher = documentTitleMatcher;
+        this.timeMatcher = timeMatcher;
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("a Google Analytics event with the following attributes:")
+            .appendText(" client id ").appendDescriptionOf(clientIdMatcher)
+            .appendText(", user ip address ").appendDescriptionOf(userIpMatcher)
+            .appendText(", user agent ").appendDescriptionOf(userAgentMatcher)
+            .appendText(", document referrer ").appendDescriptionOf(documentReferrerMatcher)
+            .appendText(", document path ").appendDescriptionOf(documentPathMatcher)
+            .appendText(", document title ").appendDescriptionOf(documentTitleMatcher)
+            .appendText(" and time ").appendDescriptionOf(timeMatcher);
+    }
+
+    @Override
+    protected boolean matchesSafely(GoogleAnalyticsEvent event) {
+        return clientIdMatcher.matches(event.getClientId())
+            && userIpMatcher.matches(event.getUserIp())
+            && userAgentMatcher.matches(event.getUserAgent())
+            && documentReferrerMatcher.matches(event.getDocumentReferrer())
+            && documentPathMatcher.matches(event.getDocumentPath())
+            && documentTitleMatcher.matches(event.getDocumentTitle())
+            && timeMatcher.matches(event.getTime());
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/matcher/MetadataValueMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/matcher/MetadataValueMatcher.java
new file mode 100644
index 0000000000..7d3c9cc454
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/matcher/MetadataValueMatcher.java
@@ -0,0 +1,96 @@
+/**
+ * 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/
+ */
+package org.dspace.app.matcher;
+
+import java.util.Objects;
+
+import org.dspace.content.MetadataValue;
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+
+/**
+ * Implementation of {@link org.hamcrest.Matcher} to match a MetadataValue by
+ * all its attributes.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class MetadataValueMatcher extends TypeSafeMatcher<MetadataValue> {
+
+    private String field;
+
+    private String value;
+
+    private String language;
+
+    private String authority;
+
+    private Integer place;
+
+    private Integer confidence;
+
+    private MetadataValueMatcher(String field, String value, String language, String authority, Integer place,
+                                 Integer confidence) {
+
+        this.field = field;
+        this.value = value;
+        this.language = language;
+        this.authority = authority;
+        this.place = place;
+        this.confidence = confidence;
+
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("MetadataValue with the following attributes [field=" + field + ", value="
+            + value + ", language=" + language + ", authority=" + authority + ", place=" + place + ", confidence="
+            + confidence + "]");
+    }
+
+    @Override
+    protected void describeMismatchSafely(MetadataValue item, Description mismatchDescription) {
+        mismatchDescription.appendText("was ")
+                .appendValue("MetadataValue [metadataField=").appendValue(item.getMetadataField().toString('.'))
+                .appendValue(", value=").appendValue(item.getValue()).appendValue(", language=").appendValue(language)
+                .appendValue(", place=").appendValue(item.getPlace()).appendValue(", authority=")
+                .appendValue(item.getAuthority()).appendValue(", confidence=").appendValue(item.getConfidence() + "]");
+    }
+
+    @Override
+    protected boolean matchesSafely(MetadataValue metadataValue) {
+        return Objects.equals(metadataValue.getValue(), value) &&
+            Objects.equals(metadataValue.getMetadataField().toString('.'), field) &&
+            Objects.equals(metadataValue.getLanguage(), language) &&
+            Objects.equals(metadataValue.getAuthority(), authority) &&
+            Objects.equals(metadataValue.getPlace(), place) &&
+            Objects.equals(metadataValue.getConfidence(), confidence);
+    }
+
+    public static MetadataValueMatcher with(String field, String value, String language,
+        String authority, Integer place, Integer confidence) {
+        return new MetadataValueMatcher(field, value, language, authority, place, confidence);
+    }
+
+    public static MetadataValueMatcher with(String field, String value) {
+        return with(field, value, null, null, 0, -1);
+    }
+
+    public static MetadataValueMatcher with(String field, String value, String authority, int place, int confidence) {
+        return with(field, value, null, authority, place, confidence);
+    }
+
+    public static MetadataValueMatcher with(String field, String value, String authority, int confidence) {
+        return with(field, value, null, authority, 0, confidence);
+    }
+
+    public static MetadataValueMatcher with(String field, String value, int place) {
+        return with(field, value, null, null, place, -1);
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/oai/OAIpmhIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/oai/OAIpmhIT.java
index 052c363771..22ece756fe 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/oai/OAIpmhIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/oai/OAIpmhIT.java
@@ -63,9 +63,9 @@ public class OAIpmhIT extends AbstractControllerIntegrationTest {
     private ConfigurationService configurationService;
 
     // All OAI-PMH paths that we test against
-    private final String ROOT_PATH = "/oai";
+    private final String ROOT_PATH = "/oai/";
     private final String DEFAULT_CONTEXT_PATH = "request";
-    private final String DEFAULT_CONTEXT = ROOT_PATH + "/" + DEFAULT_CONTEXT_PATH;
+    private final String DEFAULT_CONTEXT = ROOT_PATH + DEFAULT_CONTEXT_PATH;
 
     // Mock to ensure XOAI caching is disabled for all tests (see @Before method)
     @MockBean
@@ -153,8 +153,8 @@ public class OAIpmhIT extends AbstractControllerIntegrationTest {
         getClient().perform(get(DEFAULT_CONTEXT).param("verb", "Identify"))
                    // Expect a 200 response code
                    .andExpect(status().isOk())
-                   // Expect the content type to be "text/xml"
-                   .andExpect(content().contentType("text/xml"))
+                   // Expect the content type to be "text/xml;charset=UTF-8"
+                   .andExpect(content().contentType("text/xml;charset=UTF-8"))
                    // Expect <scheme>oai</scheme>
                    .andExpect(xpath("OAI-PMH/Identify/description/oai-identifier/scheme").string("oai"))
                    // Expect protocol version 2.0
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledIT.java
index a757ecbca3..6132544c61 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledIT.java
@@ -40,8 +40,8 @@ public class OpenSearchControllerDisabledIT extends AbstractControllerIntegratio
                                 .param("query", "dog"))
                    //The status has to be 404 Not Found
                    .andExpect(status().isNotFound())
-                   //We expect the content type to be "application/html"
-                   .andExpect(content().contentType("text/html"))
+                   //We expect the content type to be "text/html"
+                   .andExpect(content().contentType("text/html;charset=UTF-8"))
                    .andExpect(content().string("OpenSearch Service is disabled"))
         ;
     }
@@ -52,7 +52,7 @@ public class OpenSearchControllerDisabledIT extends AbstractControllerIntegratio
         getClient().perform(get("/opensearch/service"))
                    //The status has to be 404 Not Found
                    .andExpect(status().isNotFound())
-                   .andExpect(content().contentType("text/html"))
+                   .andExpect(content().contentType("text/html;charset=UTF-8"))
                    .andExpect(content().string("OpenSearch Service is disabled"))
         ;
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/opensearch/OpenSearchControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/opensearch/OpenSearchControllerIT.java
index 9f7e4e6610..ac03e946e3 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/opensearch/OpenSearchControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/opensearch/OpenSearchControllerIT.java
@@ -54,20 +54,7 @@ public class OpenSearchControllerIT extends AbstractControllerIntegrationTest {
         ;
     }
 
-    // HTML is an open issue in OpenSearch, so skip this test at the moment
-    @Test
-    @Ignore
-    public void searchHtmlTest() throws Exception {
-        //When we call the root endpoint
-        getClient().perform(get("/opensearch/search")
-                                .param("query", "cats")
-                                .param("format", "html"))
-                   //The status has to be 200 OK
-                   .andExpect(status().isOk())
-                   //We expect the content type to be "application/atom+xml;charset=UTF-8"
-                   .andExpect(content().contentType("text/html;charset=UTF-8"))
-        ;
-    }
+    // there is no searchHtmlTest here as the html search is redirected to the angular UI
 
     @Test
     public void searchRssTest() throws Exception {
@@ -197,21 +184,53 @@ public class OpenSearchControllerIT extends AbstractControllerIntegrationTest {
         ;
     }
 
+    @Test
+    public void validSortTest() throws Exception {
+        //When we call the root endpoint
+        getClient().perform(get("/opensearch/search")
+                                .param("query", "")
+                                .param("sort", "dc.date.issued"))
+                   //The status has to be 200 OK
+                   .andExpect(status().isOk())
+                   //We expect the content type to be "application/atom+xml;charset=UTF-8"
+                   .andExpect(content().contentType("application/atom+xml;charset=UTF-8"))
+                   .andExpect(xpath("feed/totalResults").string("0"))
+        ;
+    }
+
+    @Test
+    public void invalidSortTest() throws Exception {
+        //When we call the root endpoint
+        getClient().perform(get("/opensearch/search")
+                                .param("query", "")
+                                .param("sort", "dc.invalid.field"))
+                   //We get an exception for such a sort field
+                   //The status has to be 400 ERROR
+                   .andExpect(status().is(400))
+        ;
+    }
+
     @Test
     public void serviceDocumentTest() throws Exception {
         //When we call the root endpoint
         getClient().perform(get("/opensearch/service"))
-                   //The status has to be 200 OK
-                   .andExpect(status().isOk())
-                   // and the contentType has to be an opensearchdescription
-                   .andExpect(content().contentType("application/opensearchdescription+xml;charset=UTF-8"))
-                   // and there need to be some values taken from the test configuration
-                   .andExpect(xpath("OpenSearchDescription/ShortName").string("DSpace"))
-                   .andExpect(xpath("OpenSearchDescription/LongName").string("DSpace at My University"))
-                   .andExpect(xpath("OpenSearchDescription/Description")
-                       .string("DSpace at My University DSpace repository")
-        )
-        ;
+                // The status has to be 200 OK
+                .andExpect(status().isOk())
+                // and the contentType has to be an opensearchdescription
+                .andExpect(content().contentType("application/opensearchdescription+xml;charset=UTF-8"))
+                // and there need to be some values taken from the test configuration
+                .andExpect(xpath("OpenSearchDescription/ShortName").string("DSpace"))
+                .andExpect(xpath("OpenSearchDescription/LongName").string("DSpace at My University"))
+                .andExpect(xpath("OpenSearchDescription/Description")
+                        .string("DSpace at My University DSpace repository"))
+                .andExpect(xpath("OpenSearchDescription/Url[@type='text/html']/@template")
+                        .string("http://localhost:4000/search?query={searchTerms}"))
+                .andExpect(xpath("OpenSearchDescription/Url[@type='application/atom+xml; charset=UTF-8']/@template")
+                        .string("http://localhost/opensearch/search?"
+                                + "query={searchTerms}&start={startIndex?}&rpp={count?}&format=atom"))
+                .andExpect(xpath("OpenSearchDescription/Url[@type='application/rss+xml; charset=UTF-8']/@template")
+                        .string("http://localhost/opensearch/search?"
+                                + "query={searchTerms}&start={startIndex?}&rpp={count?}&format=rss"));
         /* Expected response for the service document is:
             <?xml version="1.0" encoding="UTF-8"?>
             <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
@@ -224,9 +243,9 @@ public class OpenSearchControllerIT extends AbstractControllerIntegrationTest {
                 <Tags>IR DSpace</Tags>
                 <Contact>dspace-help@myu.edu</Contact>
                 <Image height="16" width="16" type="image/vnd.microsoft.icon">http://www.dspace.org/images/favicon.ico</Image>
-                <Url type="text/html" template="http://localhost:8080/simple-search?query={searchTerms}" />
-                <Url type="application/atom+xml; charset=UTF-8" template="http://localhost:8080/open-search/?query={searchTerms}&amp;start={startIndex?}&amp;rpp={count?}&amp;format=atom" />
-                <Url type="application/rss+xml; charset=UTF-8" template="http://localhost:8080/open-search/?query={searchTerms}&amp;start={startIndex?}&amp;rpp={count?}&amp;format=rss" />
+                <Url type="text/html" template="http://localhost:4000/search?query={searchTerms}" />
+                <Url type="application/atom+xml; charset=UTF-8" template="http://localhost:8080/server/opensearch/search?query={searchTerms}&amp;start={startIndex?}&amp;rpp={count?}&amp;format=atom" />
+                <Url type="application/rss+xml; charset=UTF-8" template="http://localhost:8080/server/opensearch/search?query={searchTerms}&amp;start={startIndex?}&amp;rpp={count?}&amp;format=rss" />
             </OpenSearchDescription>
         */
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ADSImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ADSImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..4878cdecab
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ADSImportMetadataSourceServiceIT.java
@@ -0,0 +1,274 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Item;
+import org.dspace.importer.external.ads.ADSImportMetadataSourceServiceImpl;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link ADSImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class ADSImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private LiveImportClientImpl liveImportClient;
+
+    @Autowired
+    private ADSImportMetadataSourceServiceImpl adsServiceImpl;
+
+    @Test
+    public void adsImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream file = getClass().getResourceAsStream("ads-ex.json")) {
+
+            String adsJsonResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClient.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(adsJsonResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = adsServiceImpl.getRecords("test query", 0, 2);
+            assertEquals(2, recordsImported.size());
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void adsImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream file = getClass().getResourceAsStream("ads-ex.json")) {
+            String adsResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClient.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(adsResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = adsServiceImpl.getRecordsCount("test query");
+            assertEquals(9383, tot);
+        } finally {
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void adsImportMetadataGetRecordsCountByQueryTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream file = getClass().getResourceAsStream("ads-ex.json")) {
+            String adsResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClient.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(adsResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            Query q = new Query();
+            q.addParameter("query", "test");
+            int tot = adsServiceImpl.getRecordsCount(q);
+            assertEquals(9383, tot);
+        } finally {
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test(expected = MethodNotFoundException.class)
+    public void adsImportMetadataFindMatchingRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        org.dspace.content.Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                                              .withName("Collection 1")
+                                                              .build();
+
+        Item testItem = ItemBuilder.createItem(context, col1)
+                                   .withTitle("test item")
+                                   .withIssueDate("2021")
+                                   .build();
+        context.restoreAuthSystemState();
+        adsServiceImpl.findMatchingRecords(testItem);
+    }
+
+    @Test
+    public void adsImportMetadataGetRecordByIdTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream file = getClass().getResourceAsStream("ads-single-obj.json")) {
+
+            String adsJsonResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClient.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(adsJsonResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            collection2match.remove(1);
+            ImportRecord recordImported = adsServiceImpl.getRecord("2017PhRvL.119p1101A");
+            assertNotNull(recordImported);
+            matchRecords(new ArrayList<ImportRecord>(Arrays.asList(recordImported)), collection2match);
+        } finally {
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        //define first record
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "Abbott, B. P.");
+        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "Babak, S.");
+        MetadatumDTO author3 = createMetadatumDTO("dc", "contributor", "author", "Di Fiore, L.");
+        MetadatumDTO author4 = createMetadatumDTO("dc", "contributor", "author", "Virgo Collaboration");
+        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", "doi", "10.1103/PhysRevLett.116.061102");
+        MetadatumDTO type = createMetadatumDTO("dc", "type", null, "article");
+        MetadatumDTO adsbibcode = createMetadatumDTO("dc", "identifier", "other", "2016PhRvL.116f1102A");
+        MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2016");
+        MetadatumDTO subject = createMetadatumDTO("dc", "subject", null, "General Relativity and Quantum Cosmology");
+        MetadatumDTO subject2 = createMetadatumDTO("dc", "subject", null,
+                "Astrophysics - High Energy Astrophysical Phenomena");
+        MetadatumDTO source = createMetadatumDTO("dc", "source", null, "Physical Review Letters");
+        MetadatumDTO title = createMetadatumDTO("dc", "title", null,
+                "Observation of Gravitational Waves from a Binary Black Hole Merger");
+        MetadatumDTO description = createMetadatumDTO("dc", "description", "abstract",
+                "On September 14, 2015 at 09:50:45 UTC the two detectors of the Laser"
+              + " Interferometer Gravitational-Wave Observatory simultaneously observed"
+              + " a transient gravitational-wave signal. The signal sweeps upwards in frequency"
+              + " from 35 to 250 Hz with a peak gravitational-wave strain of 1.0 ×10<SUP>-21</SUP>."
+              + " It matches the waveform predicted by general relativity for the inspiral and merger"
+              + " of a pair of black holes and the ringdown of the resulting single black hole."
+              + " The signal was observed with a matched-filter signal-to-noise ratio of 24 and a false"
+              + " alarm rate estimated to be less than 1 event per 203 000 years, equivalent to a significance"
+              + " greater than 5.1 σ . The source lies at a luminosity distance of 41 0<SUB>-180</SUB><SUP>+160</SUP>"
+              + " Mpc corresponding to a redshift z =0.0 9<SUB>-0.04</SUB><SUP>+0.03</SUP> ."
+              + " In the source frame, the initial black hole masses are 3 6<SUB>-4</SUB><SUP>+5</SUP>M<SUB>⊙</SUB>"
+              + " and 2 9<SUB>-4</SUB><SUP>+4</SUP>M<SUB>⊙</SUB> , and the final black hole mass is"
+              + " 6 2<SUB>-4</SUB><SUP>+4</SUP>M<SUB>⊙</SUB> , with 3. 0<SUB>-0.5</SUB><SUP>+0.5</SUP>M<SUB>⊙</SUB>"
+              + " c<SUP>2</SUP> radiated in gravitational waves. All uncertainties define 90% credible intervals."
+              + " These observations demonstrate the existence of binary stellar-mass black hole systems."
+              + " This is the first direct detection of gravitational waves and the first observation of a binary"
+              + " black hole merger.");
+
+        metadatums.add(description);
+        metadatums.add(author);
+        metadatums.add(author2);
+        metadatums.add(author3);
+        metadatums.add(author4);
+        metadatums.add(doi);
+        metadatums.add(type);
+        metadatums.add(adsbibcode);
+        metadatums.add(date);
+        metadatums.add(subject);
+        metadatums.add(subject2);
+        metadatums.add(source);
+        metadatums.add(title);
+
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO author5 = createMetadatumDTO("dc", "contributor", "author", "Abbott, B. P.");
+        MetadatumDTO author6 = createMetadatumDTO("dc", "contributor", "author", "Babak, S.");
+        MetadatumDTO author7 = createMetadatumDTO("dc", "contributor", "author", "Vorvick, C.");
+        MetadatumDTO author8 = createMetadatumDTO("dc", "contributor", "author", "Wade, M.");
+        MetadatumDTO doi2 = createMetadatumDTO("dc", "identifier", "doi", "10.1103/PhysRevLett.119.161101");
+        MetadatumDTO type2 = createMetadatumDTO("dc", "type", null, "article");
+        MetadatumDTO adsbibcode2 = createMetadatumDTO("dc", "identifier", "other", "2017PhRvL.119p1101A");
+        MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2017");
+        MetadatumDTO subject3 = createMetadatumDTO("dc", "subject", null, "General Relativity and Quantum Cosmology");
+        MetadatumDTO subject4 = createMetadatumDTO("dc", "subject", null,
+                "Astrophysics - High Energy Astrophysical Phenomena");
+        MetadatumDTO source2 = createMetadatumDTO("dc", "source", null, "Physical Review Letters");
+        MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
+                "GW170817: Observation of Gravitational Waves from a Binary Neutron Star Inspiral");
+        MetadatumDTO description2 = createMetadatumDTO("dc", "description", "abstract",
+                "On August 17, 2017 at 12∶41:04 UTC the Advanced LIGO and Advanced Virgo"
+              + " gravitational-wave detectors made their first observation of a binary neutron star inspiral."
+              + " The signal, GW170817, was detected with a combined signal-to-noise ratio of 32.4 and a"
+              + " false-alarm-rate estimate of less than one per 8.0 ×10<SUP>4</SUP> years ."
+              + " We infer the component masses of the binary to be between 0.86 and 2.26 M<SUB>⊙</SUB> ,"
+              + " in agreement with masses of known neutron stars. Restricting the component spins to the"
+              + " range inferred in binary neutron stars, we find the component masses to be in the"
+              + " range 1.17 - 1.60 M<SUB>⊙</SUB> , with the total mass of the system 2.7"
+              + " 4<SUB>-0.01</SUB><SUP>+0.04</SUP>M<SUB>⊙</SUB> . The source was localized within a sky region"
+              + " of 28 deg<SUP>2</SUP> (90% probability) and had a luminosity distance of 4"
+              + " 0<SUB>-14</SUB><SUP>+8</SUP> Mpc , the closest and most precisely localized"
+              + " gravitational-wave signal yet. The association with the γ -ray burst GRB 170817A,"
+              + " detected by Fermi-GBM 1.7 s after the coalescence, corroborates the hypothesis of a neutron"
+              + " star merger and provides the first direct evidence of a link between these mergers and"
+              + " short γ -ray bursts. Subsequent identification of transient counterparts across the"
+              + " electromagnetic spectrum in the same location further supports the interpretation of"
+              + " this event as a neutron star merger. This unprecedented joint gravitational and"
+              + " electromagnetic observation provides insight into astrophysics, dense matter,"
+              + " gravitation, and cosmology.");
+
+        metadatums2.add(description2);
+        metadatums2.add(author5);
+        metadatums2.add(author6);
+        metadatums2.add(author7);
+        metadatums2.add(author8);
+        metadatums2.add(doi2);
+        metadatums2.add(type2);
+        metadatums2.add(adsbibcode2);
+        metadatums2.add(date2);
+        metadatums2.add(subject3);
+        metadatums2.add(subject4);
+        metadatums2.add(source2);
+        metadatums2.add(title2);
+
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AbstractLiveImportIntegrationTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AbstractLiveImportIntegrationTest.java
new file mode 100644
index 0000000000..cf3e125cc5
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AbstractLiveImportIntegrationTest.java
@@ -0,0 +1,100 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.ProtocolVersion;
+import org.apache.http.StatusLine;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.entity.BasicHttpEntity;
+import org.apache.tools.ant.filters.StringInputStream;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+
+/**
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class AbstractLiveImportIntegrationTest extends AbstractControllerIntegrationTest {
+
+    protected void matchRecords(ArrayList<ImportRecord> recordsImported, ArrayList<ImportRecord> records2match) {
+        assertEquals(records2match.size(), recordsImported.size());
+        for (int i = 0; i < recordsImported.size(); i++) {
+            ImportRecord imported = recordsImported.get(i);
+            ImportRecord toMatch = records2match.get(i);
+            checkMetadataValue(imported.getValueList(), toMatch.getValueList());
+        }
+    }
+
+    private void checkMetadataValue(List<MetadatumDTO> list, List<MetadatumDTO> list2) {
+        assertEquals(list.size(), list2.size());
+        for (int i = 0; i < list.size(); i++) {
+            assertTrue(sameMetadatum(list.get(i), list2.get(i)));
+        }
+    }
+
+    private boolean sameMetadatum(MetadatumDTO metadatum, MetadatumDTO metadatum2) {
+        if (StringUtils.equals(metadatum.getSchema(), metadatum2.getSchema()) &&
+            StringUtils.equals(metadatum.getElement(), metadatum2.getElement()) &&
+            StringUtils.equals(metadatum.getQualifier(), metadatum2.getQualifier()) &&
+            StringUtils.equals(metadatum.getValue(), metadatum2.getValue())) {
+            return true;
+        }
+        return false;
+    }
+
+    protected MetadatumDTO createMetadatumDTO(String schema, String element, String qualifier, String value) {
+        MetadatumDTO metadatumDTO = new MetadatumDTO();
+        metadatumDTO.setSchema(schema);
+        metadatumDTO.setElement(element);
+        metadatumDTO.setQualifier(qualifier);
+        metadatumDTO.setValue(value);
+        return metadatumDTO;
+    }
+
+    protected CloseableHttpResponse mockResponse(String xmlExample, int statusCode, String reason)
+            throws UnsupportedEncodingException {
+        BasicHttpEntity basicHttpEntity = new BasicHttpEntity();
+        basicHttpEntity.setChunked(true);
+        basicHttpEntity.setContent(new StringInputStream(xmlExample));
+
+        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+        when(response.getStatusLine()).thenReturn(statusLine(statusCode, reason));
+        when(response.getEntity()).thenReturn(basicHttpEntity);
+        return response;
+    }
+
+    protected StatusLine statusLine(int statusCode, String reason) {
+        return new StatusLine() {
+            @Override
+            public ProtocolVersion getProtocolVersion() {
+                return new ProtocolVersion("http", 1, 1);
+            }
+
+            @Override
+            public int getStatusCode() {
+                return statusCode;
+            }
+
+            @Override
+            public String getReasonPhrase() {
+                return reason;
+            }
+        };
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
index 2dc6055909..19f0d9d267 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
@@ -19,6 +19,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -48,11 +50,14 @@ import org.dspace.app.rest.converter.EPersonConverter;
 import org.dspace.app.rest.matcher.AuthenticationStatusMatcher;
 import org.dspace.app.rest.matcher.AuthorizationMatcher;
 import org.dspace.app.rest.matcher.EPersonMatcher;
+import org.dspace.app.rest.matcher.GroupMatcher;
 import org.dspace.app.rest.matcher.HalMatcher;
+import org.dspace.app.rest.model.AuthnRest;
 import org.dspace.app.rest.model.EPersonRest;
 import org.dspace.app.rest.projection.DefaultProjection;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.app.rest.utils.Utils;
+import org.dspace.authenticate.OrcidAuthenticationBean;
 import org.dspace.builder.BitstreamBuilder;
 import org.dspace.builder.BundleBuilder;
 import org.dspace.builder.CollectionBuilder;
@@ -66,6 +71,9 @@ import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
 import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
 import org.junit.Before;
@@ -93,11 +101,18 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
     @Autowired
     private AuthorizationFeatureService authorizationFeatureService;
 
+    @Autowired
+    private OrcidConfiguration orcidConfiguration;
+
+    @Autowired
+    private OrcidAuthenticationBean orcidAuthentication;
+
     @Autowired
     private Utils utils;
 
     public static final String[] PASS_ONLY = {"org.dspace.authenticate.PasswordAuthentication"};
     public static final String[] SHIB_ONLY = {"org.dspace.authenticate.ShibAuthentication"};
+    public static final String[] ORCID_ONLY = { "org.dspace.authenticate.OrcidAuthentication" };
     public static final String[] SHIB_AND_PASS = {
         "org.dspace.authenticate.ShibAuthentication",
         "org.dspace.authenticate.PasswordAuthentication"
@@ -106,6 +121,10 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
         "org.dspace.authenticate.IPAuthentication",
         "org.dspace.authenticate.ShibAuthentication"
     };
+    public static final String[] PASS_AND_IP = {
+            "org.dspace.authenticate.PasswordAuthentication",
+            "org.dspace.authenticate.IPAuthentication"
+        };
 
     // see proxies.trusted.ipranges in local.cfg
     public static final String TRUSTED_IP = "7.7.7.7";
@@ -113,6 +132,7 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
 
     private Authorization authorization;
     private EPersonRest ePersonRest;
+    private EPersonRest adminRest;
     private final String feature = CanChangePasswordFeature.NAME;
 
 
@@ -132,6 +152,10 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
     public void testStatusAuthenticatedAsAdmin() throws Exception {
         String token = getAuthToken(admin.getEmail(), password);
 
+        AuthorizationFeature canChangePasswordFeature = authorizationFeatureService.find(CanChangePasswordFeature.NAME);
+        adminRest = ePersonConverter.convert(context.reloadEntity(admin), DefaultProjection.DEFAULT);
+        authorization = new Authorization(admin, canChangePasswordFeature, adminRest);
+
         getClient(token).perform(get("/api/authn/status").param("projection", "full"))
                         .andExpect(status().isOk())
                         .andExpect(jsonPath("$", AuthenticationStatusMatcher.matchFullEmbeds()))
@@ -160,6 +184,101 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
                         .andExpect(status().isNoContent());
     }
 
+    /**
+     * This test verifies:
+     * - that a logged in via password user finds the expected specialGroupPwd in _embedded.specialGroups;
+     * - that a logged in via password and specific IP user finds the expected specialGroupPwd and specialGroupIP
+     *   in _embedded.specialGroups;
+     * - that a not logged in user with a specific IP finds the expected specialGroupIP in _embedded.specialGroups;
+     * @throws Exception
+     */
+    @Test
+    public void testStatusGetSpecialGroups() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group specialGroupPwd = GroupBuilder.createGroup(context)
+                .withName("specialGroupPwd")
+                .build();
+        Group specialGroupIP = GroupBuilder.createGroup(context)
+               .withName("specialGroupIP")
+               .build();
+
+        configurationService.setProperty("plugin.sequence.org.dspace.authenticate.AuthenticationMethod", PASS_AND_IP);
+        configurationService.setProperty("authentication-password.login.specialgroup","specialGroupPwd");
+        configurationService.setProperty("authentication-ip.specialGroupIP", "123.123.123.123");
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(eperson.getEmail(), password);
+
+        getClient(token).perform(get("/api/authn/status").param("projection", "full"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", AuthenticationStatusMatcher.matchFullEmbeds()))
+            .andExpect(jsonPath("$", AuthenticationStatusMatcher.matchLinks()))
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$.okay", is(true)))
+            .andExpect(jsonPath("$.authenticated", is(true)))
+            .andExpect(jsonPath("$.authenticationMethod", is("password")))
+            .andExpect(jsonPath("$.type", is("status")))
+            .andExpect(jsonPath("$._links.specialGroups.href", startsWith(REST_SERVER_URL)))
+            .andExpect(jsonPath("$._embedded.specialGroups._embedded.specialGroups",
+                Matchers.containsInAnyOrder(
+                        GroupMatcher.matchGroupWithName("specialGroupPwd"))));
+
+        // try the special groups link endpoint in the same scenario than above
+        getClient(token).perform(get("/api/authn/status/specialGroups").param("projection", "full"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.specialGroups",
+                Matchers.containsInAnyOrder(
+                        GroupMatcher.matchGroupWithName("specialGroupPwd"))));
+
+        getClient(token).perform(get("/api/authn/status").param("projection", "full")
+                .with(ip("123.123.123.123")))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", AuthenticationStatusMatcher.matchFullEmbeds()))
+            .andExpect(jsonPath("$", AuthenticationStatusMatcher.matchLinks()))
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$.okay", is(true)))
+            .andExpect(jsonPath("$.authenticated", is(true)))
+            .andExpect(jsonPath("$.authenticationMethod", is("password")))
+            .andExpect(jsonPath("$.type", is("status")))
+            .andExpect(jsonPath("$._links.specialGroups.href", startsWith(REST_SERVER_URL)))
+            .andExpect(jsonPath("$._embedded.specialGroups._embedded.specialGroups",
+                    Matchers.containsInAnyOrder(
+                            GroupMatcher.matchGroupWithName("specialGroupPwd"),
+                            GroupMatcher.matchGroupWithName("specialGroupIP"))));
+
+        // try the special groups link endpoint in the same scenario than above
+        getClient(token).perform(get("/api/authn/status/specialGroups").param("projection", "full")
+                .with(ip("123.123.123.123")))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.specialGroups",
+                Matchers.containsInAnyOrder(
+                        GroupMatcher.matchGroupWithName("specialGroupPwd"),
+                        GroupMatcher.matchGroupWithName("specialGroupIP"))));
+
+        getClient().perform(get("/api/authn/status").param("projection", "full").with(ip("123.123.123.123")))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", AuthenticationStatusMatcher.matchFullEmbeds()))
+            // fails due to bug https://github.com/DSpace/DSpace/issues/8274
+            //.andExpect(jsonPath("$", AuthenticationStatusMatcher.matchLinks()))
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$.okay", is(true)))
+            .andExpect(jsonPath("$.authenticated", is(false)))
+            .andExpect(jsonPath("$._embedded.specialGroups._embedded.specialGroups",
+                    Matchers.containsInAnyOrder(GroupMatcher.matchGroupWithName("specialGroupIP"))));
+
+        // try the special groups link endpoint in the same scenario than above
+        getClient().perform(get("/api/authn/status/specialGroups").param("projection", "full")
+                .with(ip("123.123.123.123")))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.specialGroups",
+                Matchers.containsInAnyOrder(
+                        GroupMatcher.matchGroupWithName("specialGroupIP"))));
+    }
+
     @Test
     @Ignore
     // Ignored until an endpoint is added to return all groups. Anonymous is not considered a direct group.
@@ -1495,6 +1614,116 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
                 .andExpect(status().isNoContent());
     }
 
+    @Test
+    public void testStatusOrcidAuthenticatedWithCookie() throws Exception {
+
+        configurationService.setProperty("plugin.sequence.org.dspace.authenticate.AuthenticationMethod", ORCID_ONLY);
+
+        String uiURL = configurationService.getProperty("dspace.ui.url");
+
+        context.turnOffAuthorisationSystem();
+
+        String orcid = "0000-1111-2222-3333";
+        String code = "123456";
+        String orcidAccessToken = "c41e37e5-c2de-4177-91d6-ed9e9d1f31bf";
+
+        EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNetId(orcid)
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(true)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        OrcidClient orcidClientMock = mock(OrcidClient.class);
+        when(orcidClientMock.getAccessToken(code)).thenReturn(buildOrcidTokenResponse(orcid, orcidAccessToken));
+
+        OrcidClient originalOrcidClient = orcidAuthentication.getOrcidClient();
+        orcidAuthentication.setOrcidClient(orcidClientMock);
+
+        Cookie authCookie = null;
+
+        try {
+
+            authCookie = getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+                .param("redirectUrl", uiURL)
+                .param("code", code))
+                .andExpect(status().is3xxRedirection())
+                .andExpect(redirectedUrl(uiURL))
+                .andExpect(cookie().doesNotExist("DSPACE-XSRF-COOKIE"))
+                .andExpect(header().doesNotExist("DSPACE-XSRF-TOKEN"))
+                .andExpect(cookie().exists(AUTHORIZATION_COOKIE))
+                .andReturn().getResponse().getCookie(AUTHORIZATION_COOKIE);
+
+        } finally {
+            orcidAuthentication.setOrcidClient(originalOrcidClient);
+        }
+
+        assertNotNull(authCookie);
+        String token = authCookie.getValue();
+
+        getClient().perform(get("/api/authn/status").header("Origin", uiURL)
+            .secure(true)
+            .cookie(authCookie))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$.okay", is(true)))
+            .andExpect(jsonPath("$.authenticated", is(true)))
+            .andExpect(jsonPath("$.authenticationMethod", is("orcid")))
+            .andExpect(jsonPath("$.type", is("status")))
+            .andExpect(cookie().doesNotExist("DSPACE-XSRF-COOKIE"))
+            .andExpect(header().doesNotExist("DSPACE-XSRF-TOKEN"));
+
+        String headerToken = getClient().perform(post("/api/authn/login").header("Origin", uiURL)
+            .secure(true)
+            .cookie(authCookie))
+            .andExpect(status().isOk())
+            .andExpect(cookie().value(AUTHORIZATION_COOKIE, ""))
+            .andExpect(header().exists(AUTHORIZATION_HEADER))
+            .andExpect(cookie().exists("DSPACE-XSRF-COOKIE"))
+            .andExpect(header().exists("DSPACE-XSRF-TOKEN"))
+            .andReturn().getResponse()
+            .getHeader(AUTHORIZATION_HEADER).replace(AUTHORIZATION_TYPE, "");
+
+        assertTrue("Check tokens " + token + " and " + headerToken + " have same claims",
+            tokenClaimsEqual(token, headerToken));
+
+        getClient(headerToken).perform(get("/api/authn/status").header("Origin", uiURL))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$.okay", is(true)))
+            .andExpect(jsonPath("$.authenticated", is(true)))
+            .andExpect(jsonPath("$.authenticationMethod", is("orcid")))
+            .andExpect(jsonPath("$.type", is("status")));
+
+        getClient(headerToken).perform(post("/api/authn/logout").header("Origin", uiURL))
+            .andExpect(status().isNoContent());
+    }
+
+    @Test
+    public void testOrcidLoginURL() throws Exception {
+
+        configurationService.setProperty("plugin.sequence.org.dspace.authenticate.AuthenticationMethod", ORCID_ONLY);
+
+        String originalClientId = orcidConfiguration.getClientId();
+        orcidConfiguration.setClientId("CLIENT-ID");
+
+        try {
+
+            getClient().perform(post("/api/authn/login"))
+                .andExpect(status().isUnauthorized())
+                .andExpect(header().string("WWW-Authenticate",
+                    "orcid realm=\"DSpace REST API\", " +
+                        "location=\"https://sandbox.orcid.org/oauth/authorize?client_id=CLIENT-ID&response_type=code"
+                        + "&scope=/authenticate+/read-limited+/activities/update+/person/update&redirect_uri"
+                        + "=http%3A%2F%2Flocalhost%2Fapi%2Fauthn%2Forcid\""));
+
+        } finally {
+            orcidConfiguration.setClientId(originalClientId);
+        }
+    }
+
     // Get a short-lived token based on an active login token
     private String getShortLivedToken(String loginToken) throws Exception {
         ObjectMapper mapper = new ObjectMapper();
@@ -1591,5 +1820,15 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
             return false;
         }
     }
+
+    private OrcidTokenResponseDTO buildOrcidTokenResponse(String orcid, String accessToken) {
+        OrcidTokenResponseDTO token = new OrcidTokenResponseDTO();
+        token.setAccessToken(accessToken);
+        token.setOrcid(orcid);
+        token.setTokenType("Bearer");
+        token.setName("Test User");
+        token.setScope(String.join(" ", new String[] { "FirstScope", "SecondScope" }));
+        return token;
+    }
 }
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationRestRepositoryIT.java
index cbd32d7d69..c334d110b1 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationRestRepositoryIT.java
@@ -11,6 +11,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
@@ -894,25 +895,25 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
         configurationService.setProperty("org.dspace.app.rest.authorization.AlwaysThrowExceptionFeature.turnoff", true);
         String anotherToken = getAuthToken(anotherEperson.getEmail(), password);
 
-        // verify that he cannot search the admin authorizations - by using the eperson parameter
+        // verify that admin cannot search the admin authorizations - by using the eperson parameter
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .param("eperson", admin.getID().toString()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the admin authorizations - by assuming login
+        // verify that admin cannot search the admin authorizations - by assuming login
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .header("X-On-Behalf-Of", admin.getID()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the authorizations of another "normal" eperson - by using the eperson parameter
+        // verify that eperson cannot search the authorizations of another "normal" eperson - by using the parameter
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .param("eperson", eperson.getID().toString()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the authorizations of another "normal" eperson - by assuming login
+        // verify that eperson cannot search the authorizations of another "normal" eperson - by assuming login
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .header("X-On-Behalf-Of", eperson.getID()))
@@ -1451,28 +1452,28 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
         configurationService.setProperty("org.dspace.app.rest.authorization.AlwaysThrowExceptionFeature.turnoff", true);
         String anotherToken = getAuthToken(anotherEperson.getEmail(), password);
 
-        // verify that he cannot search the admin authorizations - by using the eperson parameter
+        // verify that admin cannot search the admin authorizations - by using the eperson parameter
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .param("feature", alwaysTrue.getName())
                 .param("eperson", admin.getID().toString()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the admin authorizations - by assuming login
+        // verify that admin cannot search the admin authorizations - by assuming login
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .param("feature", alwaysTrue.getName())
                 .header("X-On-Behalf-Of", admin.getID()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the authorizations of another "normal" eperson - by using the eperson parameter
+        // verify that eperson cannot search the authorizations of another "normal" eperson - by using the parameter
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .param("feature", alwaysTrue.getName())
                 .param("eperson", eperson.getID().toString()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the authorizations of another "normal" eperson - by assuming login
+        // verify that eperson cannot search the authorizations of another "normal" eperson - by assuming login
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .param("feature", alwaysTrue.getName())
@@ -1898,6 +1899,205 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             )));
     }
 
+    @Test
+    /**
+     * Verify that the paginated search by multiple objects and features works properly in allowed scenarios:
+     * - for an administrator
+     * - for an administrator that want to inspect permission of the anonymous users or another user
+     * - for a logged-in "normal" user
+     * - for anonymous
+     *
+     * @throws Exception
+     */
+    public void findByMultipleObjectsAndFeaturesPaginationTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community com = CommunityBuilder.createCommunity(context).withName("A test community").build();
+        String comId = com.getID().toString();
+        CommunityRest comRest = communityConverter.convert(com, DefaultProjection.DEFAULT);
+        Community secondCom = CommunityBuilder.createCommunity(context).withName("Another test community").build();
+        String secondComId = secondCom.getID().toString();
+        CommunityRest secondComRest = communityConverter.convert(secondCom, DefaultProjection.DEFAULT);
+
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+
+        // verify that it works for administrators - with eperson parameter
+
+        Supplier<MockHttpServletRequestBuilder> baseFeatureRequest = () ->
+            get("/api/authz/authorizations/search/objects")
+                .param("type", "core.community")
+                .param("uuid", comId)
+                .param("uuid", secondComId)
+                .param("projection", "level")
+                .param("page", "1")
+                .param("size", "1")
+                .param("embedLevelDepth", "1")
+                .param("feature", alwaysTrue.getName())
+                .param("feature", alwaysFalse.getName())
+                .param("feature", trueForLoggedUsers.getName())
+                .param("feature", trueForAdmins.getName());
+
+        getClient(adminToken).perform(baseFeatureRequest.get()
+                                                        .param("eperson", admin.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.size", is(1)))
+                             .andExpect(jsonPath("$.page.totalElements", is(6)))
+                             .andExpect(jsonPath("$.page.totalPages", is(6)))
+                             .andExpect(jsonPath("$.page.number", is(1)))
+                             .andExpect(jsonPath("$._links.prev.href", containsString("page=0")))
+                             .andExpect(jsonPath("$._links.next.href", containsString("page=2")))
+                             .andExpect(jsonPath("$._embedded.authorizations", contains(
+                                 allOf(
+                                     hasJsonPath("$.id",
+                                                 is(admin.getID().toString() +
+                                                        "_" + trueForLoggedUsers.getName() + "_"
+                                                        + comRest.getUniqueType() + "_" + comRest.getId())),
+                                     hasJsonPath("$.type", is("authorization")),
+                                     hasJsonPath("$._embedded.feature.id", is(trueForLoggedUsers.getName())),
+                                     hasJsonPath("$._embedded.eperson.id", is(admin.getID().toString()))
+                                 )
+                             )));
+
+        // verify that it works for administrators - without eperson parameter
+        getClient(adminToken).perform(baseFeatureRequest.get())
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.size", is(1)))
+                             .andExpect(jsonPath("$.page.totalElements", is(6)))
+                             .andExpect(jsonPath("$.page.totalPages", is(6)))
+                             .andExpect(jsonPath("$.page.number", is(1)))
+                             .andExpect(jsonPath("$._links.prev.href", containsString("page=0")))
+                             .andExpect(jsonPath("$._links.next.href", containsString("page=2")))
+                             .andExpect(jsonPath("$._embedded.authorizations", contains(
+                                 allOf(
+                                     hasJsonPath("$.id", is(
+                                         admin.getID().toString() + "_"
+                                             + trueForLoggedUsers.getName() + "_"
+                                             + comRest.getUniqueType() + "_" + comRest.getId()
+                                     )),
+                                     hasJsonPath("$.type", is("authorization")),
+                                     hasJsonPath("$._embedded.feature.id", is(trueForLoggedUsers.getName())),
+                                     hasJsonPath("$._embedded.eperson.id", is(admin.getID().toString()))
+                                 )
+                             )));
+
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+
+        // verify that it works for normal loggedin users - with eperson parameter
+        getClient(epersonToken).perform(baseFeatureRequest.get()
+                                                          .param("eperson", eperson.getID().toString()))
+                               .andExpect(status().isOk())
+                               .andExpect(jsonPath("$.page.size", is(1)))
+                               .andExpect(jsonPath("$.page.totalElements", is(4)))
+                               .andExpect(jsonPath("$.page.totalPages", is(4)))
+                               .andExpect(jsonPath("$.page.number", is(1)))
+                               .andExpect(jsonPath("$._links.prev.href", containsString("page=0")))
+                               .andExpect(jsonPath("$._links.next.href", containsString("page=2")))
+                               .andExpect(jsonPath("$._embedded.authorizations", contains(
+                                   allOf(
+                                       hasJsonPath("$.id", is(
+                                           eperson.getID().toString() + "_"
+                                               + trueForLoggedUsers.getName() + "_"
+                                               + comRest.getUniqueType() + "_" + comRest.getId()
+                                       )),
+                                       hasJsonPath("$.type", is("authorization")),
+                                       hasJsonPath("$._embedded.feature.id", is(trueForLoggedUsers.getName())),
+                                       hasJsonPath("$._embedded.eperson.id", is(eperson.getID().toString()))
+                                   )
+                               )));
+
+        // verify that it works for normal loggedin users - without eperson parameter
+        getClient(epersonToken).perform(baseFeatureRequest.get())
+                               .andExpect(status().isOk())
+                               .andExpect(jsonPath("$.page.size", is(1)))
+                               .andExpect(jsonPath("$.page.totalElements", is(4)))
+                               .andExpect(jsonPath("$.page.totalPages", is(4)))
+                               .andExpect(jsonPath("$.page.number", is(1)))
+                               .andExpect(jsonPath("$._links.prev.href", containsString("page=0")))
+                               .andExpect(jsonPath("$._links.next.href", containsString("page=2")))
+                               .andExpect(jsonPath("$._embedded.authorizations", contains(
+                                   allOf(
+                                       hasJsonPath("$.id", is(
+                                           eperson.getID().toString() + "_"
+                                               + trueForLoggedUsers.getName() + "_"
+                                               + comRest.getUniqueType() + "_" + comRest.getId()
+                                       )),
+                                       hasJsonPath("$.type", is("authorization")),
+                                       hasJsonPath("$._embedded.feature.id", is(trueForLoggedUsers.getName())),
+                                       hasJsonPath("$._embedded.eperson.id", is(eperson.getID().toString()))
+                                   )
+                               )));
+
+        // verify that it works for administators inspecting other users - by using the eperson parameter
+        getClient(adminToken).perform(baseFeatureRequest.get()
+                                                        .param("eperson", eperson.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.size", is(1)))
+                             .andExpect(jsonPath("$.page.totalElements", is(4)))
+                             .andExpect(jsonPath("$.page.totalPages", is(4)))
+                             .andExpect(jsonPath("$.page.number", is(1)))
+                             .andExpect(jsonPath("$._links.prev.href", containsString("page=0")))
+                             .andExpect(jsonPath("$._links.next.href", containsString("page=2")))
+                             .andExpect(jsonPath("$._embedded.authorizations", contains(
+                                 allOf(
+                                     hasJsonPath("$.id", is(
+                                         eperson.getID().toString() + "_"
+                                             + trueForLoggedUsers.getName() + "_"
+                                             + comRest.getUniqueType() + "_" + comRest.getId()
+                                     )),
+                                     hasJsonPath("$.type", is("authorization")),
+                                     hasJsonPath("$._embedded.feature.id", is(trueForLoggedUsers.getName())),
+                                     hasJsonPath("$._embedded.eperson.id", is(eperson.getID().toString()))
+                                 )
+                             )));
+
+        // verify that it works for administators inspecting other users - by assuming login
+        getClient(adminToken).perform(baseFeatureRequest.get()
+                                                        .header("X-On-Behalf-Of", eperson.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.size", is(1)))
+                             .andExpect(jsonPath("$.page.totalElements", is(4)))
+                             .andExpect(jsonPath("$.page.totalPages", is(4)))
+                             .andExpect(jsonPath("$.page.number", is(1)))
+                             .andExpect(jsonPath("$._links.prev.href", containsString("page=0")))
+                             .andExpect(jsonPath("$._links.next.href", containsString("page=2")))
+                             .andExpect(jsonPath("$._embedded.authorizations", contains(
+                                 allOf(
+                                     hasJsonPath("$.id", is(
+                                         eperson.getID().toString() + "_"
+                                             + trueForLoggedUsers.getName() + "_"
+                                             + comRest.getUniqueType() + "_" + comRest.getId()
+                                     )),
+                                     hasJsonPath("$.type", is("authorization")),
+                                     hasJsonPath("$._embedded.feature.id", is(trueForLoggedUsers.getName())),
+                                     hasJsonPath("$._embedded.eperson.id", is(eperson.getID().toString()))
+                                 )
+                             )));
+
+        // verify that it works for anonymous users
+        getClient().perform(baseFeatureRequest.get())
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.page.size", is(1)))
+                   .andExpect(jsonPath("$.page.totalElements", is(2)))
+                   .andExpect(jsonPath("$.page.totalPages", is(2)))
+                   .andExpect(jsonPath("$._links.prev.href", containsString("page=0")))
+                   .andExpect(jsonPath("$._links.next.href").doesNotExist())
+                   .andExpect(jsonPath("$.page.number", is(1)))
+                   .andExpect(jsonPath("$._embedded.authorizations",
+                                       contains(
+                                           allOf(
+                                               hasJsonPath("$.id", is(
+                                                   alwaysTrue.getName() + "_"
+                                                       + secondComRest.getUniqueType() + "_" + secondComRest.getId()
+                                               )),
+                                               hasJsonPath("$.type", is("authorization")),
+                                               hasJsonPath("$._embedded.feature.id", is(alwaysTrue.getName())),
+                                               hasJsonPath("$._embedded.eperson", nullValue())
+                                           )
+                                       )));
+    }
+
     @Test
     /**
      * Verify that the search by many objects and features works return 204 No Content when no feature is granted.
@@ -2308,7 +2508,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
         configurationService.setProperty("org.dspace.app.rest.authorization.AlwaysThrowExceptionFeature.turnoff", true);
         String anotherToken = getAuthToken(anotherEperson.getEmail(), password);
 
-        // verify that he cannot search the admin authorizations - by using the eperson parameter
+        // verify that admin cannot search the admin authorizations - by using the eperson parameter
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/objects")
             .param("type", "core.site")
             .param("uuid", siteId)
@@ -2317,7 +2517,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .param("eperson", admin.getID().toString()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the admin authorizations - by assuming login
+        // verify that admin cannot search the admin authorizations - by assuming login
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/objects")
             .param("type", "core.site")
             .param("uuid", siteId)
@@ -2326,7 +2526,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .header("X-On-Behalf-Of", admin.getID()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the authorizations of another "normal" eperson - by using the eperson parameter
+        // verify that eperson cannot search the authorizations of another "normal" eperson - by using the parameter
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/objects")
             .param("type", "core.site")
             .param("uuid", siteId)
@@ -2335,7 +2535,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .param("eperson", eperson.getID().toString()))
             .andExpect(status().isForbidden());
 
-        // verify that he cannot search the authorizations of another "normal" eperson - by assuming login
+        // verify that eperson cannot search the authorizations of another "normal" eperson - by assuming login
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/objects")
             .param("type", "core.site")
             .param("uuid", siteId)
@@ -2491,7 +2691,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 .param("feature", trueForUsersInGroupTest.getName())
                 .param("eperson", normalUser.getID().toString()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
-        // but he should have the authorization if loggedin directly
+        // but user should have the authorization if loggedin directly
         getClient(normalUserToken).perform(get("/api/authz/authorizations/" + authNormalUserSite.getID()))
             .andExpect(status().isOk());
         getClient(normalUserToken).perform(get("/api/authz/authorizations/search/object")
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamControllerIT.java
index ca3c05ec30..a326d195c2 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamControllerIT.java
@@ -7,6 +7,8 @@
  */
 package org.dspace.app.rest;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE;
 import static org.springframework.http.MediaType.parseMediaType;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -16,6 +18,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 import org.apache.commons.codec.CharEncoding;
@@ -144,47 +148,48 @@ public class BitstreamControllerIT extends AbstractControllerIntegrationTest {
 
         String bitstreamContent = "ThisIsSomeDummyText";
 
-        Bundle bundle1 = BundleBuilder.createBundle(context, publicItem1)
+        List<Bundle> bundles = new ArrayList();
+        bundles.add(BundleBuilder.createBundle(context, publicItem1)
                                       .withName("TEST FIRST BUNDLE")
-                                      .build();
+                                      .build());
 
         Bitstream bitstream = null;
         try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
             bitstream = BitstreamBuilder.
-                                                createBitstream(context, bundle1, is)
+                                                createBitstream(context, bundles.get(0), is)
                                         .withName("Bitstream")
                                         .withDescription("description")
                                         .withMimeType("text/plain")
                                         .build();
         }
 
-        Bundle bundle2 = BundleBuilder.createBundle(context, publicItem1)
+        bundles.add(BundleBuilder.createBundle(context, publicItem1)
                                       .withName("TEST SECOND BUNDLE")
                                       .withBitstream(bitstream)
-                                      .build();
+                                      .build());
 
 
         context.restoreAuthSystemState();
 
+        // While in DSpace code, Bundles are *unordered*, in Hibernate v5 + H2 v2.x, they are returned sorted by UUID.
+        // So, we reorder this list of created Bundles by UUID to get their expected return order.
+        // NOTE: Once on Hibernate v6, this might need "toString()" removed as it may sort UUIDs based on RFC 4412.
+        Comparator<Bundle> compareByUUID = Comparator.comparing(b -> b.getID().toString());
+        bundles.sort(compareByUUID);
+
         String token = getAuthToken(admin.getEmail(), password);
 
+        // Expect only the first Bundle to be returned
         getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/bundle")
                    .param("projection", "full"))
                    .andExpect(status().isOk())
                    .andExpect(content().contentType(contentType))
                    .andExpect(jsonPath("$", Matchers.is(
-                           BundleMatcher.matchBundle(bundle1.getName(),
-                                                     bundle1.getID(),
-                                                     bundle1.getHandle(),
-                                                     bundle1.getType(),
-                                                     bundle1.getBitstreams())
-
-                   ))).andExpect(jsonPath("$", Matchers.not(
-                BundleMatcher.matchBundle(bundle2.getName(),
-                                          bundle2.getID(),
-                                          bundle2.getHandle(),
-                                          bundle2.getType(),
-                                          bundle2.getBitstreams())
+                           BundleMatcher.matchBundle(bundles.get(0).getName(),
+                                                     bundles.get(0).getID(),
+                                                     bundles.get(0).getHandle(),
+                                                     bundles.get(0).getType(),
+                                                     bundles.get(0).getBitstreams())
         )));
 
 
@@ -573,6 +578,7 @@ public class BitstreamControllerIT extends AbstractControllerIntegrationTest {
                                         .build();
         }
 
+        // NOTE: this will set deleted = true for the bitstream
         bundleService.removeBitstream(context, bundle1, bitstream);
         bundleService.update(context, bundle1);
         bitstreamService.update(context, bitstream);
@@ -612,6 +618,10 @@ public class BitstreamControllerIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String token = getAuthToken(putBundlePerson.getEmail(), "test");
 
+        // at this moment the bitstream is still marked as deleted because it is not attached to any bundle
+        assertTrue(bitstream.isDeleted());
+
+        // add the bitstream to target bundle
         getClient(token)
                 .perform(put("/api/core/bitstreams/" + bitstream.getID() + "/bundle")
                                  .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
@@ -619,6 +629,9 @@ public class BitstreamControllerIT extends AbstractControllerIntegrationTest {
                                          "https://localhost:8080/spring-rest/api/core/bundles/" + targetBundle.getID()
                                  )).andExpect(status().isOk());
 
+        // at this moment the bitstream should NOT be marked as deleted, because it has been attached to target bundle
+        assertFalse(context.reloadEntity(bitstream).isDeleted());
+
         targetBundle = bundleService.find(context, targetBundle.getID());
         String name = targetBundle.getName();
         String handle = targetBundle.getHandle();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamFormatRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamFormatRestRepositoryIT.java
index 48ad410d00..1a6cc29ca7 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamFormatRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamFormatRestRepositoryIT.java
@@ -56,7 +56,7 @@ public class BitstreamFormatRestRepositoryIT extends AbstractControllerIntegrati
     @Autowired
     private BitstreamFormatConverter bitstreamFormatConverter;
 
-    private final int DEFAULT_AMOUNT_FORMATS = 80;
+    private final int DEFAULT_AMOUNT_FORMATS = 81;
 
     @Test
     public void findAllPaginationTest() throws Exception {
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
index f07aae876f..09dbdca505 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
@@ -8,6 +8,7 @@
 package org.dspace.app.rest;
 
 import static java.util.UUID.randomUUID;
+import static javax.mail.internet.MimeUtility.encodeText;
 import static org.apache.commons.codec.CharEncoding.UTF_8;
 import static org.apache.commons.collections.CollectionUtils.isEmpty;
 import static org.apache.commons.io.IOUtils.toInputStream;
@@ -24,6 +25,11 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE;
 import static org.springframework.http.MediaType.parseMediaType;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -73,10 +79,13 @@ import org.dspace.statistics.ObjectCount;
 import org.dspace.statistics.SolrLoggerServiceImpl;
 import org.dspace.statistics.factory.StatisticsServiceFactory;
 import org.dspace.statistics.service.SolrLoggerService;
+import org.dspace.storage.bitstore.factory.StorageServiceFactory;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.util.ReflectionTestUtils;
 
 /**
  * Integration test to test the /api/core/bitstreams/[id]/* endpoints
@@ -202,7 +211,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                        // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
                        .andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
                        //We expect the content type to match the bitstream mime type
-                       .andExpect(content().contentType("text/plain"))
+                       .andExpect(content().contentType("text/plain;charset=UTF-8"))
                        //THe bytes of the content must match the original content
                        .andExpect(content().bytes(bitstreamContent.getBytes()));
 
@@ -264,7 +273,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                        //The response should give us details about the range
                        .andExpect(header().string("Content-Range", "bytes 1-3/10"))
                        //We expect the content type to match the bitstream mime type
-                       .andExpect(content().contentType("text/plain"))
+                       .andExpect(content().contentType("text/plain;charset=UTF-8"))
                        //We only expect the bytes 1, 2 and 3
                        .andExpect(content().bytes("123".getBytes()));
 
@@ -285,7 +294,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                        //The response should give us details about the range
                        .andExpect(header().string("Content-Range", "bytes 4-9/10"))
                        //We expect the content type to match the bitstream mime type
-                       .andExpect(content().contentType("text/plain"))
+                       .andExpect(content().contentType("text/plain;charset=UTF-8"))
                        //We all remaining bytes, starting at byte 4
                        .andExpect(content().bytes("456789".getBytes()));
 
@@ -293,6 +302,53 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
             checkNumberOfStatsRecords(bitstream, 0);
     }
 
+    @Test
+    public void testBitstreamName() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community and one collection
+
+        parentCommunity = CommunityBuilder
+            .createCommunity(context)
+            .build();
+
+        Collection collection = CollectionBuilder
+            .createCollection(context, parentCommunity)
+            .build();
+
+        //2. A public item with a bitstream
+
+        String bitstreamContent = "0123456789";
+        String bitstreamName = "ภาษาไทย";
+
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+
+            Item item = ItemBuilder
+                .createItem(context, collection)
+                .build();
+
+            bitstream = BitstreamBuilder
+                .createBitstream(context, item, is)
+                .withName(bitstreamName)
+                .build();
+        }
+
+        context.restoreAuthSystemState();
+
+        //** WHEN **
+        //We download the bitstream
+        getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
+            //** THEN **
+            .andExpect(status().isOk())
+            //We expect the content disposition to have the encoded bitstream name
+            .andExpect(header().string(
+                "Content-Disposition",
+                "attachment;filename=\"" + encodeText(bitstreamName) + "\""
+            ));
+    }
+
     @Test
     public void testBitstreamNotFound() throws Exception {
         getClient().perform(get("/api/core/bitstreams/" + UUID.randomUUID() + "/content"))
@@ -628,6 +684,56 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
             checkNumberOfStatsRecords(bitstream, 1);
     }
 
+    @Test
+    public void restrictedSpecialGroupBitstreamTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection 1")
+            .build();
+
+        Group restrictedGroup = GroupBuilder.createGroup(context)
+            .withName("Restricted Group")
+            .build();
+
+        String bitstreamContent = "Private!";
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+
+            Item item = ItemBuilder.createItem(context, col1)
+                .withTitle("item 1")
+                .withIssueDate("2013-01-17")
+                .withAuthor("Doe, John")
+                .build();
+
+            bitstream = BitstreamBuilder
+                .createBitstream(context, item, is)
+                .withName("Test Embargoed Bitstream")
+                .withDescription("This bitstream is embargoed")
+                .withMimeType("text/plain")
+                .withReaderGroup(restrictedGroup)
+                .build();
+        }
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
+            .andExpect(status().isForbidden());
+
+        configurationService.setProperty("authentication-password.login.specialgroup", "Restricted Group");
+
+        authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
+            .andExpect(status().isOk());
+
+        checkNumberOfStatsRecords(bitstream, 1);
+
+    }
+
     @Test
     public void restrictedGroupBitstreamAccessGrantByAdminsTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -779,7 +885,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                     //The ETag has to be based on the checksum
                     .andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
                     //We expect the content type to match the bitstream mime type
-                    .andExpect(content().contentType("application/pdf"))
+                    .andExpect(content().contentType("application/pdf;charset=UTF-8"))
                     //THe bytes of the content must match the original content
                     .andReturn().getResponse().getContentAsByteArray();
 
@@ -968,4 +1074,108 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                 bitstreamService.getMetadataByMetadataString(bitstream, "dc.format")
         ));
     }
+
+
+    @Test
+    public void closeInputStreamsRegularDownload() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community and one collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        Collection col1 =
+            CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+
+        //2. A public item with a bitstream
+        String bitstreamContent = "0123456789";
+
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+
+            Item publicItem1 = ItemBuilder.createItem(context, col1)
+                .withTitle("Public item 1")
+                .withIssueDate("2017-10-17")
+                .withAuthor("Smith, Donald").withAuthor("Doe, John")
+                .build();
+
+            bitstream = BitstreamBuilder
+                .createBitstream(context, publicItem1, is)
+                .withName("Test bitstream")
+                .withDescription("This is a bitstream to test range requests")
+                .withMimeType("text/plain")
+                .build();
+        }
+        context.restoreAuthSystemState();
+
+        var bitstreamStorageService = StorageServiceFactory.getInstance().getBitstreamStorageService();
+        var inputStream = bitstreamStorageService.retrieve(context, bitstream);
+        var inputStreamSpy = spy(inputStream);
+        var bitstreamStorageServiceSpy = spy(bitstreamStorageService);
+        ReflectionTestUtils.setField(bitstreamService, "bitstreamStorageService", bitstreamStorageServiceSpy);
+        doReturn(inputStreamSpy).when(bitstreamStorageServiceSpy).retrieve(any(), eq(bitstream));
+
+        //** WHEN **
+        //We download the bitstream
+        getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
+            //** THEN **
+            .andExpect(status().isOk());
+
+        Mockito.verify(bitstreamStorageServiceSpy, times(1)).retrieve(any(), eq(bitstream));
+        Mockito.verify(inputStreamSpy, times(1)).close();
+    }
+
+    @Test
+    public void closeInputStreamsDownloadWithCoverPage() throws Exception {
+        configurationService.setProperty("citation-page.enable_globally", true);
+        citationDocumentService.afterPropertiesSet();
+        context.turnOffAuthorisationSystem();
+
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community and one collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        Collection col1 =
+            CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+
+        //2. A public item with a bitstream
+        File originalPdf = new File(testProps.getProperty("test.bitstream"));
+
+        try (InputStream is = new FileInputStream(originalPdf)) {
+
+            Item publicItem1 = ItemBuilder.createItem(context, col1)
+                    .withTitle("Public item citation cover page test 1")
+                    .withIssueDate("2017-10-17")
+                    .withAuthor("Smith, Donald").withAuthor("Doe, John")
+                    .build();
+
+            bitstream = BitstreamBuilder
+                    .createBitstream(context, publicItem1, is)
+                    .withName("Test bitstream")
+                    .withDescription("This is a bitstream to test the citation cover page.")
+                    .withMimeType("application/pdf")
+                    .build();
+        }
+        context.restoreAuthSystemState();
+
+        var bitstreamStorageService = StorageServiceFactory.getInstance().getBitstreamStorageService();
+        var inputStreamSpy = spy(bitstreamStorageService.retrieve(context, bitstream));
+        var bitstreamStorageServiceSpy = spy(bitstreamStorageService);
+        ReflectionTestUtils.setField(bitstreamService, "bitstreamStorageService", bitstreamStorageServiceSpy);
+        doReturn(inputStreamSpy).when(bitstreamStorageServiceSpy).retrieve(any(), eq(bitstream));
+
+        //** WHEN **
+        //We download the bitstream
+        getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
+            //** THEN **
+            .andExpect(status().isOk());
+
+        Mockito.verify(bitstreamStorageServiceSpy, times(1)).retrieve(any(), eq(bitstream));
+        Mockito.verify(inputStreamSpy, times(1)).close();
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java
index fd95e7f584..f9c1e469fc 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java
@@ -20,6 +20,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.io.InputStream;
+import java.util.Comparator;
+import java.util.List;
 import java.util.UUID;
 
 import org.apache.commons.codec.CharEncoding;
@@ -45,6 +47,7 @@ import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
+import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
@@ -67,6 +70,10 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
 
     @Autowired
     private GroupService groupService;
+
+    @Autowired
+    private ItemService itemService;
+
     @Test
     public void findAllTest() throws Exception {
         //We turn off the authorization system in order to create the structure as defined below
@@ -1480,11 +1487,19 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                     .build();
         }
 
-        Bundle secondBundle = BundleBuilder.createBundle(context, publicItem1)
-                .withName("second bundle")
-                .withBitstream(bitstream).build();
+        // Add default content bundle to list of bundles
+        List<Bundle> bundles = itemService.getBundles(publicItem1, Constants.CONTENT_BUNDLE_NAME);
 
-        Bundle bundle = bitstream.getBundles().get(0);
+        // Add this bitstream to a second bundle & append to list of bundles
+        bundles.add(BundleBuilder.createBundle(context, publicItem1)
+                .withName("second bundle")
+                .withBitstream(bitstream).build());
+
+        // While in DSpace code, Bundles are *unordered*, in Hibernate v5 + H2 v2.x, they are returned sorted by UUID.
+        // So, we reorder this list of created Bundles by UUID to get their expected return order.
+        // NOTE: Once on Hibernate v6, this might need "toString()" removed as it may sort UUIDs based on RFC 4412.
+        Comparator<Bundle> compareByUUID = Comparator.comparing(b -> b.getID().toString());
+        bundles.sort(compareByUUID);
 
         //Get bundle should contain the first bundle in the list
         getClient().perform(get("/api/core/bitstreams/" + bitstream.getID() + "/bundle"))
@@ -1492,10 +1507,10 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .andExpect(content().contentType(contentType))
                 .andExpect(jsonPath("$",
                         BundleMatcher.matchProperties(
-                            bundle.getName(),
-                            bundle.getID(),
-                            bundle.getHandle(),
-                            bundle.getType()
+                            bundles.get(0).getName(),
+                            bundles.get(0).getID(),
+                            bundles.get(0).getHandle(),
+                            bundles.get(0).getType()
                     )
                 ));
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java
index 5bb3ce6078..445613b07c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java
@@ -905,7 +905,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
 
         //** WHEN **
         //An anonymous user browses the entries in the Browse by Author endpoint
-        //with startsWith set to Ú (accented)
+        //with startsWith set to Ó (accented)
         getClient().perform(get("/api/discover/browses/author/entries?startsWith=Ó"))
 
                    //** THEN **
@@ -930,7 +930,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
 
         //** WHEN **
         //An anonymous user browses the entries in the Browse by Subject endpoint
-        //with startsWith set to Cana
+        //with startsWith set to Tele
         getClient().perform(get("/api/discover/browses/subject/entries?startsWith=Tele"))
 
                    //** THEN **
@@ -1049,8 +1049,8 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
         // ---- BROWSES BY ITEM ----
         //** WHEN **
         //An anonymous user browses the items in the Browse by date issued endpoint
-        //with startsWith set to 1990
-        getClient().perform(get("/api/discover/browses/dateissued/items?startsWith=1990")
+        //with startsWith set to 199
+        getClient().perform(get("/api/discover/browses/dateissued/items?startsWith=199")
                                 .param("size", "2"))
 
                    //** THEN **
@@ -1059,12 +1059,11 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                    //We expect the content type to be "application/hal+json;charset=UTF-8"
                    .andExpect(content().contentType(contentType))
 
-                   //We expect the totalElements to be the 7 items present in the repository
-                   .andExpect(jsonPath("$.page.totalElements", is(7)))
+                   //We expect the totalElements to be the 2 items present in the repository
+                   .andExpect(jsonPath("$.page.totalElements", is(2)))
                    //We expect to jump to page 1 of the index
-                   .andExpect(jsonPath("$.page.number", is(1)))
+                   .andExpect(jsonPath("$.page.number", is(0)))
                    .andExpect(jsonPath("$.page.size", is(2)))
-                   .andExpect(jsonPath("$._links.first.href", containsString("startsWith=1990")))
 
                    //Verify that the index jumps to the "Python" item.
                    .andExpect(jsonPath("$._embedded.items",
@@ -1085,19 +1084,16 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                    //We expect the content type to be "application/hal+json;charset=UTF-8"
                    .andExpect(content().contentType(contentType))
 
-                   //We expect the totalElements to be the 7 items present in the repository
-                   .andExpect(jsonPath("$.page.totalElements", is(7)))
+                   //We expect the totalElements to be the 1 item present in the repository
+                   .andExpect(jsonPath("$.page.totalElements", is(1)))
                    //We expect to jump to page 2 in the index
-                   .andExpect(jsonPath("$.page.number", is(2)))
+                   .andExpect(jsonPath("$.page.number", is(0)))
                    .andExpect(jsonPath("$._links.self.href", containsString("startsWith=T")))
 
                    //Verify that the index jumps to the "T-800" item.
                    .andExpect(jsonPath("$._embedded.items",
                                        contains(ItemMatcher.matchItemWithTitleAndDateIssued(item7,
-                                                                                            "T-800", "2029"),
-                                               ItemMatcher.matchItemWithTitleAndDateIssued(item5,
-                                                                                            "Zeta Reticuli",
-                                                                                            "2018-01-01")
+                                                                                            "T-800", "2029")
                                        )));
 
         //** WHEN **
@@ -1113,9 +1109,9 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                    //We expect the content type to be "application/hal+json;charset=UTF-8"
                    .andExpect(content().contentType(contentType))
 
-                   //We expect the totalElements to be the 3 items present in the collection
-                   .andExpect(jsonPath("$.page.totalElements", is(3)))
-                   //As this is is a small collection, we expect to go-to page 0
+                   //We expect the totalElements to be the 1 item present in the collection
+                   .andExpect(jsonPath("$.page.totalElements", is(1)))
+                   //As this is a small collection, we expect to go-to page 0
                    .andExpect(jsonPath("$.page.number", is(0)))
                    .andExpect(jsonPath("$._links.self.href", containsString("startsWith=Blade")))
 
@@ -1123,10 +1119,35 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                    .andExpect(jsonPath("$._embedded.items",
                            contains(ItemMatcher.matchItemWithTitleAndDateIssued(item2,
                                                                                             "Blade Runner",
-                                                                                            "1982-06-25"),
-                                               ItemMatcher.matchItemWithTitleAndDateIssued(item3,
-                                                                                            "Python", "1990")
+                                                                                            "1982-06-25")
                                        )));
+
+        //Test filtering with spaces:
+        //** WHEN **
+        //An anonymous user browses the items in the Browse by Title endpoint
+        //with startsWith set to Blade Runner and scope set to Col 1
+        getClient().perform(get("/api/discover/browses/title/items?startsWith=Blade Runner")
+                .param("scope", col1.getID().toString())
+                .param("size", "2"))
+
+            //** THEN **
+            //The status has to be 200 OK
+            .andExpect(status().isOk())
+            //We expect the content type to be "application/hal+json;charset=UTF-8"
+            .andExpect(content().contentType(contentType))
+
+            //We expect the totalElements to be the 1 item present in the collection
+            .andExpect(jsonPath("$.page.totalElements", is(1)))
+            //As this is a small collection, we expect to go-to page 0
+            .andExpect(jsonPath("$.page.number", is(0)))
+            .andExpect(jsonPath("$._links.self.href", containsString("startsWith=Blade Runner")))
+
+            //Verify that the index jumps to the "Blade Runner" item.
+            .andExpect(jsonPath("$._embedded.items",
+                contains(ItemMatcher.matchItemWithTitleAndDateIssued(item2,
+                    "Blade Runner",
+                    "1982-06-25")
+                )));
     }
 
     @Test
@@ -1200,9 +1221,9 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
 
         //** WHEN **
         //An anonymous user browses the items in the Browse by date issued endpoint
-        //with startsWith set to 1990 and Page to 3
-        getClient().perform(get("/api/discover/browses/dateissued/items?startsWith=1990")
-                                .param("size", "2").param("page", "2"))
+        //with startsWith set to 199 and Page to 1
+        getClient().perform(get("/api/discover/browses/dateissued/items?startsWith=199")
+                                .param("size", "1").param("page", "1"))
 
                    //** THEN **
                    //The status has to be 200 OK
@@ -1210,20 +1231,98 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                    //We expect the content type to be "application/hal+json;charset=UTF-8"
                    .andExpect(content().contentType(contentType))
 
-                   //We expect the totalElements to be the 7 items present in the repository
-                   .andExpect(jsonPath("$.page.totalElements", is(7)))
+                   //We expect the totalElements to be the 2 items present in the repository
+                   .andExpect(jsonPath("$.page.totalElements", is(2)))
                    //We expect to jump to page 1 of the index
-                   .andExpect(jsonPath("$.page.number", is(2)))
-                   .andExpect(jsonPath("$.page.size", is(2)))
-                   .andExpect(jsonPath("$._links.self.href", containsString("startsWith=1990")))
+                   .andExpect(jsonPath("$.page.number", is(1)))
+                   .andExpect(jsonPath("$.page.size", is(1)))
+                   .andExpect(jsonPath("$._links.self.href", containsString("startsWith=199")))
 
-                   //Verify that the index jumps to the "Zeta Reticuli" item.
+                   //Verify that the index jumps to the "Java" item.
                    .andExpect(jsonPath("$._embedded.items",
-                                       contains(ItemMatcher.matchItemWithTitleAndDateIssued(item7,
-                                                                                        "Zeta Reticuli", "2018-01-01"),
-                                                ItemMatcher.matchItemWithTitleAndDateIssued(item4,
-                                                                                        "Moon", "2018-01-02")
-                                       )));
+                        contains(
+                            ItemMatcher.matchItemWithTitleAndDateIssued(item3, "Java", "1995-05-23")
+                        )));
+    }
+
+
+    @Test
+    public void testBrowseByTitleStartsWithAndDiacritics() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+
+        //2. 2 public items that are readable by Anonymous
+        Item item1 = ItemBuilder.createItem(context, col1)
+                .withTitle("Número 1")
+                .withAuthor("Surname, Name")
+                .withIssueDate("2020")
+                .build();
+
+        Item item2 = ItemBuilder.createItem(context, col1)
+                .withTitle("Numero 2")
+                .withAuthor("Surname, Name")
+                .withIssueDate("2010")
+                .build();
+
+        context.restoreAuthSystemState();
+
+        //** WHEN **
+        //An anonymous user browses the items in the Browse by Title endpoint
+        //with startsWith set to Num (unaccented)
+        getClient().perform(get("/api/discover/browses/title/items?startsWith=Num")
+                        .param("size", "2"))
+
+                //** THEN **
+                //The status has to be 200 OK
+                .andExpect(status().isOk())
+                //We expect the content type to be "application/hal+json;charset=UTF-8"
+                .andExpect(content().contentType(contentType))
+
+                //We expect the totalElements to be the 1 item present in the repository
+                .andExpect(jsonPath("$.page.totalElements", is(2)))
+                //We expect to jump to page 2 in the index
+                .andExpect(jsonPath("$.page.number", is(0)))
+                .andExpect(jsonPath("$._links.self.href", containsString("startsWith=Num")))
+
+                //Verify that the index contains both items (the accented and the unaccented)
+                .andExpect(jsonPath("$._embedded.items",
+                        contains(ItemMatcher.matchItemWithTitleAndDateIssued(item1,
+                                        "Número 1", "2020"),
+                                ItemMatcher.matchItemWithTitleAndDateIssued(item2,
+                                        "Numero 2", "2010")
+                        )));
+
+        //An anonymous user browses the items in the Browse by Title endpoint
+        //with startsWith set to Núm (accented)
+        getClient().perform(get("/api/discover/browses/title/items?startsWith=Núm")
+                        .param("size", "2"))
+
+                //** THEN **
+                //The status has to be 200 OK
+                .andExpect(status().isOk())
+                //We expect the content type to be "application/hal+json;charset=UTF-8"
+                .andExpect(content().contentType(contentType))
+
+                //We expect the totalElements to be the 1 item present in the repository
+                .andExpect(jsonPath("$.page.totalElements", is(2)))
+                //We expect to jump to page 2 in the index
+                .andExpect(jsonPath("$.page.number", is(0)))
+                .andExpect(jsonPath("$._links.self.href", containsString("startsWith=Núm")))
+
+                //Verify that the index contains both items (the accented and the unaccented)
+                .andExpect(jsonPath("$._embedded.items",
+                        contains(ItemMatcher.matchItemWithTitleAndDateIssued(item1,
+                                        "Número 1", "2020"),
+                                ItemMatcher.matchItemWithTitleAndDateIssued(item2,
+                                        "Numero 2", "2010")
+                        )));
+
     }
 
     @Test
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleRestRepositoryIT.java
index 884d551582..96385095a2 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleRestRepositoryIT.java
@@ -397,26 +397,24 @@ public class BundleRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void getBitstreamsForBundle() throws Exception {
         context.turnOffAuthorisationSystem();
 
+        bundle1 = BundleBuilder.createBundle(context, item)
+                               .withName("testname")
+                               .build();
+
         String bitstreamContent = "Dummy content";
         try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
-            bitstream1 = BitstreamBuilder.createBitstream(context, item, is)
+            bitstream1 = BitstreamBuilder.createBitstream(context, item, is, bundle1.getName())
                                          .withName("Bitstream")
                                          .withDescription("Description")
                                          .withMimeType("text/plain")
                                          .build();
-            bitstream2 = BitstreamBuilder.createBitstream(context, item, is)
+            bitstream2 = BitstreamBuilder.createBitstream(context, item, is, bundle1.getName())
                                          .withName("Bitstream2")
                                          .withDescription("Description2")
                                          .withMimeType("text/plain")
                                          .build();
         }
 
-        bundle1 = BundleBuilder.createBundle(context, item)
-                               .withName("testname")
-                               .withBitstream(bitstream1)
-                               .withBitstream(bitstream2)
-                               .build();
-
         context.restoreAuthSystemState();
 
         getClient().perform(get("/api/core/bundles/" + bundle1.getID() + "/bitstreams")
@@ -465,26 +463,24 @@ public class BundleRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void patchMoveBitstreams() throws Exception {
         context.turnOffAuthorisationSystem();
 
+        bundle1 = BundleBuilder.createBundle(context, item)
+                               .withName("testname")
+                               .build();
+
         String bitstreamContent = "Dummy content";
         try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
-            bitstream1 = BitstreamBuilder.createBitstream(context, item, is)
+            bitstream1 = BitstreamBuilder.createBitstream(context, item, is, bundle1.getName())
                     .withName("Bitstream")
                     .withDescription("Description")
                     .withMimeType("text/plain")
                     .build();
-            bitstream2 = BitstreamBuilder.createBitstream(context, item, is)
+            bitstream2 = BitstreamBuilder.createBitstream(context, item, is, bundle1.getName())
                     .withName("Bitstream2")
                     .withDescription("Description2")
                     .withMimeType("text/plain")
                     .build();
         }
 
-        bundle1 = BundleBuilder.createBundle(context, item)
-                .withName("testname")
-                .withBitstream(bitstream1)
-                .withBitstream(bitstream2)
-                .build();
-
         context.restoreAuthSystemState();
 
         getClient().perform(get("/api/core/bundles/" + bundle1.getID() + "/bitstreams")
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleUploadBitstreamControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleUploadBitstreamControllerIT.java
index eefcb81656..f80b194ca6 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleUploadBitstreamControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleUploadBitstreamControllerIT.java
@@ -103,7 +103,7 @@ public class BundleUploadBitstreamControllerIT extends AbstractEntityIntegration
 
         context.restoreAuthSystemState();
         MvcResult mvcResult = getClient(token).perform(
-                MockMvcRequestBuilders.fileUpload("/api/core/bundles/" + bundle.getID() + "/bitstreams")
+                MockMvcRequestBuilders.multipart("/api/core/bundles/" + bundle.getID() + "/bitstreams")
                                       .file(file)
                                       .param("properties", mapper
                                               .writeValueAsString(bitstreamRest)))
@@ -167,7 +167,7 @@ public class BundleUploadBitstreamControllerIT extends AbstractEntityIntegration
                                                        input.getBytes());
         context.restoreAuthSystemState();
         MvcResult mvcResult = getClient(token)
-                .perform(MockMvcRequestBuilders.fileUpload("/api/core/bundles/" + bundle.getID() + "/bitstreams")
+                .perform(MockMvcRequestBuilders.multipart("/api/core/bundles/" + bundle.getID() + "/bitstreams")
                                                .file(file))
                 .andExpect(status().isCreated())
                 .andExpect(jsonPath("$.bundleName", is("TESTINGBUNDLE")))
@@ -223,7 +223,7 @@ public class BundleUploadBitstreamControllerIT extends AbstractEntityIntegration
 
         context.restoreAuthSystemState();
         MvcResult mvcResult = getClient(token)
-                .perform(MockMvcRequestBuilders.fileUpload("/api/core/bundles/" + bundle.getID() + "/bitstreams")
+                .perform(MockMvcRequestBuilders.multipart("/api/core/bundles/" + bundle.getID() + "/bitstreams")
                                                .file(file))
                 .andExpect(status().isCreated())
                 .andExpect(jsonPath("$.uuid", notNullValue())).andReturn();
@@ -273,7 +273,7 @@ public class BundleUploadBitstreamControllerIT extends AbstractEntityIntegration
 
         context.restoreAuthSystemState();
         getClient(token).perform(MockMvcRequestBuilders
-                                         .fileUpload("/api/core/bundles/" + bundle.getID() + "/bitstreams")
+                                         .multipart("/api/core/bundles/" + bundle.getID() + "/bitstreams")
                                          .file(file))
                         .andExpect(status().isForbidden());
 
@@ -315,7 +315,7 @@ public class BundleUploadBitstreamControllerIT extends AbstractEntityIntegration
                                                        input.getBytes());
 
         context.restoreAuthSystemState();
-        getClient().perform(MockMvcRequestBuilders.fileUpload("/api/core/bundles/" + bundle.getID() + "/bitstreams")
+        getClient().perform(MockMvcRequestBuilders.multipart("/api/core/bundles/" + bundle.getID() + "/bitstreams")
                                                   .file(file))
                    .andExpect(status().isUnauthorized());
 
@@ -367,7 +367,7 @@ public class BundleUploadBitstreamControllerIT extends AbstractEntityIntegration
 
         context.restoreAuthSystemState();
         MvcResult mvcResult = getClient(token)
-                .perform(MockMvcRequestBuilders.fileUpload("/api/core/bundles/" + bundle.getID() + "/bitstreams")
+                .perform(MockMvcRequestBuilders.multipart("/api/core/bundles/" + bundle.getID() + "/bitstreams")
                                                .file(file)
                                                .param("properties", mapper
                                                        .writeValueAsString(bitstreamRest)))
@@ -422,7 +422,7 @@ public class BundleUploadBitstreamControllerIT extends AbstractEntityIntegration
                                                         input.getBytes());
         context.restoreAuthSystemState();
         getClient(token)
-                .perform(MockMvcRequestBuilders.fileUpload("/api/core/bundles/" + bundle.getID() + "/bitstreams")
+                .perform(MockMvcRequestBuilders.multipart("/api/core/bundles/" + bundle.getID() + "/bitstreams")
                                                .file(file).file(file2))
                 .andExpect(status().isUnprocessableEntity());
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java
index fcb814d82d..f07c816b9c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java
@@ -10,7 +10,7 @@ package org.dspace.app.rest;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -118,7 +118,11 @@ public class CCLicenseAddPatchOperationIT extends AbstractControllerIntegrationT
                                               .content(patchBody)
                                               .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isOk())
-                             .andExpect(jsonPath("$.sections", not(hasJsonPath("cclicense"))));
+                             .andExpect(jsonPath("$.sections.cclicense", allOf(
+                                     hasJsonPath("$.uri", nullValue()),
+                                     hasJsonPath("$.rights",nullValue()),
+                                     hasJsonPath("$.file", nullValue())
+                             )));
 
 
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java
index c003cf2809..8e01678899 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java
@@ -10,7 +10,7 @@ package org.dspace.app.rest;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -95,7 +95,11 @@ public class CCLicenseRemovePatchOperationIT extends AbstractControllerIntegrati
                                               .content(removePatch)
                                               .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isOk())
-                             .andExpect(jsonPath("$.sections", not(hasJsonPath("cclicense"))));
+                             .andExpect(jsonPath("$.sections.cclicense", allOf(
+                                     hasJsonPath("$.uri", nullValue()),
+                                     hasJsonPath("$.rights",nullValue()),
+                                     hasJsonPath("$.file", nullValue())
+                             )));
     }
 
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CanChangePasswordFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CanChangePasswordFeatureIT.java
new file mode 100644
index 0000000000..a355df1ed4
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CanChangePasswordFeatureIT.java
@@ -0,0 +1,82 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.authorization.Authorization;
+import org.dspace.app.rest.authorization.AuthorizationFeature;
+import org.dspace.app.rest.authorization.AuthorizationFeatureService;
+import org.dspace.app.rest.authorization.impl.CanChangePasswordFeature;
+import org.dspace.app.rest.converter.EPersonConverter;
+import org.dspace.app.rest.matcher.AuthorizationMatcher;
+import org.dspace.app.rest.model.EPersonRest;
+import org.dspace.app.rest.projection.DefaultProjection;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Test for the Can Change Password Feature.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.it)
+ *
+ */
+public class CanChangePasswordFeatureIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private AuthorizationFeatureService authorizationFeatureService;
+
+    @Autowired
+    private EPersonConverter ePersonConverter;
+
+    private AuthorizationFeature canChangePasswordFeature;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        canChangePasswordFeature = authorizationFeatureService.find(CanChangePasswordFeature.NAME);
+    }
+
+    @Test
+    public void testCanChangePasswordFeatureWithAdmin() throws Exception {
+        EPersonRest adminRest = ePersonConverter.convert(admin, DefaultProjection.DEFAULT);
+        Authorization authorization = new Authorization(admin, canChangePasswordFeature, adminRest);
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/authz/authorizations/" + authorization.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$", Matchers.is(
+                                 AuthorizationMatcher.matchAuthorization(authorization))));
+    }
+
+    @Test
+    public void testCanChangePasswordFeatureWithNotAdmin() throws Exception {
+        EPersonRest ePersonRest = ePersonConverter.convert(eperson, DefaultProjection.DEFAULT);
+        Authorization authorization = new Authorization(eperson, canChangePasswordFeature, ePersonRest);
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+        getClient(tokenEperson).perform(get("/api/authz/authorizations/" + authorization.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$", Matchers.is(
+                                 AuthorizationMatcher.matchAuthorization(authorization))));
+    }
+
+    @Test
+    public void testCanChangePasswordFeatureIfAdminImpersonatingAnotherUser() throws Exception {
+        EPersonRest ePersonRest = ePersonConverter.convert(eperson, DefaultProjection.DEFAULT);
+        Authorization authorization = new Authorization(eperson, canChangePasswordFeature, ePersonRest);
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/authz/authorizations/" + authorization.getID()))
+                               .andExpect(status().isNotFound());
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CiniiImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CiniiImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..87f1bf7d8d
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CiniiImportMetadataSourceServiceIT.java
@@ -0,0 +1,139 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.importer.external.cinii.CiniiImportMetadataSourceServiceImpl;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link CiniiImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class CiniiImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private LiveImportClientImpl liveImportClientImpl;
+
+    @Autowired
+    private CiniiImportMetadataSourceServiceImpl ciniiServiceImpl;
+
+    @Test
+    public void ciniiImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        InputStream ciniiRefResp = null;
+        InputStream ciniiRefResp2 = null;
+        InputStream ciniiRefResp3 = null;
+        try {
+            ciniiRefResp = getClass().getResourceAsStream("cinii-responce-ids.xml");
+            ciniiRefResp2 = getClass().getResourceAsStream("cinii-first.xml");
+            ciniiRefResp3 = getClass().getResourceAsStream("cinii-second.xml");
+
+            String ciniiIdsXmlResp = IOUtils.toString(ciniiRefResp, Charset.defaultCharset());
+            String ciniiFirstXmlResp = IOUtils.toString(ciniiRefResp2, Charset.defaultCharset());
+            String ciniiSecondXmlResp = IOUtils.toString(ciniiRefResp3, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(ciniiIdsXmlResp, 200, "OK");
+            CloseableHttpResponse response2 = mockResponse(ciniiFirstXmlResp, 200, "OK");
+            CloseableHttpResponse response3 = mockResponse(ciniiSecondXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response, response2, response3);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = ciniiServiceImpl.getRecords("test query", 0, 2);
+            assertEquals(2, recordsImported.size());
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+            if (Objects.nonNull(ciniiRefResp)) {
+                ciniiRefResp.close();
+            }
+            if (Objects.nonNull(ciniiRefResp2)) {
+                ciniiRefResp2.close();
+            }
+            if (Objects.nonNull(ciniiRefResp3)) {
+                ciniiRefResp3.close();
+            }
+        }
+    }
+
+    @Test
+    public void ciniiImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream file = getClass().getResourceAsStream("cinii-responce-ids.xml")) {
+            String ciniiXmlResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(ciniiXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = ciniiServiceImpl.getRecordsCount("test query");
+            assertEquals(32, tot);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        //define first record
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO title = createMetadatumDTO("dc", "title", null,
+                "Understanding the impact of mandatory accrual accounting on management practices:"
+                + " Interpretation of Japanese local governments’ behavior");
+        MetadatumDTO identifier = createMetadatumDTO("dc", "identifier", "other", "1010572092222310146");
+
+        metadatums.add(title);
+        metadatums.add(identifier);
+
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
+                "Band structures of passive films on titanium in simulated bioliquids determined"
+                + " by photoelectrochemical response: principle governing the biocompatibility");
+        MetadatumDTO language = createMetadatumDTO("dc", "language", "iso", "en");
+        MetadatumDTO identifier2 = createMetadatumDTO("dc", "identifier", "other", "1050010687833449984");
+
+        metadatums2.add(title2);
+        metadatums2.add(language);
+        metadatums2.add(identifier2);
+
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionGroupRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionGroupRestControllerIT.java
index 767ea5f565..f6ab10c087 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionGroupRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionGroupRestControllerIT.java
@@ -28,6 +28,7 @@ import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.WorkspaceItemBuilder;
 import org.dspace.content.Collection;
 import org.dspace.content.service.CollectionService;
 import org.dspace.core.Constants;
@@ -2414,4 +2415,27 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
                         .andExpect(status().isNotFound());
     }
 
+    @Test
+    public void deleteCollectionWorkflowGroupWithPooledTaskTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Group reviewer = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+
+        // Submit an Item into the workflow -> moves to the "reviewer" step's pool.
+        // The role must have at least one EPerson, otherwise the WSI gets archived immediately
+        groupService.addMember(context, reviewer, eperson);
+        workflowService.start(
+            context,
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Dummy Item")
+                                .build()
+        );
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(delete("/api/core/collections/" + collection.getID() + "/workflowGroups/reviewer"))
+                        .andExpect(status().isUnprocessableEntity());
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionLogoControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionLogoControllerIT.java
index f093156000..fa0732f6b7 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionLogoControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionLogoControllerIT.java
@@ -51,7 +51,7 @@ public class CollectionLogoControllerIT extends AbstractControllerIntegrationTes
 
     private String createLogoInternal() throws Exception {
         MvcResult mvcPostResult = getClient(adminAuthToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(childCollection.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(childCollection.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isCreated())
                 .andReturn();
@@ -64,7 +64,7 @@ public class CollectionLogoControllerIT extends AbstractControllerIntegrationTes
     @Test
     public void createLogoNotLoggedIn() throws Exception {
         getClient().perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(childCollection.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(childCollection.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isUnauthorized());
     }
@@ -88,7 +88,7 @@ public class CollectionLogoControllerIT extends AbstractControllerIntegrationTes
     public void createLogoNoRights() throws Exception {
         String userToken = getAuthToken(eperson.getEmail(), password);
         getClient(userToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(childCollection.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(childCollection.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isForbidden());
     }
@@ -96,12 +96,12 @@ public class CollectionLogoControllerIT extends AbstractControllerIntegrationTes
     @Test
     public void createDuplicateLogo() throws Exception {
         getClient(adminAuthToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(childCollection.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(childCollection.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isCreated());
 
         getClient(adminAuthToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(childCollection.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(childCollection.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isUnprocessableEntity());
     }
@@ -109,7 +109,7 @@ public class CollectionLogoControllerIT extends AbstractControllerIntegrationTes
     @Test
     public void createLogoForNonexisting() throws Exception {
         getClient(adminAuthToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate("16a4b65b-3b3f-4ef5-8058-ef6f5a653ef9"))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate("16a4b65b-3b3f-4ef5-8058-ef6f5a653ef9"))
                         .file(bitstreamFile))
                 .andExpect(status().isNotFound());
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionRestRepositoryIT.java
index 92fdecf824..ab37fac106 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionRestRepositoryIT.java
@@ -2421,9 +2421,11 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
                                                        .build();
 
         List<Item> items = new ArrayList();
-        // This comparator is used to sort our test Items by java.util.UUID (which sorts them based on the RFC
-        // and not based on String comparison, see also https://stackoverflow.com/a/51031298/3750035 )
-        Comparator<Item> compareByUUID = Comparator.comparing(i -> i.getID());
+        // Hibernate 5.x's org.hibernate.dialect.H2Dialect sorts UUIDs as if they are Strings.
+        // So, we must compare UUIDs as if they are strings.
+        // In Hibernate 6, the H2Dialect has been updated with native UUID type support, at which point
+        // we'd need to update the below comparator to compare them as java.util.UUID (which sorts based on RFC 4412).
+        Comparator<Item> compareByUUID = Comparator.comparing(i -> i.getID().toString());
 
         Item item0 = ItemBuilder.createItem(context, collection).withTitle("Item 0").build();
         items.add(item0);
@@ -2676,7 +2678,7 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
         context.restoreAuthSystemState();
         String token = getAuthToken(topLevelCommunityAAdmin.getEmail(), password);
 
-        // Verify the community admin gets all the communities he's admin for
+        // Verify the community admin gets all the communities they are admin for
         getClient(token).perform(get("/api/core/collections/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.collections", Matchers.containsInAnyOrder(
@@ -2721,7 +2723,7 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
 
         String token = getAuthToken(subCommunityAAdmin.getEmail(), password);
 
-        // Verify the subcommunity admin gets all the communities he's admin for
+        // Verify the subcommunity admin gets all the communities they are admin for
         getClient(token).perform(get("/api/core/collections/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.collections", Matchers.containsInAnyOrder(
@@ -2767,7 +2769,7 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
 
         String token = getAuthToken(collectionAAdmin.getEmail(), password);
 
-        // Verify the collection admin gets all the communities he's admin for
+        // Verify the collection admin gets all the communities they are admin for
         getClient(token).perform(get("/api/core/collections/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.collections", Matchers.containsInAnyOrder(
@@ -2906,7 +2908,7 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
 
         String token = getAuthToken(eperson.getEmail(), password);
 
-        // Verify an ePerson in a subgroup of a community admin group gets all the collections he's admin for
+        // Verify an ePerson in a subgroup of a community admin group gets all the collections they are admin for
         getClient(token).perform(get("/api/core/collections/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.collections", Matchers.containsInAnyOrder(
@@ -2962,7 +2964,7 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
 
         String token = getAuthToken(eperson.getEmail(), password);
 
-        // Verify an ePerson in a subgroup of a subcommunity admin group gets all the collections he's admin for
+        // Verify an ePerson in a subgroup of a subcommunity admin group gets all the collections they are admin for
         getClient(token).perform(get("/api/core/collections/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.collections", Matchers.containsInAnyOrder(
@@ -3018,7 +3020,7 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
 
         String token = getAuthToken(eperson.getEmail(), password);
 
-        // Verify an ePerson in a subgroup of a collection admin group gets all the collections he's admin for
+        // Verify an ePerson in a subgroup of a collection admin group gets all the collections they are admin for
         getClient(token).perform(get("/api/core/collections/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.collections", Matchers.containsInAnyOrder(
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityLogoControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityLogoControllerIT.java
index 1d34a99dd9..3a0edc9310 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityLogoControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityLogoControllerIT.java
@@ -46,7 +46,7 @@ public class CommunityLogoControllerIT extends AbstractControllerIntegrationTest
 
     private String createLogoInternal() throws Exception {
         MvcResult mvcPostResult = getClient(adminAuthToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(parentCommunity.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(parentCommunity.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isCreated())
                 .andReturn();
@@ -59,7 +59,7 @@ public class CommunityLogoControllerIT extends AbstractControllerIntegrationTest
     @Test
     public void createLogoNotLoggedIn() throws Exception {
         getClient().perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(parentCommunity.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(parentCommunity.getID().toString()))
                 .file(bitstreamFile))
                 .andExpect(status().isUnauthorized());
     }
@@ -83,7 +83,7 @@ public class CommunityLogoControllerIT extends AbstractControllerIntegrationTest
     public void createLogoNoRights() throws Exception {
         String userToken = getAuthToken(eperson.getEmail(), password);
         getClient(userToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(parentCommunity.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(parentCommunity.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isForbidden());
     }
@@ -91,12 +91,12 @@ public class CommunityLogoControllerIT extends AbstractControllerIntegrationTest
     @Test
     public void createDuplicateLogo() throws Exception {
         getClient(adminAuthToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(parentCommunity.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(parentCommunity.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isCreated());
 
         getClient(adminAuthToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate(parentCommunity.getID().toString()))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate(parentCommunity.getID().toString()))
                         .file(bitstreamFile))
                 .andExpect(status().isUnprocessableEntity());
     }
@@ -104,7 +104,7 @@ public class CommunityLogoControllerIT extends AbstractControllerIntegrationTest
     @Test
     public void createLogoForNonexisting() throws Exception {
         getClient(adminAuthToken).perform(
-                MockMvcRequestBuilders.fileUpload(getLogoUrlTemplate("16a4b65b-3b3f-4ef5-8058-ef6f5a653ef9"))
+                MockMvcRequestBuilders.multipart(getLogoUrlTemplate("16a4b65b-3b3f-4ef5-8058-ef6f5a653ef9"))
                         .file(bitstreamFile))
                 .andExpect(status().isNotFound());
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java
index 7fc56f0e5d..e084aa1746 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java
@@ -2089,7 +2089,7 @@ public class CommunityRestRepositoryIT extends AbstractControllerIntegrationTest
 
         String token = getAuthToken(topLevelCommunityAAdmin.getEmail(), password);
 
-        // Verify the community admin gets all the communities he's admin for
+        // Verify the community admin gets all the communities they are admin for
         getClient(token).perform(get("/api/core/communities/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.communities", Matchers.containsInAnyOrder(
@@ -2142,7 +2142,7 @@ public class CommunityRestRepositoryIT extends AbstractControllerIntegrationTest
 
         String token = getAuthToken(subCommunityAAdmin.getEmail(), password);
 
-        // Verify the community admin gets all the communities he's admin for
+        // Verify the community admin gets all the communities they are admin for
         getClient(token).perform(get("/api/core/communities/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.communities", Matchers.containsInAnyOrder(
@@ -2302,7 +2302,7 @@ public class CommunityRestRepositoryIT extends AbstractControllerIntegrationTest
 
         String token = getAuthToken(eperson.getEmail(), password);
 
-        // Verify the community admins' subgroup users get all the communities he's admin for
+        // Verify the community admins' subgroup users get all the communities they are admin for
         getClient(token).perform(get("/api/core/communities/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.communities", Matchers.containsInAnyOrder(
@@ -2355,7 +2355,7 @@ public class CommunityRestRepositoryIT extends AbstractControllerIntegrationTest
 
         String token = getAuthToken(eperson.getEmail(), password);
 
-        // Verify the sub-community admins' subgroup users get all the communities he's admin for
+        // Verify the sub-community admins' subgroup users get all the communities they are admin for
         getClient(token).perform(get("/api/core/communities/search/findAdminAuthorized"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.communities", Matchers.containsInAnyOrder(
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CrossRefImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CrossRefImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..9a0d39225c
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CrossRefImportMetadataSourceServiceIT.java
@@ -0,0 +1,199 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Item;
+import org.dspace.importer.external.crossref.CrossRefImportMetadataSourceServiceImpl;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link CrossRefImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class CrossRefImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private LiveImportClientImpl liveImportClientImpl;
+
+    @Autowired
+    private CrossRefImportMetadataSourceServiceImpl crossRefServiceImpl;
+
+    @Test
+    public void crossRefImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream crossRefResp = getClass().getResourceAsStream("crossRef-test.json")) {
+
+            String crossRefRespXmlResp = IOUtils.toString(crossRefResp, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(crossRefRespXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = crossRefServiceImpl.getRecords("test query", 0, 2);
+            assertEquals(2, recordsImported.size());
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void crossRefImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream crossRefResp = getClass().getResourceAsStream("crossRef-test.json")) {
+            String crossRefRespXmlResp = IOUtils.toString(crossRefResp, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(crossRefRespXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = crossRefServiceImpl.getRecordsCount("test query");
+            assertEquals(10, tot);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void crossRefImportMetadataGetRecordByIdTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream crossRefResp = getClass().getResourceAsStream("crossRef-by-id.json")) {
+
+            String crossRefRespXmlResp = IOUtils.toString(crossRefResp, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(crossRefRespXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            collection2match.remove(1);
+            ImportRecord recordImported = crossRefServiceImpl.getRecord("10.26693/jmbs01.02.184");
+            assertNotNull(recordImported);
+            Collection<ImportRecord> recordsImported = Arrays.asList(recordImported);
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test(expected = MethodNotFoundException.class)
+    public void crossRefImportMetadataFindMatchingRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        org.dspace.content.Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                                              .withName("Collection 1")
+                                                              .build();
+
+        Item testItem = ItemBuilder.createItem(context, col1)
+                                   .withTitle("test item")
+                                   .withIssueDate("2021")
+                                   .build();
+
+        context.restoreAuthSystemState();
+        crossRefServiceImpl.findMatchingRecords(testItem);
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        //define first record
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO title = createMetadatumDTO("dc", "title", null,
+                "State of Awareness of Freshers’ Groups Chortkiv State"
+                + " Medical College of Prevention of Iodine Deficiency Diseases");
+        MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "L.V. Senyuk");
+        MetadatumDTO type = createMetadatumDTO("dc", "type", null, "journal-article");
+        MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2016");
+        MetadatumDTO ispartof = createMetadatumDTO("dc", "relation", "ispartof",
+                                   "Ukraïnsʹkij žurnal medicini, bìologìï ta sportu");
+        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", "doi", "10.26693/jmbs01.02.184");
+        MetadatumDTO issn = createMetadatumDTO("dc", "identifier", "issn", "2415-3060");
+        MetadatumDTO volume = createMetadatumDTO("oaire", "citation", "volume", "1");
+        MetadatumDTO issue = createMetadatumDTO("oaire", "citation", "issue", "2");
+
+        metadatums.add(title);
+        metadatums.add(author);
+        metadatums.add(date);
+        metadatums.add(type);
+        metadatums.add(ispartof);
+        metadatums.add(doi);
+        metadatums.add(issn);
+        metadatums.add(volume);
+        metadatums.add(issue);
+
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
+                "Ischemic Heart Disease and Role of Nurse of Cardiology Department");
+        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "K. І. Kozak");
+        MetadatumDTO type2 = createMetadatumDTO("dc", "type", null, "journal-article");
+        MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2016");
+        MetadatumDTO ispartof2 = createMetadatumDTO("dc", "relation", "ispartof",
+                                     "Ukraïnsʹkij žurnal medicini, bìologìï ta sportu");
+        MetadatumDTO doi2 = createMetadatumDTO("dc", "identifier", "doi", "10.26693/jmbs01.02.105");
+        MetadatumDTO issn2 = createMetadatumDTO("dc", "identifier", "issn", "2415-3060");
+        MetadatumDTO volume2 = createMetadatumDTO("oaire", "citation", "volume", "1");
+        MetadatumDTO issue2 = createMetadatumDTO("oaire", "citation", "issue", "2");
+
+        metadatums2.add(title2);
+        metadatums2.add(author2);
+        metadatums2.add(date2);
+        metadatums2.add(type2);
+        metadatums2.add(ispartof2);
+        metadatums2.add(doi2);
+        metadatums2.add(issn2);
+        metadatums2.add(volume2);
+        metadatums2.add(issue2);
+
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DataCiteImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DataCiteImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..83ebc40c79
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DataCiteImportMetadataSourceServiceIT.java
@@ -0,0 +1,149 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datacite.DataCiteImportMetadataSourceServiceImpl;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Integration tests for {@link DataCiteImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class DataCiteImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private LiveImportClientImpl liveImportClientImpl;
+
+    @Autowired
+    private DataCiteImportMetadataSourceServiceImpl dataCiteServiceImpl;
+
+    @Test
+    public void dataCiteImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream dataCiteResp = getClass().getResourceAsStream("dataCite-test.json")) {
+            String dataCiteRespXmlResp = IOUtils.toString(dataCiteResp, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(dataCiteRespXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = dataCiteServiceImpl.getRecords("10.48550/arxiv.2207.04779",
+                    0, -1);
+            assertEquals(1, recordsImported.size());
+            matchRecords(new ArrayList<>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void dataCiteImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream dataciteResp = getClass().getResourceAsStream("dataCite-test.json")) {
+            String dataciteTextResp = IOUtils.toString(dataciteResp, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(dataciteTextResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = dataCiteServiceImpl.getRecordsCount("10.48550/arxiv.2207.04779");
+            assertEquals(1, tot);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test(expected = MethodNotFoundException.class)
+    public void dataCiteImportMetadataFindMatchingRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        org.dspace.content.Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                                              .withName("Collection 1")
+                                                              .build();
+
+        Item testItem = ItemBuilder.createItem(context, col1)
+                                   .withTitle("test item")
+                                   .withIssueDate("2021")
+                                   .build();
+
+        context.restoreAuthSystemState();
+        dataCiteServiceImpl.findMatchingRecords(testItem);
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        //define first record
+        List<MetadatumDTO> metadatums  = new ArrayList<>();
+        MetadatumDTO title = createMetadatumDTO("dc", "title", null,
+                "Mathematical Proof Between Generations");
+        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", "doi", "10.48550/arxiv.2207.04779");
+        MetadatumDTO author1 = createMetadatumDTO("dc", "contributor", "author", "Bayer, Jonas");
+        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "Benzmüller, Christoph");
+        MetadatumDTO author3 = createMetadatumDTO("dc", "contributor", "author", "Buzzard, Kevin");
+        MetadatumDTO author4 = createMetadatumDTO("dc", "contributor", "author", "David, Marco");
+        MetadatumDTO author5 = createMetadatumDTO("dc", "contributor", "author", "Lamport, Leslie");
+        MetadatumDTO author6 = createMetadatumDTO("dc", "contributor", "author", "Matiyasevich, Yuri");
+        MetadatumDTO author7 = createMetadatumDTO("dc", "contributor", "author", "Paulson, Lawrence");
+        MetadatumDTO author8 = createMetadatumDTO("dc", "contributor", "author", "Schleicher, Dierk");
+        MetadatumDTO author9 = createMetadatumDTO("dc", "contributor", "author", "Stock, Benedikt");
+        MetadatumDTO author10 = createMetadatumDTO("dc", "contributor", "author", "Zelmanov, Efim");
+        metadatums.add(title);
+        metadatums.add(doi);
+        metadatums.add(author1);
+        metadatums.add(author2);
+        metadatums.add(author3);
+        metadatums.add(author4);
+        metadatums.add(author5);
+        metadatums.add(author6);
+        metadatums.add(author7);
+        metadatums.add(author8);
+        metadatums.add(author9);
+        metadatums.add(author10);
+
+        ImportRecord firstRecord = new ImportRecord(metadatums);
+
+        records.add(firstRecord);
+        return records;
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
index aab10de12a..b604bcd958 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
@@ -56,6 +56,7 @@ import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.authority.Choices;
+import org.dspace.content.authority.service.ChoiceAuthorityService;
 import org.dspace.content.authority.service.MetadataAuthorityService;
 import org.dspace.discovery.configuration.DiscoverySortFieldConfiguration;
 import org.dspace.eperson.EPerson;
@@ -77,6 +78,8 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
     @Autowired
     MetadataAuthorityService metadataAuthorityService;
 
+    @Autowired
+    ChoiceAuthorityService choiceAuthorityService;
 
     @Test
     public void rootDiscoverTest() throws Exception {
@@ -200,6 +203,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
         configurationService.setProperty("authority.controlled.dc.contributor.author", "true");
 
         metadataAuthorityService.clearCache();
+        choiceAuthorityService.clearCache();
 
         //Turn off the authorization system, otherwise we can't make the objects
         context.turnOffAuthorisationSystem();
@@ -281,6 +285,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
         DSpaceServicesFactory.getInstance().getConfigurationService().reloadConfig();
 
         metadataAuthorityService.clearCache();
+        choiceAuthorityService.clearCache();
 
     }
 
@@ -355,6 +360,146 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
         ;
     }
 
+    @Test
+    public void discoverFacetsAuthorTestWithPrefix_Capital_And_Special_Chars() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection").build();
+
+        Item publicItem1 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item 1")
+                                      .withIssueDate("2017-10-17")
+                                      .withAuthor("Smith, John")
+                                      .withAuthor("Jan, Doe")
+                                      .build();
+
+        Item publicItem2 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item 2")
+                                      .withIssueDate("2016-02-13")
+                                      .withAuthor("S’Idan, Mo")
+                                      .withAuthor("Tick&Tock")
+                                      .build();
+
+        Item publicItem3 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item 3")
+                                      .withIssueDate("2016-02-13")
+                                      .withAuthor("M Akai")
+                                      .withAuthor("stIjn, SmITH")
+                                      .build();
+
+        Item publicItem4 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item 4")
+                                      .withIssueDate("2012-05-13")
+                                      .withSubject("St Augustine")
+                                      .build();
+
+        Item publicItem5 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item 5")
+                                      .withIssueDate("2015-11-23")
+                                      .withSubject("Health & Medicine")
+                                      .build();
+
+        Item publicItem6 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item 6")
+                                      .withIssueDate("2003-07-11")
+                                      .withSubject("1% economy")
+                                      .build();
+
+        Item publicItem7 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item 7")
+                                      .withIssueDate("2008-12-31")
+                                      .withSubject("I.T.")
+                                      .build();
+
+        Item publicItem8 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item 8")
+                                      .withIssueDate("2013-07-21")
+                                      .withSubject("?Unknown")
+                                      .build();
+
+        context.restoreAuthSystemState();
+
+        // The prefix query for author queries should be case-insensitive and correctly handle special characters
+
+        getClient().perform(get("/api/discover/facets/author")
+                                .param("prefix", "Smith"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher.entryFacetWithoutSelfLink("Smith, John"))));
+
+        getClient().perform(get("/api/discover/facets/author")
+                                .param("prefix", "S"))
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher
+                                                              .entryFacetWithoutSelfLink("Smith, John"),
+                                                          FacetValueMatcher
+                                                              .entryFacetWithoutSelfLink("S’Idan, Mo"),
+                                                          FacetValueMatcher
+                                                              .entryFacetWithoutSelfLink("stIjn, SmITH"))));
+
+        getClient().perform(get("/api/discover/facets/author")
+                                .param("prefix", "M A"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher.entryFacetWithoutSelfLink("M Akai"))));
+
+        getClient().perform(get("/api/discover/facets/author")
+                                .param("prefix", "S’I"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher.entryFacetWithoutSelfLink("S’Idan, Mo"))));
+
+        getClient().perform(get("/api/discover/facets/author")
+                                .param("prefix", "Jan, D"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher.entryFacetWithoutSelfLink("Jan, Doe"))));
+
+        getClient().perform(get("/api/discover/facets/author")
+                                .param("prefix", "Tick&"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher.entryFacetWithoutSelfLink("Tick&Tock"))));
+
+        // Should also be the case for subject queries
+
+        getClient().perform(get("/api/discover/facets/subject")
+                                .param("prefix", "St A"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher
+                                                              .entryFacetWithoutSelfLink("St Augustine"))));
+
+        getClient().perform(get("/api/discover/facets/subject")
+                                .param("prefix", "Health & M"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher
+                                                              .entryFacetWithoutSelfLink("Health & Medicine"))));
+
+        getClient().perform(get("/api/discover/facets/subject")
+                                .param("prefix", "1% e"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher.entryFacetWithoutSelfLink("1% economy"))));
+
+        getClient().perform(get("/api/discover/facets/subject")
+                                .param("prefix", "I."))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher.entryFacetWithoutSelfLink("I.T."))));
+
+        getClient().perform(get("/api/discover/facets/subject")
+                                .param("prefix", "?U"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$._embedded.values",
+                                       containsInAnyOrder(FacetValueMatcher.entryFacetWithoutSelfLink("?Unknown"))));
+    }
+
     @Test
     public void discoverFacetsAuthorTestForHasMoreFalse() throws Exception {
         //Turn of the authorization system so that we can create the structure specified below
@@ -4160,7 +4305,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
 
         context.restoreAuthSystemState();
         //** WHEN **
-        // each submitter, including the administrator should see only her submission
+        // each submitter, including the administrator should see only their submission
         String submitterToken = getAuthToken(submitter.getEmail(), password);
         String adminToken = getAuthToken(admin.getEmail(), password);
 
@@ -4454,8 +4599,8 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
         ;
 
         // admin should see two pool items and a claimed task,
-        // one pool item from the submitter and one from herself
-        // because the admin is in the reviewer group for step 1, not because she is an admin
+        // one pool item from the submitter and one from the admin
+        // because the admin is in the reviewer group for step 1, not because they are an admin
         getClient(adminToken).perform(get("/api/discover/search/objects").param("configuration", "workflow"))
                 //** THEN **
                 //The status has to be 200 OK
@@ -4678,7 +4823,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
                 .andExpect(jsonPath("$._links.self.href", containsString("/api/discover/search/objects")))
         ;
 
-        // reviewer1 should not see pool items, as he is not an administrator
+        // reviewer1 should not see pool items, as it is not an administrator
         getClient(reviewer1Token).perform(get("/api/discover/search/objects").param("configuration", "workflowAdmin"))
                 //** THEN **
                 //The status has to be 200 OK
@@ -4696,7 +4841,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
 
 
         // admin should see three pool items and a claimed task
-        // one pool item from the submitter and two from herself
+        // one pool item from the submitter and two from the admin
         getClient(adminToken).perform(get("/api/discover/search/objects").param("configuration", "workflowAdmin"))
                 //** THEN **
                 //The status has to be 200 OK
@@ -4750,7 +4895,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
                 .andExpect(jsonPath("$._links.self.href", containsString("/api/discover/search/objects")))
         ;
 
-        // reviewer2 should not see pool items, as he is not an administrator
+        // reviewer2 should not see pool items, as it is not an administrator
         getClient(reviewer2Token).perform(get("/api/discover/search/objects").param("configuration", "workflowAdmin"))
                 //** THEN **
                 //The status has to be 200 OK
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryVersioningIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryVersioningIT.java
new file mode 100644
index 0000000000..083b27d0e5
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryVersioningIT.java
@@ -0,0 +1,2488 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
+import static org.dspace.content.Relationship.LatestVersionStatus.BOTH;
+import static org.dspace.content.Relationship.LatestVersionStatus.LEFT_ONLY;
+import static org.dspace.content.Relationship.LatestVersionStatus.RIGHT_ONLY;
+import static org.dspace.util.RelationshipVersioningTestUtils.isRel;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.List;
+
+import org.apache.commons.lang3.function.FailableFunction;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.dspace.app.rest.matcher.PageMatcher;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.GroupBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.RelationshipBuilder;
+import org.dspace.builder.RelationshipTypeBuilder;
+import org.dspace.builder.VersionBuilder;
+import org.dspace.builder.WorkflowItemBuilder;
+import org.dspace.builder.WorkspaceItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.RelationshipType;
+import org.dspace.content.WorkspaceItem;
+import org.dspace.content.service.InstallItemService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.DiscoverResult;
+import org.dspace.discovery.IndexingService;
+import org.dspace.discovery.SearchService;
+import org.dspace.discovery.SolrSearchCore;
+import org.dspace.discovery.indexobject.IndexableItem;
+import org.dspace.versioning.Version;
+import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+/**
+ * The purpose of this test class is to verify how the built-in discovery configurations behave
+ * in relation to versioned items.
+ * DSpace needs to index both the latest version of an item, and all previous versions, into Solr.
+ * Some discovery configurations should show all versions, while others should only consider the latest versions.
+ */
+public class DiscoveryVersioningIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private SearchService searchService;
+
+    @Autowired
+    private IndexingService indexingService;
+
+    @Autowired
+    private SolrSearchCore solrSearchCore;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private InstallItemService installItemService;
+
+    @Autowired
+    private WorkspaceItemService workspaceItemService;
+
+    @Autowired
+    private RelationshipService relationshipService;
+
+    protected Community community;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        context.turnOffAuthorisationSystem();
+
+        community = CommunityBuilder.createCommunity(context)
+            .withName("community")
+            .build();
+
+        context.restoreAuthSystemState();
+    }
+
+    @Override
+    @After
+    public void destroy() throws Exception {
+        super.destroy();
+    }
+
+    protected Matcher<? super Object> matchSearchResult(Item item, String title) {
+        return allOf(
+            hasJsonPath("$.type", is("discover")),
+            hasJsonPath("$._links.indexableObject.href", containsString("/api/core/items/" + item.getID())),
+            hasJsonPath("$._embedded.indexableObject", allOf(
+                hasJsonPath("$.uuid", is(item.getID().toString())),
+                hasJsonPath("$.metadata", allOf(
+                    matchMetadata("dc.title", title)
+                ))
+            ))
+        );
+    }
+
+    protected Matcher<? super Object> matchSearchResult(Community community) {
+        return allOf(
+            hasJsonPath("$.type", is("discover")),
+            hasJsonPath("$._links.indexableObject.href", containsString("/api/core/communities/" + community.getID())),
+            hasJsonPath("$._embedded.indexableObject", allOf(
+                hasJsonPath("$.uuid", is(community.getID().toString()))
+            ))
+        );
+    }
+
+    protected Matcher<? super Object> matchSearchResult(Collection collection) {
+        return allOf(
+            hasJsonPath("$.type", is("discover")),
+            hasJsonPath("$._links.indexableObject.href", containsString("/api/core/collections/" + collection.getID())),
+            hasJsonPath("$._embedded.indexableObject", allOf(
+                hasJsonPath("$.uuid", is(collection.getID().toString()))
+            ))
+        );
+    }
+
+    protected void verifyRestSearchObjects(
+        String configuration, List<Matcher<? super Object>> searchResultMatchers
+    ) throws Exception {
+        verifyRestSearchObjects(null, configuration, searchResultMatchers);
+    }
+
+    protected void verifyRestSearchObjects(
+        String authToken, String configuration, List<Matcher<? super Object>> searchResultMatchers
+    ) throws Exception {
+        verifyRestSearchObjects(authToken, configuration, (r) -> r, searchResultMatchers);
+    }
+
+    protected void verifyRestSearchObjects(
+        String authToken, String configuration,
+        FailableFunction<MockHttpServletRequestBuilder, MockHttpServletRequestBuilder, Exception> modifyRequest,
+        List<Matcher<? super Object>> searchResultMatchers
+    ) throws Exception {
+        MockHttpServletRequestBuilder minRequest = get("/api/discover/search/objects")
+            .param("configuration", configuration);
+
+        MockHttpServletRequestBuilder modifiedRequest = modifyRequest.apply(minRequest);
+
+        getClient(authToken).perform(modifiedRequest)
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("discover")))
+            .andExpect(jsonPath("$._embedded.searchResult.page", is(
+                // assume everything fits on one page
+                PageMatcher.pageEntryWithTotalPagesAndElements(
+                    0, 20, searchResultMatchers.size() == 0 ? 0 : 1, searchResultMatchers.size()
+                )
+            )))
+            .andExpect(jsonPath("$._embedded.searchResult._embedded.objects", Matchers.containsInAnyOrder(
+                searchResultMatchers
+            )));
+    }
+
+    protected DiscoverResult getItemSearchResult(Item item) throws Exception {
+        DiscoverQuery query = new DiscoverQuery();
+        query.setQuery(String.format(
+            "search.resourcetype:\"Item\" AND search.resourceid:\"%s\"", item.getID()
+        ));
+        return searchService.search(context, query);
+    }
+
+    protected void verifyIndexed(Item item) throws Exception {
+        DiscoverResult searchResult = getItemSearchResult(item);
+        Assert.assertEquals(1, searchResult.getTotalSearchResults());
+    }
+
+    protected void verifyNotIndexed(Item item) throws Exception {
+        DiscoverResult searchResult = getItemSearchResult(item);
+        Assert.assertEquals(0, searchResult.getTotalSearchResults());
+    }
+
+    protected void verifySolrField(Item item, String fieldName, List<Object> expectedValues) throws Exception {
+        QueryResponse result = solrSearchCore.getSolr().query(new SolrQuery(String.format(
+            "search.resourcetype:\"Item\" AND search.resourceid:\"%s\"", item.getID()
+        )));
+
+        SolrDocumentList docs = result.getResults();
+        Assert.assertEquals(1, docs.size());
+        SolrDocument doc = docs.get(0);
+
+        java.util.Collection<Object> actualValues = doc.getFieldValues(fieldName);
+
+        if (expectedValues == null) {
+            assertNull(actualValues);
+        } else {
+            assertThat(actualValues, containsInAnyOrder(expectedValues.toArray()));
+        }
+    }
+
+    protected Item createNewVersion(Item currentItem, String newTitle) throws Exception {
+        return createNewVersion(currentItem, newTitle, null);
+    }
+
+    protected Item createNewVersion(Item currentItem, String newTitle, Boolean isDiscoverable) throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // create a new version, the resulting item is not yet archived
+        Version v2 = VersionBuilder.createVersion(context, currentItem, "create: " + newTitle)
+            .build();
+        Item newItem = v2.getItem();
+        Assert.assertNotEquals(currentItem, newItem);
+
+        if (isDiscoverable != null) {
+            newItem.setDiscoverable(isDiscoverable);
+        }
+
+        // modify the new version
+        itemService.replaceMetadata(
+            context, newItem, "dc", "title", null, Item.ANY, newTitle, null, -1, 0
+        );
+        itemService.update(context, newItem);
+        context.commit();
+
+        // archive the new version, this implies that VersioningConsumer will unarchive the previous version
+        installItemService.installItem(context, workspaceItemService.findByItem(context, newItem));
+        context.commit();
+        indexingService.commit();
+
+        context.restoreAuthSystemState();
+
+        return newItem;
+    }
+
+    protected Collection createCollection() {
+        return createCollection("collection without entity type", null);
+    }
+
+    protected Collection createCollection(String entityType) {
+        return createCollection("collection: " + entityType, entityType);
+    }
+
+    protected Collection createCollection(String name, String entityType) {
+        context.turnOffAuthorisationSystem();
+
+        CollectionBuilder builder = CollectionBuilder.createCollection(context, community);
+
+        if (name != null) {
+            builder.withName(name);
+        }
+
+        if (entityType != null) {
+            builder.withEntityType(entityType);
+        }
+
+        Collection collection = builder.build();
+
+        context.restoreAuthSystemState();
+
+        return collection;
+    }
+
+    @Test
+    public void test_discoveryXml_default_expectLatestVersionsOnly() throws Exception {
+        final String configuration = null;
+
+        Collection collection = createCollection();
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(community),
+            matchSearchResult(collection),
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(community),
+            matchSearchResult(collection),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_defaultRelationships_allVersions() throws Exception {
+        final String configuration = "default-relationships";
+
+        Collection collection = createCollection();
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(community),
+            matchSearchResult(collection),
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify both items appear in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(community),
+            matchSearchResult(collection),
+            matchSearchResult(i1_1, "item 1.1"),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_site_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "site";
+
+        Collection collection = createCollection();
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(community),
+            matchSearchResult(collection),
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify only item 1.2 appears in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(community),
+            matchSearchResult(collection),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_workspace_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "workspace";
+
+        Collection collection = createCollection();
+
+        // NOTE: this makes sure that the admin user is the creator of the item, so the "submitter_authority"
+        //       filter passes (see SolrServiceWorkspaceWorkflowRestrictionPlugin)
+        context.setCurrentUser(admin);
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(getAuthToken(admin.getEmail(), password), configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify only item 1.2 appears in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(getAuthToken(admin.getEmail(), password), configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    // NOTE: no test for discovery.xml configuration "workflow", because it by definition excludes items
+
+    // NOTE: no test for discovery.xml configuration "workflowAdmin", because it by definition excludes items
+
+    @Test
+    public void test_discoveryXml_undiscoverable_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "undiscoverable";
+
+        Collection collection = createCollection();
+
+        // NOTE: needed to avoid NOT(discoverable:false) filter on solr queries (see SolrServicePrivateItemPlugin)
+        //       when using the searchService directly
+        context.setCurrentUser(admin);
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: necessary to get past the default filter query
+            .makeUnDiscoverable()
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(getAuthToken(admin.getEmail(), password), configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        // NOTE: necessary to force discoverable = false, to get past the default filter query
+        Item i1_2 = createNewVersion(i1_1, "item 1.2", false);
+
+        // verify only item 1.2 appears in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(getAuthToken(admin.getEmail(), password), configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_administrativeView_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "administrativeView";
+
+        Collection collection = createCollection();
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify only item 1.2 appears in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_publication_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "publication";
+
+        Collection collection = createCollection("Publication");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_publicationRelationships_allVersions() throws Exception {
+        final String configuration = "publication-relationships";
+
+        Collection collection = createCollection("Publication");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify both items appear in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1"),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_person_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "person";
+
+        Collection collection = createCollection("Person");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_personRelationships_allVersions() throws Exception {
+        final String configuration = "person-relationships";
+
+        Collection collection = createCollection("Person");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify both items appear in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1"),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_orgunit_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "orgunit";
+
+        Collection collection = createCollection("OrgUnit");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_orgunitRelationships_allVersions() throws Exception {
+        final String configuration = "orgunit-relationships";
+
+        Collection collection = createCollection("OrgUnit");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify both items appear in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1"),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_journalissue_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "journalissue";
+
+        Collection collection = createCollection("JournalIssue");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_journalissueRelationships_allVersions() throws Exception {
+        final String configuration = "journalissue-relationships";
+
+        Collection collection = createCollection("JournalIssue");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify both items appear in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1"),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_journalvolume_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "journalvolume";
+
+        Collection collection = createCollection("JournalVolume");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_journalvolumeRelationships_allVersions() throws Exception {
+        final String configuration = "journalvolume-relationships";
+
+
+        Collection collection = createCollection("JournalVolume");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify both items appear in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1"),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_journal_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "journal";
+
+
+        Collection collection = createCollection("Journal");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_journalRelationships_allVersions() throws Exception {
+        final String configuration = "journal-relationships";
+
+        Collection collection = createCollection("Journal");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify both items appear in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1"),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_project_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "project";
+
+        Collection collection = createCollection("Project");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_projectRelationships_allVersions() throws Exception {
+        final String configuration = "project-relationships";
+
+        Collection collection = createCollection("Project");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify both items appear in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify both items appear in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1"),
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_personOrOrgunit_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "personOrOrgunit";
+
+        Collection collection = createCollection("Person");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify only item 1.2 appears in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_discoveryXml_openAIREFundingAgency_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "openAIREFundingAgency";
+
+
+        Collection collection = createCollection("OrgUnit");
+
+        // create item 1.1 (first version of item 1)
+        context.turnOffAuthorisationSystem();
+        Item i1_1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item 1.1")
+            // NOTE: entity type inherited from collection, necessary to get past the default filter query
+            // NOTE: necessary to get past the default filter query
+            .withType("FundingOrganization")
+            .build();
+        context.restoreAuthSystemState();
+
+        // verify item 1.1 appears in the solr core
+        verifyIndexed(i1_1);
+
+        // verify item 1.1 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_1, "item 1.1")
+        ));
+
+        // create item 1.2 (second version of item 1)
+        Item i1_2 = createNewVersion(i1_1, "item 1.2");
+
+        // verify only item 1.2 appears in the solr core
+        verifyIndexed(i1_1);
+        verifyIndexed(i1_2);
+
+        // verify only item 1.2 appears in /api/discover/search/objects
+        verifyRestSearchObjects(configuration, List.of(
+            matchSearchResult(i1_2, "item 1.2")
+        ));
+    }
+
+    @Test
+    public void test_reindexAfterUpdatingLatestVersionStatus() throws Exception {
+        // NOTE: VersioningConsumer updates the latest version status of relationships
+        //       this implies the relation.* fields change so the relevant items should be re-indexed
+
+        context.turnOffAuthorisationSystem();
+
+        EntityType publicationEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication")
+            .build();
+
+        EntityType projectEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project")
+            .build();
+
+        RelationshipType isProjectOfPublication = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, publicationEntityType, projectEntityType,
+                "isProjectOfPublication", "isPublicationOfProject",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        Collection publicationCollection = createCollection(publicationEntityType.getLabel());
+
+        // create publication 1.1
+        Item pub1_1 = ItemBuilder.createItem(context, publicationCollection)
+            .withTitle("publication 1")
+            .build();
+        String idPub1_1 = pub1_1.getID().toString();
+
+        Collection projectCollection = createCollection(projectEntityType.getLabel());
+
+        // create project 1.1
+        Item pro1_1 = ItemBuilder.createItem(context, projectCollection)
+            .withTitle("project 1")
+            .build();
+        String idPro1_1 = pro1_1.getID().toString();
+
+        // create relationship between publication 1.1 and project 1.1
+        RelationshipBuilder.createRelationshipBuilder(context, pub1_1, pro1_1, isProjectOfPublication)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        // init - test relationships of publication 1.1
+        assertThat(
+            relationshipService.findByItem(context, pub1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // init - test relationships of project 1.1
+        assertThat(
+            relationshipService.findByItem(context, pro1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // init - test relation.* metadata of publication 1.1
+        List<MetadataValue> mdvs1 = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs1.size());
+        assertEquals(pro1_1.getID().toString(), mdvs1.get(0).getValue());
+        assertEquals(0, mdvs1.get(0).getPlace());
+
+        // init - test relation.*.latestForDiscovery metadata of publication 1.1
+        List<MetadataValue> mdvs1a = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs1a.size());
+        assertEquals(pro1_1.getID().toString(), mdvs1a.get(0).getValue());
+        assertEquals(-1, mdvs1a.get(0).getPlace());
+
+        // init - test relation.* metadata of project 1.1
+        List<MetadataValue> mdvs2 = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs2.size());
+        assertEquals(pub1_1.getID().toString(), mdvs2.get(0).getValue());
+        assertEquals(0, mdvs2.get(0).getPlace());
+
+        // init - test relation.*.latestForDiscovery metadata of project 1.1
+        List<MetadataValue> mdvs2a = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs2a.size());
+        assertEquals(pub1_1.getID().toString(), mdvs2a.get(0).getValue());
+        assertEquals(-1, mdvs2a.get(0).getPlace());
+
+        // init - search for related items of publication 1.1
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // init - search for related items of project 1.1
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_1, "publication 1")
+            )
+        );
+
+        // create new version of publication 1.1 => publication 1.2
+        context.turnOffAuthorisationSystem();
+        Item pub1_2 = VersionBuilder.createVersion(context, pub1_1, "pub 1.2").build().getItem();
+        String idPub1_2 = pub1_2.getID().toString();
+        context.commit();
+        indexingService.commit();
+        Assert.assertNotEquals(pub1_1, pub1_2);
+        installItemService.installItem(context, workspaceItemService.findByItem(context, pub1_2));
+        context.commit();
+        indexingService.commit();
+        context.restoreAuthSystemState();
+
+        // cache busting
+        pub1_1 = context.reloadEntity(pub1_1);
+        pub1_2 = context.reloadEntity(pub1_2);
+        pro1_1 = context.reloadEntity(pro1_1);
+
+        // after archive pub 1.2 - test relationships of publication 1.1
+        assertThat(
+            relationshipService.findByItem(context, pub1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        // after archive pub 1.2 - test relationships of publication 1.2
+        assertThat(
+            relationshipService.findByItem(context, pub1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // after archive pub 1.2 - test relationships of project 1.1
+        assertThat(
+            relationshipService.findByItem(context, pro1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // after archive pub 1.2 - test relation.* metadata of publication 1.1
+        List<MetadataValue> mdvs3 = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs3.size());
+        assertEquals(pro1_1.getID().toString(), mdvs3.get(0).getValue());
+        assertEquals(0, mdvs3.get(0).getPlace());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_1, "archived", List.of("false"));
+        verifySolrField(pub1_1, "latestVersion", List.of(false));
+
+        // after archive pub 1.2 - test relation.*.latestForDiscovery metadata of publication 1.1
+        List<MetadataValue> mdvs3a = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(0, mdvs3a.size());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after archive pub 1.2 - test relation.* metadata of publication 1.2
+        List<MetadataValue> mdvs4 = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs4.size());
+        assertEquals(pro1_1.getID().toString(), mdvs4.get(0).getValue());
+        assertEquals(0, mdvs4.get(0).getPlace());
+        verifySolrField(pub1_2, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_2, "archived", List.of("true"));
+        verifySolrField(pub1_2, "latestVersion", List.of(true));
+
+        // after archive pub 1.2 - test relation.*.latestForDiscovery metadata of publication 1.2
+        List<MetadataValue> mdvs4a = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs4a.size());
+        assertEquals(pro1_1.getID().toString(), mdvs4a.get(0).getValue());
+        assertEquals(-1, mdvs4a.get(0).getPlace());
+        verifySolrField(
+            pub1_2, "relation.isProjectOfPublication.latestForDiscovery", List.of(pro1_1.getID().toString())
+        );
+
+        // after archive pub 1.2 - test relation.* metadata of project 1.1
+        List<MetadataValue> mdvs5 = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs5.size());
+        assertEquals(pub1_2.getID().toString(), mdvs5.get(0).getValue());
+        assertEquals(0, mdvs5.get(0).getPlace());
+        verifySolrField(pro1_1, "relation.isPublicationOfProject", List.of(pub1_2.getID().toString()));
+        verifySolrField(pro1_1, "archived", List.of("true"));
+        verifySolrField(pro1_1, "latestVersion", List.of(true));
+
+        // after archive pub 1.2 - test relation.*.latestForDiscovery metadata of project 1.1
+        List<MetadataValue> mdvs5a = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(2, mdvs5a.size());
+        assertThat(mdvs5a, containsInAnyOrder(
+            allOf(
+                hasProperty("value", is(pub1_1.getID().toString())),
+                hasProperty("place", is(-1))
+            ),
+            allOf(
+                hasProperty("value", is(pub1_2.getID().toString())),
+                hasProperty("place", is(-1))
+            )
+        ));
+        verifySolrField(pro1_1, "relation.isPublicationOfProject.latestForDiscovery", List.of(
+            pub1_1.getID().toString(),
+            pub1_2.getID().toString()
+        ));
+
+        // after archive pub 1.2 - search for related items of publication 1.1
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // after archive pub 1.2 - search for related items of publication 1.2
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // after archive pub 1.2 - search for related items of project 1.1
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+
+        // create new version of project 1.1 => project 1.2 BUT DON'T ARCHIVE YET
+        context.turnOffAuthorisationSystem();
+        Item pro1_2 = VersionBuilder.createVersion(context, context.reloadEntity(pro1_1), "pro 1.2").build().getItem();
+        String idPro1_2 = pro1_2.getID().toString();
+        context.commit();
+        indexingService.commit();
+        Assert.assertNotEquals(pro1_1, pro1_2);
+        context.restoreAuthSystemState();
+
+        // cache busting
+        pub1_1 = context.reloadEntity(pub1_1);
+        pub1_2 = context.reloadEntity(pub1_2);
+        pro1_1 = context.reloadEntity(pro1_1);
+        pro1_2 = context.reloadEntity(pro1_2);
+
+        // after create pro 1.2 - test relationships of publication 1.1
+        assertThat(
+            relationshipService.findByItem(context, pub1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        // after create pro 1.2 - test relationships of publication 1.2
+        assertThat(
+            relationshipService.findByItem(context, pub1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_1, BOTH, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_2, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        // after create pro 1.2 - test relationships of project 1.1
+        assertThat(
+            relationshipService.findByItem(context, pro1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // after create pro 1.2 - test relationships of project 1.2
+        assertThat(
+            relationshipService.findByItem(context, pro1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_2, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        // after create pro 1.2 - test relation.* metadata of publication 1.1
+        List<MetadataValue> mdvs6 = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs6.size());
+        assertEquals(pro1_1.getID().toString(), mdvs6.get(0).getValue());
+        assertEquals(0, mdvs6.get(0).getPlace());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_1, "archived", List.of("false"));
+        verifySolrField(pub1_1, "latestVersion", List.of(false));
+
+        // after create pro 1.2 - test relation.*.latestForDiscovery metadata of publication 1.1
+        List<MetadataValue> mdvs6a = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(0, mdvs6a.size());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after create pro 1.2 - test relation.* metadata of publication 1.2
+        List<MetadataValue> mdvs7 = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs7.size());
+        assertEquals(pro1_1.getID().toString(), mdvs7.get(0).getValue());
+        assertEquals(0, mdvs7.get(0).getPlace());
+        verifySolrField(pub1_2, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_2, "archived", List.of("true"));
+        verifySolrField(pub1_2, "latestVersion", List.of(true));
+
+        // after create pro 1.2 - test relation.*.latestForDiscovery metadata of publication 1.2
+        List<MetadataValue> mdvs7a = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(2, mdvs7a.size());
+        assertThat(mdvs7a, containsInAnyOrder(
+            allOf(
+                hasProperty("value", is(pro1_1.getID().toString())),
+                hasProperty("place", is(-1))
+            ),
+            allOf(
+                hasProperty("value", is(pro1_2.getID().toString())),
+                hasProperty("place", is(-1))
+            )
+        ));
+        verifySolrField(pub1_2, "relation.isProjectOfPublication.latestForDiscovery", List.of(
+            pro1_1.getID().toString(),
+            pro1_2.getID().toString()
+        ));
+
+        // after create pro 1.2 - test relation.* metadata of project 1.1
+        List<MetadataValue> mdvs8 = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs8.size());
+        assertEquals(pub1_2.getID().toString(), mdvs8.get(0).getValue());
+        assertEquals(0, mdvs8.get(0).getPlace());
+        verifySolrField(pro1_1, "relation.isPublicationOfProject", List.of(pub1_2.getID().toString()));
+        verifySolrField(pro1_1, "archived", List.of("true"));
+        verifySolrField(pro1_1, "latestVersion", List.of(true));
+
+        // after create pro 1.2 - test relation.*.latestForDiscovery metadata of project 1.1
+        List<MetadataValue> mdvs8a = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(2, mdvs8a.size());
+        assertThat(mdvs8a, containsInAnyOrder(
+            allOf(
+                hasProperty("value", is(pub1_1.getID().toString())),
+                hasProperty("place", is(-1))
+            ),
+            allOf(
+                hasProperty("value", is(pub1_2.getID().toString())),
+                hasProperty("place", is(-1))
+            )
+        ));
+        verifySolrField(pro1_1, "relation.isPublicationOfProject.latestForDiscovery", List.of(
+            pub1_1.getID().toString(),
+            pub1_2.getID().toString()
+        ));
+
+        // after create pro 1.2 - test relation.* metadata of project 1.2
+        List<MetadataValue> mdvs9 = itemService
+            .getMetadata(pro1_2, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs9.size());
+        assertEquals(pub1_2.getID().toString(), mdvs9.get(0).getValue());
+        assertEquals(0, mdvs9.get(0).getPlace());
+        // NOTE: project 1.2 is still in the workspace,
+        //       so it should not be indexed as an item (see ItemIndexFactory#getIndexableObjects)
+        verifyNotIndexed(pro1_2);
+
+        // after create pro 1.2 - test relation.*.latestForDiscovery metadata of project 1.2
+        List<MetadataValue> mdvs9a = itemService
+            .getMetadata(pro1_2, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(0, mdvs9a.size());
+        // NOTE: project 1.2 is still in the workspace,
+        //       so it should not be indexed as an item (see ItemIndexFactory#getIndexableObjects)
+        verifyNotIndexed(pro1_2);
+
+        // after create pro 1.2 - search for related items of publication 1.1
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // after create pro 1.2 - search for related items of publication 1.2
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+                // NOTE: project 1.2 is still in the workspace
+            )
+        );
+
+        // after create pro 1.2 - search for related items of project 1.1
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+
+        // after create pro 1.2 - search for related items of project 1.2
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+
+        // archive project 1.2
+        context.turnOffAuthorisationSystem();
+        installItemService.installItem(context, workspaceItemService.findByItem(context, pro1_2));
+        context.commit();
+        indexingService.commit();
+        context.restoreAuthSystemState();
+
+        // cache busting
+        pub1_1 = context.reloadEntity(pub1_1);
+        pub1_2 = context.reloadEntity(pub1_2);
+        pro1_1 = context.reloadEntity(pro1_1);
+        pro1_2 = context.reloadEntity(pro1_2);
+
+        // after archive pro 1.2 - test relationships of publication 1.1
+        assertThat(
+            relationshipService.findByItem(context, pub1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        // after archive pro 1.2 - test relationships of publication 1.2
+        assertThat(
+            relationshipService.findByItem(context, pub1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_1, LEFT_ONLY, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_2, BOTH, 0, 0)
+            ))
+        );
+
+        // after archive pro 1.2 - test relationships of project 1.1
+        assertThat(
+            relationshipService.findByItem(context, pro1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_1, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        // after archive pro 1.2 - test relationships of project 1.2
+        assertThat(
+            relationshipService.findByItem(context, pro1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_2, BOTH, 0, 0)
+            ))
+        );
+
+        // after archive pro 1.2 - test relation.* metadata of publication 1.1
+        List<MetadataValue> mdvs10 = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs10.size());
+        assertEquals(pro1_1.getID().toString(), mdvs10.get(0).getValue());
+        assertEquals(0, mdvs10.get(0).getPlace());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_1, "archived", List.of("false"));
+        verifySolrField(pub1_1, "latestVersion", List.of(false));
+
+        // after archive pro 1.2 - test relation.*.latestForDiscovery metadata of publication 1.1
+        List<MetadataValue> mdvs10a = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(0, mdvs10a.size());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after archive pro 1.2 - test relation.* metadata of publication 1.2
+        List<MetadataValue> mdvs11 = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs11.size());
+        assertEquals(pro1_2.getID().toString(), mdvs11.get(0).getValue());
+        assertEquals(0, mdvs11.get(0).getPlace());
+        verifySolrField(pub1_2, "relation.isProjectOfPublication", List.of(pro1_2.getID().toString()));
+        verifySolrField(pub1_2, "archived", List.of("true"));
+        verifySolrField(pub1_2, "latestVersion", List.of(true));
+
+        // after archive pro 1.2 - test relation.*.latestForDiscovery metadata of publication 1.2
+        List<MetadataValue> mdvs11a = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(2, mdvs11a.size());
+        assertThat(mdvs11a, containsInAnyOrder(
+            allOf(
+                hasProperty("value", is(pro1_1.getID().toString())),
+                hasProperty("place", is(-1))
+            ),
+            allOf(
+                hasProperty("value", is(pro1_2.getID().toString())),
+                hasProperty("place", is(-1))
+            )
+        ));
+        verifySolrField(pub1_2, "relation.isProjectOfPublication.latestForDiscovery", List.of(
+            pro1_1.getID().toString(),
+            pro1_2.getID().toString()
+        ));
+
+        // after archive pro 1.2 - test relation.* metadata of project 1.1
+        List<MetadataValue> mdvs12 = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs12.size());
+        assertEquals(pub1_2.getID().toString(), mdvs12.get(0).getValue());
+        assertEquals(0, mdvs12.get(0).getPlace());
+        verifySolrField(pro1_1, "relation.isPublicationOfProject", List.of(pub1_2.getID().toString()));
+        verifySolrField(pro1_1, "archived", List.of("false"));
+        verifySolrField(pro1_1, "latestVersion", List.of(false));
+
+        // after archive pro 1.2 - test relation.*.latestForDiscovery metadata of project 1.1
+        List<MetadataValue> mdvs12a = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs12a.size());
+        assertEquals(pub1_1.getID().toString(), mdvs12a.get(0).getValue());
+        assertEquals(-1, mdvs12a.get(0).getPlace());
+        verifySolrField(
+            pro1_1, "relation.isPublicationOfProject.latestForDiscovery", List.of(pub1_1.getID().toString())
+        );
+
+        // after archive pro 1.2 - test relation.* metadata of project 1.2
+        List<MetadataValue> mdvs13 = itemService
+            .getMetadata(pro1_2, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs13.size());
+        assertEquals(pub1_2.getID().toString(), mdvs13.get(0).getValue());
+        assertEquals(0, mdvs13.get(0).getPlace());
+        verifySolrField(pro1_2, "relation.isPublicationOfProject", List.of(pub1_2.getID().toString()));
+        verifySolrField(pro1_2, "archived", List.of("true"));
+        verifySolrField(pro1_2, "latestVersion", List.of(true));
+
+        // after archive pro 1.2 - test relation.*.latestForDiscovery metadata of project 1.2
+        List<MetadataValue> mdvs13a = itemService
+            .getMetadata(pro1_2, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs13a.size());
+        assertEquals(pub1_2.getID().toString(), mdvs13a.get(0).getValue());
+        assertEquals(-1, mdvs13a.get(0).getPlace());
+        verifySolrField(
+            pro1_2, "relation.isPublicationOfProject.latestForDiscovery", List.of(pub1_2.getID().toString())
+        );
+
+        // after archive pro 1.2 - search for related items of publication 1.1
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // after archive pro 1.2 - search for related items of publication 1.2
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_2, "project 1")
+            )
+        );
+
+        // after archive pro 1.2 - search for related items of project 1.1
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+
+        // after archive pro 1.2 - search for related items of project 1.2
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+    }
+
+    @Test
+    public void test_forceReindexAfterNewVersionInWorkspace() throws Exception {
+        // NOTE: VersioningConsumer updates the latest version status of relationships
+        //       this implies the relation.* fields change so the relevant items should be re-indexed
+
+        context.turnOffAuthorisationSystem();
+
+        EntityType publicationEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication")
+            .build();
+
+        EntityType projectEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project")
+            .build();
+
+        RelationshipType isProjectOfPublication = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, publicationEntityType, projectEntityType,
+                "isProjectOfPublication", "isPublicationOfProject",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        Collection publicationCollection = createCollection(publicationEntityType.getLabel());
+
+        // create publication 1.1
+        Item pub1_1 = ItemBuilder.createItem(context, publicationCollection)
+            .withTitle("publication 1")
+            .build();
+        String idPub1_1 = pub1_1.getID().toString();
+
+        Collection projectCollection = createCollection(projectEntityType.getLabel());
+
+        // create project 1.1
+        Item pro1_1 = ItemBuilder.createItem(context, projectCollection)
+            .withTitle("project 1")
+            .build();
+        String idPro1_1 = pro1_1.getID().toString();
+
+        // create relationship between publication 1.1 and project 1.1
+        RelationshipBuilder.createRelationshipBuilder(context, pub1_1, pro1_1, isProjectOfPublication)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        // init - test relationships of publication 1.1
+        assertThat(
+            relationshipService.findByItem(context, pub1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // init - test relationships of project 1.1
+        assertThat(
+            relationshipService.findByItem(context, pro1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // init - test relation.* metadata of publication 1.1
+        List<MetadataValue> mdvs1 = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs1.size());
+        assertEquals(pro1_1.getID().toString(), mdvs1.get(0).getValue());
+        assertEquals(0, mdvs1.get(0).getPlace());
+
+        // init - test relation.*.latestForDiscovery metadata of publication 1.1
+        List<MetadataValue> mdvs1a = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs1a.size());
+        assertEquals(pro1_1.getID().toString(), mdvs1a.get(0).getValue());
+        assertEquals(-1, mdvs1a.get(0).getPlace());
+
+        // init - test relation.* metadata of project 1.1
+        List<MetadataValue> mdvs2 = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs2.size());
+        assertEquals(pub1_1.getID().toString(), mdvs2.get(0).getValue());
+        assertEquals(0, mdvs2.get(0).getPlace());
+
+        // init - test relation.*.latestForDiscovery metadata of project 1.1
+        List<MetadataValue> mdvs2a = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs2a.size());
+        assertEquals(pub1_1.getID().toString(), mdvs2a.get(0).getValue());
+        assertEquals(-1, mdvs2a.get(0).getPlace());
+
+        // init - search for related items of publication 1.1
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // init - search for related items of project 1.1
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_1, "publication 1")
+            )
+        );
+
+        // create new version of publication 1.1 => publication 1.2
+        context.turnOffAuthorisationSystem();
+        Item pub1_2 = VersionBuilder.createVersion(context, pub1_1, "pub 1.2").build().getItem();
+        String idPub1_2 = pub1_2.getID().toString();
+        context.commit();
+        indexingService.commit();
+        Assert.assertNotEquals(pub1_1, pub1_2);
+        installItemService.installItem(context, workspaceItemService.findByItem(context, pub1_2));
+        context.commit();
+        indexingService.commit();
+        context.restoreAuthSystemState();
+
+        // cache busting
+        pub1_1 = context.reloadEntity(pub1_1);
+        pub1_2 = context.reloadEntity(pub1_2);
+        pro1_1 = context.reloadEntity(pro1_1);
+
+        // after archive pub 1.2 - test relationships of publication 1.1
+        assertThat(
+            relationshipService.findByItem(context, pub1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        // after archive pub 1.2 - test relationships of publication 1.2
+        assertThat(
+            relationshipService.findByItem(context, pub1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // after archive pub 1.2 - test relationships of project 1.1
+        assertThat(
+            relationshipService.findByItem(context, pro1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // after archive pub 1.2 - test relation.* metadata of publication 1.1
+        List<MetadataValue> mdvs3 = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs3.size());
+        assertEquals(pro1_1.getID().toString(), mdvs3.get(0).getValue());
+        assertEquals(0, mdvs3.get(0).getPlace());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_1, "archived", List.of("false"));
+        verifySolrField(pub1_1, "latestVersion", List.of(false));
+
+        // after archive pub 1.2 - test relation.*.latestForDiscovery metadata of publication 1.1
+        List<MetadataValue> mdvs3a = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(0, mdvs3a.size());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after archive pub 1.2 - test relation.* metadata of publication 1.2
+        List<MetadataValue> mdvs4 = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs4.size());
+        assertEquals(pro1_1.getID().toString(), mdvs4.get(0).getValue());
+        assertEquals(0, mdvs4.get(0).getPlace());
+        verifySolrField(pub1_2, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_2, "archived", List.of("true"));
+        verifySolrField(pub1_2, "latestVersion", List.of(true));
+
+        // after archive pub 1.2 - test relation.*.latestForDiscovery metadata of publication 1.2
+        List<MetadataValue> mdvs4a = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs4a.size());
+        assertEquals(pro1_1.getID().toString(), mdvs4a.get(0).getValue());
+        assertEquals(-1, mdvs4a.get(0).getPlace());
+        verifySolrField(
+            pub1_2, "relation.isProjectOfPublication.latestForDiscovery", List.of(pro1_1.getID().toString())
+        );
+
+        // after archive pub 1.2 - test relation.* metadata of project 1.1
+        List<MetadataValue> mdvs5 = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs5.size());
+        assertEquals(pub1_2.getID().toString(), mdvs5.get(0).getValue());
+        assertEquals(0, mdvs5.get(0).getPlace());
+        verifySolrField(pro1_1, "relation.isPublicationOfProject", List.of(pub1_2.getID().toString()));
+        verifySolrField(pro1_1, "archived", List.of("true"));
+        verifySolrField(pro1_1, "latestVersion", List.of(true));
+
+        // after archive pub 1.2 - test relation.*.latestForDiscovery metadata of project 1.1
+        List<MetadataValue> mdvs5a = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(2, mdvs5a.size());
+        assertThat(mdvs5a, containsInAnyOrder(
+            allOf(
+                hasProperty("value", is(pub1_1.getID().toString())),
+                hasProperty("place", is(-1))
+            ),
+            allOf(
+                hasProperty("value", is(pub1_2.getID().toString())),
+                hasProperty("place", is(-1))
+            )
+        ));
+        verifySolrField(pro1_1, "relation.isPublicationOfProject.latestForDiscovery", List.of(
+            pub1_1.getID().toString(),
+            pub1_2.getID().toString()
+        ));
+
+        // after archive pub 1.2 - search for related items of publication 1.1
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // after archive pub 1.2 - search for related items of publication 1.2
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // after archive pub 1.2 - search for related items of project 1.1
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+
+        // create new version of project 1.1 => project 1.2 BUT DON'T ARCHIVE YET
+        context.turnOffAuthorisationSystem();
+        Item pro1_2 = VersionBuilder.createVersion(context, context.reloadEntity(pro1_1), "pro 1.2").build().getItem();
+        String idPro1_2 = pro1_2.getID().toString();
+        context.commit();
+        indexingService.commit();
+        Assert.assertNotEquals(pro1_1, pro1_2);
+        context.restoreAuthSystemState();
+
+        // cache busting
+        pub1_1 = context.reloadEntity(pub1_1);
+        pub1_2 = context.reloadEntity(pub1_2);
+        pro1_1 = context.reloadEntity(pro1_1);
+        pro1_2 = context.reloadEntity(pro1_2);
+
+        // force reindex => expect that project 1.1 is still marked as latest version (for now)
+        indexingService.indexContent(context, new IndexableItem(pub1_1), true);
+        indexingService.indexContent(context, new IndexableItem(pub1_2), true);
+        indexingService.indexContent(context, new IndexableItem(pro1_1), true);
+        // NOTE: project 1.2 shouldn't be indexed yet
+        indexingService.commit();
+
+        // after create pro 1.2 - test relationships of publication 1.1
+        assertThat(
+            relationshipService.findByItem(context, pub1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        // after create pro 1.2 - test relationships of publication 1.2
+        assertThat(
+            relationshipService.findByItem(context, pub1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_1, BOTH, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_2, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        // after create pro 1.2 - test relationships of project 1.1
+        assertThat(
+            relationshipService.findByItem(context, pro1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_1, BOTH, 0, 0)
+            ))
+        );
+
+        // after create pro 1.2 - test relationships of project 1.2
+        assertThat(
+            relationshipService.findByItem(context, pro1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_2, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        // after create pro 1.2 - test relation.* metadata of publication 1.1
+        List<MetadataValue> mdvs6 = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs6.size());
+        assertEquals(pro1_1.getID().toString(), mdvs6.get(0).getValue());
+        assertEquals(0, mdvs6.get(0).getPlace());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_1, "archived", List.of("false"));
+        verifySolrField(pub1_1, "latestVersion", List.of(false));
+
+        // after create pro 1.2 - test relation.*.latestForDiscovery metadata of publication 1.1
+        List<MetadataValue> mdvs6a = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(0, mdvs6a.size());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after create pro 1.2 - test relation.* metadata of publication 1.2
+        List<MetadataValue> mdvs7 = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs7.size());
+        assertEquals(pro1_1.getID().toString(), mdvs7.get(0).getValue());
+        assertEquals(0, mdvs7.get(0).getPlace());
+        verifySolrField(pub1_2, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_2, "archived", List.of("true"));
+        verifySolrField(pub1_2, "latestVersion", List.of(true));
+
+        // after create pro 1.2 - test relation.*.latestForDiscovery metadata of publication 1.2
+        List<MetadataValue> mdvs7a = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(2, mdvs7a.size());
+        assertThat(mdvs7a, containsInAnyOrder(
+            allOf(
+                hasProperty("value", is(pro1_1.getID().toString())),
+                hasProperty("place", is(-1))
+            ),
+            allOf(
+                hasProperty("value", is(pro1_2.getID().toString())),
+                hasProperty("place", is(-1))
+            )
+        ));
+        verifySolrField(pub1_2, "relation.isProjectOfPublication.latestForDiscovery", List.of(
+            pro1_1.getID().toString(),
+            pro1_2.getID().toString()
+        ));
+
+        // after create pro 1.2 - test relation.* metadata of project 1.1
+        List<MetadataValue> mdvs8 = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs8.size());
+        assertEquals(pub1_2.getID().toString(), mdvs8.get(0).getValue());
+        assertEquals(0, mdvs8.get(0).getPlace());
+        verifySolrField(pro1_1, "relation.isPublicationOfProject", List.of(pub1_2.getID().toString()));
+        verifySolrField(pro1_1, "archived", List.of("true"));
+        verifySolrField(pro1_1, "latestVersion", List.of(true));
+
+        // after create pro 1.2 - test relation.*.latestForDiscovery metadata of project 1.1
+        List<MetadataValue> mdvs8a = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(2, mdvs8a.size());
+        assertThat(mdvs8a, containsInAnyOrder(
+            allOf(
+                hasProperty("value", is(pub1_1.getID().toString())),
+                hasProperty("place", is(-1))
+            ),
+            allOf(
+                hasProperty("value", is(pub1_2.getID().toString())),
+                hasProperty("place", is(-1))
+            )
+        ));
+        verifySolrField(pro1_1, "relation.isPublicationOfProject.latestForDiscovery", List.of(
+            pub1_1.getID().toString(),
+            pub1_2.getID().toString()
+        ));
+
+        // after create pro 1.2 - test relation.* metadata of project 1.2
+        List<MetadataValue> mdvs9 = itemService
+            .getMetadata(pro1_2, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs9.size());
+        assertEquals(pub1_2.getID().toString(), mdvs9.get(0).getValue());
+        assertEquals(0, mdvs9.get(0).getPlace());
+        // NOTE: project 1.2 is still in the workspace,
+        //       so it should not be indexed as an item (see ItemIndexFactory#getIndexableObjects)
+        verifyNotIndexed(pro1_2);
+
+        // after create pro 1.2 - test relation.*.latestForDiscovery metadata of project 1.2
+        List<MetadataValue> mdvs9a = itemService
+            .getMetadata(pro1_2, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(0, mdvs9a.size());
+        // NOTE: project 1.2 is still in the workspace,
+        //       so it should not be indexed as an item (see ItemIndexFactory#getIndexableObjects)
+        verifyNotIndexed(pro1_2);
+
+        // after create pro 1.2 - search for related items of publication 1.1
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // after create pro 1.2 - search for related items of publication 1.2
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+                // NOTE: project 1.2 is still in the workspace
+            )
+        );
+
+        // after create pro 1.2 - search for related items of project 1.1
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+
+        // after create pro 1.2 - search for related items of project 1.2
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+
+        // archive project 1.2
+        context.turnOffAuthorisationSystem();
+        installItemService.installItem(context, workspaceItemService.findByItem(context, pro1_2));
+        context.commit();
+        indexingService.commit();
+        context.restoreAuthSystemState();
+
+        // cache busting
+        pub1_1 = context.reloadEntity(pub1_1);
+        pub1_2 = context.reloadEntity(pub1_2);
+        pro1_1 = context.reloadEntity(pro1_1);
+        pro1_2 = context.reloadEntity(pro1_2);
+
+        // after archive pro 1.2 - test relationships of publication 1.1
+        assertThat(
+            relationshipService.findByItem(context, pub1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0)
+            ))
+        );
+
+        // after archive pro 1.2 - test relationships of publication 1.2
+        assertThat(
+            relationshipService.findByItem(context, pub1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_1, LEFT_ONLY, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_2, BOTH, 0, 0)
+            ))
+        );
+
+        // after archive pro 1.2 - test relationships of project 1.1
+        assertThat(
+            relationshipService.findByItem(context, pro1_1, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_1, isProjectOfPublication, pro1_1, RIGHT_ONLY, 0, 0),
+                isRel(pub1_2, isProjectOfPublication, pro1_1, LEFT_ONLY, 0, 0)
+            ))
+        );
+
+        // after archive pro 1.2 - test relationships of project 1.2
+        assertThat(
+            relationshipService.findByItem(context, pro1_2, -1, -1, false, false),
+            containsInAnyOrder(List.of(
+                isRel(pub1_2, isProjectOfPublication, pro1_2, BOTH, 0, 0)
+            ))
+        );
+
+        // after archive pro 1.2 - test relation.* metadata of publication 1.1
+        List<MetadataValue> mdvs10 = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs10.size());
+        assertEquals(pro1_1.getID().toString(), mdvs10.get(0).getValue());
+        assertEquals(0, mdvs10.get(0).getPlace());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_1, "archived", List.of("false"));
+        verifySolrField(pub1_1, "latestVersion", List.of(false));
+
+        // after archive pro 1.2 - test relation.*.latestForDiscovery metadata of publication 1.1
+        List<MetadataValue> mdvs10a = itemService
+            .getMetadata(pub1_1, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(0, mdvs10a.size());
+        verifySolrField(pub1_1, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after archive pro 1.2 - test relation.* metadata of publication 1.2
+        List<MetadataValue> mdvs11 = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", null, Item.ANY);
+        Assert.assertEquals(1, mdvs11.size());
+        assertEquals(pro1_2.getID().toString(), mdvs11.get(0).getValue());
+        assertEquals(0, mdvs11.get(0).getPlace());
+        verifySolrField(pub1_2, "relation.isProjectOfPublication", List.of(pro1_2.getID().toString()));
+        verifySolrField(pub1_2, "archived", List.of("true"));
+        verifySolrField(pub1_2, "latestVersion", List.of(true));
+
+        // after archive pro 1.2 - test relation.*.latestForDiscovery metadata of publication 1.2
+        List<MetadataValue> mdvs11a = itemService
+            .getMetadata(pub1_2, "relation", "isProjectOfPublication", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(2, mdvs11a.size());
+        assertThat(mdvs11a, containsInAnyOrder(
+            allOf(
+                hasProperty("value", is(pro1_1.getID().toString())),
+                hasProperty("place", is(-1))
+            ),
+            allOf(
+                hasProperty("value", is(pro1_2.getID().toString())),
+                hasProperty("place", is(-1))
+            )
+        ));
+        verifySolrField(pub1_2, "relation.isProjectOfPublication.latestForDiscovery", List.of(
+            pro1_1.getID().toString(),
+            pro1_2.getID().toString()
+        ));
+
+        // after archive pro 1.2 - test relation.* metadata of project 1.1
+        List<MetadataValue> mdvs12 = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs12.size());
+        assertEquals(pub1_2.getID().toString(), mdvs12.get(0).getValue());
+        assertEquals(0, mdvs12.get(0).getPlace());
+        verifySolrField(pro1_1, "relation.isPublicationOfProject", List.of(pub1_2.getID().toString()));
+        verifySolrField(pro1_1, "archived", List.of("false"));
+        verifySolrField(pro1_1, "latestVersion", List.of(false));
+
+        // after archive pro 1.2 - test relation.*.latestForDiscovery metadata of project 1.1
+        List<MetadataValue> mdvs12a = itemService
+            .getMetadata(pro1_1, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs12a.size());
+        assertEquals(pub1_1.getID().toString(), mdvs12a.get(0).getValue());
+        assertEquals(-1, mdvs12a.get(0).getPlace());
+        verifySolrField(
+            pro1_1, "relation.isPublicationOfProject.latestForDiscovery", List.of(pub1_1.getID().toString())
+        );
+
+        // after archive pro 1.2 - test relation.* metadata of project 1.2
+        List<MetadataValue> mdvs13 = itemService
+            .getMetadata(pro1_2, "relation", "isPublicationOfProject", null, Item.ANY);
+        Assert.assertEquals(1, mdvs13.size());
+        assertEquals(pub1_2.getID().toString(), mdvs13.get(0).getValue());
+        assertEquals(0, mdvs13.get(0).getPlace());
+        verifySolrField(pro1_2, "relation.isPublicationOfProject", List.of(pub1_2.getID().toString()));
+        verifySolrField(pro1_2, "archived", List.of("true"));
+        verifySolrField(pro1_2, "latestVersion", List.of(true));
+
+        // after archive pro 1.2 - test relation.*.latestForDiscovery metadata of project 1.2
+        List<MetadataValue> mdvs13a = itemService
+            .getMetadata(pro1_2, "relation", "isPublicationOfProject", "latestForDiscovery", Item.ANY);
+        Assert.assertEquals(1, mdvs13a.size());
+        assertEquals(pub1_2.getID().toString(), mdvs13a.get(0).getValue());
+        assertEquals(-1, mdvs13a.get(0).getPlace());
+        verifySolrField(
+            pro1_2, "relation.isPublicationOfProject.latestForDiscovery", List.of(pub1_2.getID().toString())
+        );
+
+        // after archive pro 1.2 - search for related items of publication 1.1
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_1, "project 1")
+            )
+        );
+
+        // after archive pro 1.2 - search for related items of publication 1.2
+        verifyRestSearchObjects(
+            null, "project-relationships",
+            (r) -> r.param("f.isPublicationOfProject", idPub1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pro1_2, "project 1")
+            )
+        );
+
+        // after archive pro 1.2 - search for related items of project 1.1
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_1 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+
+        // after archive pro 1.2 - search for related items of project 1.2
+        verifyRestSearchObjects(
+            null, "publication-relationships",
+            (r) -> r.param("f.isProjectOfPublication", idPro1_2 + ",equals"),
+            List.of(
+                matchSearchResult(pub1_2, "publication 1")
+            )
+        );
+    }
+
+    @Test
+    public void test_rebuildIndexAllVersionsShouldStillBePresentInSolrCore() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EntityType publicationEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication")
+            .build();
+
+        EntityType projectEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project")
+            .build();
+
+        RelationshipType isProjectOfPublication = RelationshipTypeBuilder.createRelationshipTypeBuilder(
+                context, publicationEntityType, projectEntityType,
+                "isProjectOfPublication", "isPublicationOfProject",
+                null, null, null, null
+            )
+            .withCopyToLeft(false)
+            .withCopyToRight(false)
+            .build();
+
+        Collection publicationCollection = createCollection(publicationEntityType.getLabel());
+
+        Collection projectCollection = createCollection(projectEntityType.getLabel());
+
+        // create publication 1.1
+        Item pub1_1 = ItemBuilder.createItem(context, publicationCollection)
+            .withTitle("pub 1.1")
+            // NOTE: entity type is inherited from collection
+            .build();
+
+        // create project 1.1
+        Item pro1_1 = ItemBuilder.createItem(context, projectCollection)
+            .withTitle("pro 1.1")
+            // NOTE: entity type is inherited from collection
+            .build();
+
+        // create relationship between publication 1.1 and project 1.1
+        RelationshipBuilder.createRelationshipBuilder(context, pub1_1, pro1_1, isProjectOfPublication)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        // create new version of publication 1.1 => publication 1.2
+        Item pub1_2 = createNewVersion(context.reloadEntity(pub1_1), "pub 1.2");
+
+        // create new version of publication 1.2 => publication 1.3
+        Item pub1_3 = createNewVersion(context.reloadEntity(pub1_2), "pub 1.3");
+
+        // create new version of publication 1.3 => publication 1.4
+        Item pub1_4 = createNewVersion(context.reloadEntity(pub1_3), "pub 1.4");
+
+        // cache busting
+        pub1_1 = context.reloadEntity(pub1_1);
+        pub1_2 = context.reloadEntity(pub1_2);
+        pub1_3 = context.reloadEntity(pub1_3);
+        pub1_4 = context.reloadEntity(pub1_4);
+        pro1_1 = context.reloadEntity(pro1_1);
+
+        // before reindex - verify publication 1.1
+        verifyIndexed(pub1_1);
+        verifySolrField(pub1_1, "archived", List.of("false"));
+        verifySolrField(pub1_1, "latestVersion", List.of(false));
+        verifySolrField(pub1_1, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_1, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // before reindex - verify publication 1.2
+        verifyIndexed(pub1_2);
+        verifySolrField(pub1_2, "archived", List.of("false"));
+        verifySolrField(pub1_2, "latestVersion", List.of(false));
+        verifySolrField(pub1_2, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_2, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // before reindex - verify publication 1.3
+        verifyIndexed(pub1_3);
+        verifySolrField(pub1_3, "archived", List.of("false"));
+        verifySolrField(pub1_3, "latestVersion", List.of(false));
+        verifySolrField(pub1_3, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_3, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // before reindex - verify publication 1.4
+        verifyIndexed(pub1_4);
+        verifySolrField(pub1_4, "archived", List.of("true"));
+        verifySolrField(pub1_4, "latestVersion", List.of(true));
+        verifySolrField(pub1_4, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_4, "relation.isProjectOfPublication.latestForDiscovery", List.of(
+            pro1_1.getID().toString()
+        ));
+
+        // before reindex - verify project 1.1
+        verifyIndexed(pro1_1);
+        verifySolrField(pro1_1, "archived", List.of("true"));
+        verifySolrField(pro1_1, "latestVersion", List.of(true));
+        verifySolrField(pro1_1, "relation.isPublicationOfProject", List.of(pub1_4.getID().toString()));
+        verifySolrField(pro1_1, "relation.isPublicationOfProject.latestForDiscovery", List.of(
+            pub1_1.getID().toString(), pub1_2.getID().toString(), pub1_3.getID().toString(), pub1_4.getID().toString()
+        ));
+
+        // force reindex all items
+        indexingService.deleteIndex();
+        indexingService.createIndex(context);
+
+        // after reindex - verify publication 1.1
+        verifyIndexed(pub1_1);
+        verifySolrField(pub1_1, "archived", List.of("false"));
+        verifySolrField(pub1_1, "latestVersion", List.of(false));
+        verifySolrField(pub1_1, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_1, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after reindex - verify publication 1.2
+        verifyIndexed(pub1_2);
+        verifySolrField(pub1_2, "archived", List.of("false"));
+        verifySolrField(pub1_2, "latestVersion", List.of(false));
+        verifySolrField(pub1_2, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_2, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after reindex - verify publication 1.3
+        verifyIndexed(pub1_3);
+        verifySolrField(pub1_3, "archived", List.of("false"));
+        verifySolrField(pub1_3, "latestVersion", List.of(false));
+        verifySolrField(pub1_3, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_3, "relation.isProjectOfPublication.latestForDiscovery", null);
+
+        // after reindex - verify publication 1.4
+        verifyIndexed(pub1_4);
+        verifySolrField(pub1_4, "archived", List.of("true"));
+        verifySolrField(pub1_4, "latestVersion", List.of(true));
+        verifySolrField(pub1_4, "relation.isProjectOfPublication", List.of(pro1_1.getID().toString()));
+        verifySolrField(pub1_4, "relation.isProjectOfPublication.latestForDiscovery", List.of(
+            pro1_1.getID().toString()
+        ));
+
+        // after reindex - verify project 1.1
+        verifyIndexed(pro1_1);
+        verifySolrField(pro1_1, "archived", List.of("true"));
+        verifySolrField(pro1_1, "latestVersion", List.of(true));
+        verifySolrField(pro1_1, "relation.isPublicationOfProject", List.of(pub1_4.getID().toString()));
+        verifySolrField(pro1_1, "relation.isPublicationOfProject.latestForDiscovery", List.of(
+            pub1_1.getID().toString(), pub1_2.getID().toString(), pub1_3.getID().toString(), pub1_4.getID().toString()
+        ));
+    }
+
+    // NOTE: this test makes sure that the changes to ItemIndexFactoryImpl don't break old behavior
+    @Test
+    public void test_rebuildIndex_itemInWorkspaceNotIndexed() throws Exception {
+        Collection collection = createCollection();
+
+        context.turnOffAuthorisationSystem();
+        WorkspaceItem wsi = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+            .withTitle("item 1")
+            .build();
+        context.restoreAuthSystemState();
+
+        verifyNotIndexed(wsi.getItem());
+
+        // force reindex all items
+        indexingService.deleteIndex();
+        indexingService.createIndex(context);
+
+        verifyNotIndexed(wsi.getItem());
+    }
+
+    // NOTE: this test makes sure that the changes to ItemIndexFactoryImpl don't break old behavior
+    @Test
+    public void test_rebuildIndex_itemInWorkflowNotIndexed() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // NOTE: this collection uses the "selectSingleReviewer" workflow, see workflow.xml
+        Collection collection = CollectionBuilder.createCollection(context, community, "123456789/workflow-test-1")
+            .withName("collection")
+            .build();
+
+        // NOTE: the "selectSingleReviewer" requires the "ReviewManagers" group to be present and
+        //       contain at least one member
+        GroupBuilder.createGroup(context)
+            .withName("ReviewManagers")
+            .addMember(admin)
+            .build();
+
+        XmlWorkflowItem wfi = WorkflowItemBuilder.createWorkflowItem(context, collection)
+            .withTitle("item 1")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        verifyNotIndexed(wfi.getItem());
+
+        // force reindex all items
+        indexingService.deleteIndex();
+        indexingService.createIndex(context);
+
+        verifyNotIndexed(wfi.getItem());
+    }
+
+    // NOTE: this test makes sure that the changes to ItemIndexFactoryImpl don't break old behavior
+    @Test
+    public void test_rebuildIndex_templateItemNotIndexed() throws Exception {
+        Collection collection = createCollection();
+
+        context.turnOffAuthorisationSystem();
+        Item templateItem = itemService.createTemplateItem(context, collection);
+        context.restoreAuthSystemState();
+
+        verifyNotIndexed(templateItem);
+
+        // force reindex all items
+        indexingService.deleteIndex();
+        indexingService.createIndex(context);
+
+        verifyNotIndexed(templateItem);
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonAuthorityIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonAuthorityIT.java
new file mode 100644
index 0000000000..3b785bbfa0
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonAuthorityIT.java
@@ -0,0 +1,152 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.matcher.VocabularyMatcher.matchVocabularyEntry;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.sql.SQLException;
+
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.EPersonBuilder;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+
+/**
+ * Integration tests for {@link EPersonAuthority}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class EPersonAuthorityIT extends AbstractControllerIntegrationTest {
+
+
+    @Test
+    public void testEPersonAuthorityWithFirstName() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        String firstEPersonId = createEPerson("Luca", "Giamminonni");
+        String secondEPersonId = createEPerson("Andrea", "Bollini");
+        String thirdEPersonId = createEPerson("Luca", "Bollini");
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(admin.getEmail(), password);
+        getClient(token).perform(get("/api/submission/vocabularies/EPersonAuthority/entries")
+            .param("filter", "Luca"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.entries", containsInAnyOrder(
+                matchVocabularyEntry("Luca Giamminonni", "Luca Giamminonni", "vocabularyEntry", firstEPersonId),
+                matchVocabularyEntry("Luca Bollini", "Luca Bollini", "vocabularyEntry", thirdEPersonId))))
+            .andExpect(jsonPath("$.page.totalElements", Matchers.is(2)));
+
+        getClient(token).perform(get("/api/submission/vocabularies/EPersonAuthority/entries")
+            .param("filter", "Andrea"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.entries", containsInAnyOrder(
+                matchVocabularyEntry("Andrea Bollini", "Andrea Bollini", "vocabularyEntry", secondEPersonId))))
+            .andExpect(jsonPath("$.page.totalElements", Matchers.is(1)));
+
+    }
+
+    @Test
+    public void testEPersonAuthorityWithLastName() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        String firstEPersonId = createEPerson("Luca", "Giamminonni");
+        String secondEPersonId = createEPerson("Andrea", "Bollini");
+        String thirdEPersonId = createEPerson("Luca", "Bollini");
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(admin.getEmail(), password);
+        getClient(token).perform(get("/api/submission/vocabularies/EPersonAuthority/entries")
+            .param("filter", "Giamminonni"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.entries", containsInAnyOrder(
+                matchVocabularyEntry("Luca Giamminonni", "Luca Giamminonni", "vocabularyEntry", firstEPersonId))))
+            .andExpect(jsonPath("$.page.totalElements", Matchers.is(1)));
+
+        getClient(token).perform(get("/api/submission/vocabularies/EPersonAuthority/entries")
+            .param("filter", "Bollini"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.entries", containsInAnyOrder(
+                matchVocabularyEntry("Andrea Bollini", "Andrea Bollini", "vocabularyEntry", secondEPersonId),
+                matchVocabularyEntry("Luca Bollini", "Luca Bollini", "vocabularyEntry", thirdEPersonId))))
+            .andExpect(jsonPath("$.page.totalElements", Matchers.is(2)));
+
+    }
+
+    @Test
+    public void testEPersonAuthorityWithId() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        String firstEPersonId = createEPerson("Luca", "Giamminonni");
+        String secondEPersonId = createEPerson("Andrea", "Bollini");
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(admin.getEmail(), password);
+        getClient(token).perform(get("/api/submission/vocabularies/EPersonAuthority/entries")
+            .param("filter", firstEPersonId))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.entries", containsInAnyOrder(
+                matchVocabularyEntry("Luca Giamminonni", "Luca Giamminonni", "vocabularyEntry", firstEPersonId))))
+            .andExpect(jsonPath("$.page.totalElements", Matchers.is(1)));
+
+        getClient(token).perform(get("/api/submission/vocabularies/EPersonAuthority/entries")
+            .param("filter", secondEPersonId))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.entries", containsInAnyOrder(
+                matchVocabularyEntry("Andrea Bollini", "Andrea Bollini", "vocabularyEntry", secondEPersonId))))
+            .andExpect(jsonPath("$.page.totalElements", Matchers.is(1)));
+
+    }
+
+    @Test
+    public void testEPersonAuthorityWithAnonymousUser() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        createEPerson("Luca", "Giamminonni");
+        createEPerson("Andrea", "Bollini");
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/submission/vocabularies/EPersonAuthority/entries")
+            .param("filter", "Luca"))
+            .andExpect(status().isUnauthorized());
+
+    }
+
+    @Test
+    public void testEPersonAuthorityWithNotAdminUser() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        createEPerson("Luca", "Giamminonni");
+        createEPerson("Andrea", "Bollini");
+        createEPerson("Luca", "Bollini");
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(eperson.getEmail(), password);
+        getClient(token).perform(get("/api/submission/vocabularies/EPersonAuthority/entries")
+            .param("filter", "Luca"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.entries", empty()))
+            .andExpect(jsonPath("$.page.totalElements", Matchers.is(0)));
+
+    }
+
+    private String createEPerson(String firstName, String lastName) throws SQLException {
+        return EPersonBuilder.createEPerson(context)
+            .withNameInMetadata(firstName, lastName)
+            .build()
+            .getID()
+            .toString();
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java
index e6774ebb39..b4ddbfec2f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java
@@ -36,9 +36,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.ws.rs.core.MediaType;
@@ -72,17 +74,14 @@ import org.dspace.core.I18nUtil;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.PasswordHash;
-import org.dspace.eperson.dao.RegistrationDataDAO;
 import org.dspace.eperson.service.AccountService;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.RegistrationDataService;
 import org.dspace.services.ConfigurationService;
-import org.dspace.workflow.WorkflowService;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-
 public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Autowired
@@ -94,11 +93,6 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
     @Autowired
     private EPersonService ePersonService;
 
-    @Autowired
-    private WorkflowService workflowService;
-
-    @Autowired
-    private RegistrationDataDAO registrationDataDAO;
     @Autowired
     private ConfigurationService configurationService;
 
@@ -200,6 +194,41 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
                    .andExpect(status().isNoContent());
     }
 
+    @Test
+    public void testCreateWithInvalidPassword() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        accountService.sendRegistrationInfo(context, "test@fake-email.com");
+        String token = registrationDataService.findByEmail(context, "test@fake-email.com").getToken();
+        context.restoreAuthSystemState();
+
+        String ePersonData = "{" +
+            "   \"metadata\":{" +
+            "      \"eperson.firstname\":[{\"value\":\"John\"}]," +
+            "      \"eperson.lastname\":[{\"value\":\"Doe\"}]" +
+            "   }," +
+            "   \"email\":\"test@fake-email.com\"," +
+            "   \"password\":\"1234\"," +
+            "   \"type\":\"eperson\"" +
+            "}";
+
+        try {
+
+            getClient().perform(post("/api/eperson/epersons")
+                .content(ePersonData)
+                .contentType(contentType)
+                .param("token", token))
+                .andExpect(status().isUnprocessableEntity())
+                .andExpect(status().reason(is("New password is invalid. "
+                    + "Valid passwords must be at least 8 characters long!")));
+        } finally {
+            context.turnOffAuthorisationSystem();
+            registrationDataService.deleteByToken(context, token);
+            context.restoreAuthSystemState();
+        }
+
+    }
+
     @Test
     public void findAllTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -395,7 +424,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         getClient(epersonToken).perform(get("/api/eperson/epersons/" + ePerson2.getID()))
                                .andExpect(status().isForbidden());
 
-        // Verify an unprivilegd user can access information about himself/herself
+        // Verify an unprivileged user can access their own information
         getClient(epersonToken).perform(get("/api/eperson/epersons/" + eperson.getID()))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(contentType))
@@ -1289,7 +1318,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void patchPassword() throws Exception {
-
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "");
         context.turnOffAuthorisationSystem();
 
         EPerson ePerson = EPersonBuilder.createEPerson(context)
@@ -1301,11 +1330,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String newPassword = "newpassword";
-
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, password);
 
         String token = getAuthToken(admin.getEmail(), password);
 
@@ -1352,11 +1377,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String newPassword = "newpassword";
-
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, password);
 
         // eperson one
         String token = getAuthToken(ePerson1.getEmail(), password);
@@ -1386,7 +1407,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void patchPasswordForNonAdminUser() throws Exception {
-
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "");
         context.turnOffAuthorisationSystem();
 
         EPerson ePerson = EPersonBuilder.createEPerson(context)
@@ -1398,11 +1419,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String newPassword = "newpassword";
-
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, password);
 
         String token = getAuthToken(ePerson.getEmail(), password);
 
@@ -1441,12 +1458,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String newPassword = "newpassword";
-
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
-
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, null);
         String token = getAuthToken(admin.getEmail(), password);
 
         // replace of password should fail
@@ -1533,11 +1545,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
-
-        List<Operation> ops = new ArrayList<>();
-        AddOperation addOperation = new AddOperation("/password", null);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(null, null);
 
         // adding null pw should return bad request
         getClient(token).perform(patch("/api/eperson/epersons/" + ePerson.getID())
@@ -1564,7 +1572,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void patchPasswordNotInitialised() throws Exception {
-
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "");
         context.turnOffAuthorisationSystem();
 
         EPerson ePerson = EPersonBuilder.createEPerson(context)
@@ -1578,11 +1586,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         String token = getAuthToken(admin.getEmail(), password);
 
         String newPassword = "newpass";
-
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, null);
 
         // initialize password with add operation, not set during creation
         getClient(token).perform(patch("/api/eperson/epersons/" + ePerson.getID())
@@ -2009,6 +2013,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void patchReplacePasswordWithToken() throws Exception {
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "");
         context.turnOffAuthorisationSystem();
 
         EPerson ePerson = EPersonBuilder.createEPerson(context)
@@ -2021,10 +2026,8 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         context.restoreAuthSystemState();
 
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, null);
+
         accountService.sendRegistrationInfo(context, ePerson.getEmail());
         String tokenForEPerson = registrationDataService.findByEmail(context, ePerson.getEmail()).getToken();
         PasswordHash oldPassword = ePersonService.getPasswordHash(ePerson);
@@ -2057,10 +2060,8 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         context.restoreAuthSystemState();
 
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, null);
+
         accountService.sendRegistrationInfo(context, ePerson.getEmail());
         String tokenForEPerson = registrationDataService.findByEmail(context, ePerson.getEmail()).getToken();
         PasswordHash oldPassword = ePersonService.getPasswordHash(ePerson);
@@ -2102,10 +2103,8 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         context.restoreAuthSystemState();
 
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, null);
+
         accountService.sendRegistrationInfo(context, ePerson.getEmail());
         accountService.sendRegistrationInfo(context, ePersonTwo.getEmail());
         String tokenForEPerson = registrationDataService.findByEmail(context, ePerson.getEmail()).getToken();
@@ -2193,10 +2192,8 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         context.restoreAuthSystemState();
 
-        List<Operation> ops = new ArrayList<Operation>();
-        AddOperation addOperation = new AddOperation("/password", newPassword);
-        ops.add(addOperation);
-        String patchBody = getPatchContent(ops);
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, null);
+
         accountService.sendRegistrationInfo(context, ePerson.getEmail());
         String newRegisterToken = registrationDataService.findByEmail(context, newRegisterEmail).getToken();
         PasswordHash oldPassword = ePersonService.getPasswordHash(ePerson);
@@ -2222,7 +2219,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void postEPersonWithTokenWithoutEmailProperty() throws Exception {
-
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "");
         ObjectMapper mapper = new ObjectMapper();
 
         String newRegisterEmail = "new-register@fake-email.com";
@@ -2286,7 +2283,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void postEPersonWithTokenWithEmailProperty() throws Exception {
-
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "");
         ObjectMapper mapper = new ObjectMapper();
 
         String newRegisterEmail = "new-register@fake-email.com";
@@ -2348,7 +2345,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void postEPersonWithTokenWithEmailAndSelfRegisteredProperty() throws Exception {
-
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "");
         ObjectMapper mapper = new ObjectMapper();
 
         String newRegisterEmail = "new-register@fake-email.com";
@@ -2801,7 +2798,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void postEPersonWithTokenWithEmailPropertyAnonUser() throws Exception {
-
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "");
         ObjectMapper mapper = new ObjectMapper();
 
         String newRegisterEmail = "new-register@fake-email.com";
@@ -3129,4 +3126,295 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     }
 
-}
+    @Test
+    public void validatePasswordRobustnessContainingAtLeastAnUpperCaseCharUnprocessableTest() throws Exception {
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "^(?=.*[A-Z])");
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        String newRegisterEmail = "new-register@fake-email.com";
+        RegistrationRest registrationRest = new RegistrationRest();
+        registrationRest.setEmail(newRegisterEmail);
+
+        getClient().perform(post("/api/eperson/registrations")
+                   .contentType(MediaType.APPLICATION_JSON)
+                   .content(mapper.writeValueAsBytes(registrationRest)))
+                   .andExpect(status().isCreated());
+
+        String newRegisterToken = registrationDataService.findByEmail(context, newRegisterEmail).getToken();
+
+        EPersonRest ePersonRest = new EPersonRest();
+        MetadataRest metadataRest = new MetadataRest();
+        ePersonRest.setCanLogIn(true);
+        MetadataValueRest surname = new MetadataValueRest();
+        surname.setValue("Misha");
+        metadataRest.put("eperson.lastname", surname);
+        MetadataValueRest firstname = new MetadataValueRest();
+        firstname.setValue("Boychuk");
+        metadataRest.put("eperson.firstname", firstname);
+        ePersonRest.setMetadata(metadataRest);
+        ePersonRest.setPassword("lowercasepassword");
+
+        mapper.setAnnotationIntrospector(new IgnoreJacksonWriteOnlyAccess());
+
+        try {
+            getClient().perform(post("/api/eperson/epersons")
+                       .param("token", newRegisterToken)
+                       .content(mapper.writeValueAsBytes(ePersonRest))
+                       .contentType(MediaType.APPLICATION_JSON))
+                       .andExpect(status().isUnprocessableEntity());
+
+        } finally {
+            context.turnOffAuthorisationSystem();
+            registrationDataService.deleteByToken(context, newRegisterToken);
+            context.restoreAuthSystemState();
+        }
+    }
+
+    @Test
+    public void validatePasswordRobustnessContainingAtLeastAnUpperCaseCharTest() throws Exception {
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "^(?=.*[A-Z])");
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        String newRegisterEmail = "new-register@fake-email.com";
+        RegistrationRest registrationRest = new RegistrationRest();
+        registrationRest.setEmail(newRegisterEmail);
+
+        getClient().perform(post("/api/eperson/registrations")
+                   .contentType(MediaType.APPLICATION_JSON)
+                   .content(mapper.writeValueAsBytes(registrationRest)))
+                   .andExpect(status().isCreated());
+
+        String newRegisterToken = registrationDataService.findByEmail(context, newRegisterEmail).getToken();
+
+        EPersonRest ePersonRest = new EPersonRest();
+        MetadataRest metadataRest = new MetadataRest();
+        ePersonRest.setCanLogIn(true);
+        MetadataValueRest surname = new MetadataValueRest();
+        surname.setValue("Boychuk");
+        metadataRest.put("eperson.lastname", surname);
+        MetadataValueRest firstname = new MetadataValueRest();
+        firstname.setValue("Misha");
+        metadataRest.put("eperson.firstname", firstname);
+        ePersonRest.setMetadata(metadataRest);
+        ePersonRest.setPassword("Lowercasepassword");
+        AtomicReference<UUID> idRef = new AtomicReference<UUID>();
+
+        mapper.setAnnotationIntrospector(new IgnoreJacksonWriteOnlyAccess());
+
+        try {
+            getClient().perform(post("/api/eperson/epersons")
+                       .param("token", newRegisterToken)
+                       .content(mapper.writeValueAsBytes(ePersonRest))
+                       .contentType(MediaType.APPLICATION_JSON))
+                       .andExpect(status().isCreated())
+                       .andExpect(jsonPath("$", Matchers.allOf(
+                               hasJsonPath("$.uuid", not(empty())),
+                               hasJsonPath("$.type", is("eperson")),
+                               hasJsonPath("$._links.self.href", not(empty())),
+                               hasJsonPath("$.metadata", Matchers.allOf(
+                                      matchMetadata("eperson.firstname", "Misha"),
+                                      matchMetadata("eperson.lastname", "Boychuk"))))))
+                 .andDo(result -> idRef.set(UUID.fromString(read(result.getResponse().getContentAsString(), "$.id"))));
+
+            EPerson createdEPerson = ePersonService.find(context, UUID.fromString(String.valueOf(idRef.get())));
+            assertTrue(ePersonService.checkPassword(context, createdEPerson, "Lowercasepassword"));
+            assertNull(registrationDataService.findByToken(context, newRegisterToken));
+        } finally {
+            context.turnOffAuthorisationSystem();
+            registrationDataService.deleteByToken(context, newRegisterToken);
+            context.restoreAuthSystemState();
+            EPersonBuilder.deleteEPerson(idRef.get());
+        }
+    }
+
+    @Test
+    public void validatePasswordRobustnessContainingAtLeastAnUppercaseCharPatchUnprocessableTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withNameInMetadata("John", "Doe")
+                                        .withEmail("Johndoe@example.com")
+                                        .withPassword("TestPassword")
+                                        .build();
+
+        context.restoreAuthSystemState();
+
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "^(?=.*[A-Z])");
+
+        String newPassword = "newpassword";
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, "TestPassword");
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        // updates password
+        getClient(token).perform(patch("/api/eperson/epersons/" + ePerson.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                        .andExpect(status().isUnprocessableEntity());
+
+        // can't login with new password
+        token = getAuthToken(ePerson.getEmail(), newPassword);
+        getClient(token).perform(get("/api/authn/status"))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.okay", is(true)))
+                        .andExpect(jsonPath("$.authenticated", is(false)))
+                        .andExpect(jsonPath("$.type", is("status")));
+
+        // login with origin password
+        token = getAuthToken(ePerson.getEmail(), "TestPassword");
+        getClient(token).perform(get("/api/authn/status"))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.okay", is(true)))
+                        .andExpect(jsonPath("$.authenticated", is(true)))
+                        .andExpect(jsonPath("$.type", is("status")));
+    }
+
+    @Test
+    public void validatePasswordRobustnessContainingAtLeastAnUppercaseCharPatchTest() throws Exception {
+        configurationService.setProperty("authentication-password.regex-validation.pattern", "^(?=.*[A-Z])");
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withNameInMetadata("John", "Doe")
+                                        .withEmail("Johndoe@example.com")
+                                        .withPassword("TestPassword")
+                                        .build();
+
+        context.restoreAuthSystemState();
+
+        String newPassword = "Newpassword";
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, "TestPassword");
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        // updates password
+        getClient(token).perform(patch("/api/eperson/epersons/" + ePerson.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                        .andExpect(status().isOk());
+
+        // login with new password
+        token = getAuthToken(ePerson.getEmail(), newPassword);
+        getClient(token).perform(get("/api/authn/status"))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.okay", is(true)))
+                        .andExpect(jsonPath("$.authenticated", is(true)))
+                        .andExpect(jsonPath("$.type", is("status")));
+
+        // can't login with old password
+        token = getAuthToken(ePerson.getEmail(), "TestPassword");
+        getClient(token).perform(get("/api/authn/status"))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.okay", is(true)))
+                        .andExpect(jsonPath("$.authenticated", is(false)))
+                        .andExpect(jsonPath("$.type", is("status")));
+    }
+
+    @Test
+    public void patchChangePassword() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withNameInMetadata("John", "Doe")
+            .withEmail("Johndoe@example.com")
+            .withPassword(password)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String newPassword = "newpassword";
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, password);
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        // updates password
+        getClient(token).perform(patch("/api/eperson/epersons/" + ePerson.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk());
+
+        // login with new password
+        token = getAuthToken(ePerson.getEmail(), newPassword);
+        getClient(token).perform(get("/api/authn/status"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.okay", is(true)))
+            .andExpect(jsonPath("$.authenticated", is(true)))
+            .andExpect(jsonPath("$.type", is("status")));
+
+        // can't login with old password
+        token = getAuthToken(ePerson.getEmail(), password);
+        getClient(token).perform(get("/api/authn/status"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.okay", is(true)))
+            .andExpect(jsonPath("$.authenticated", is(false)))
+            .andExpect(jsonPath("$.type", is("status")));
+    }
+
+    @Test
+    public void patchChangePasswordWithWrongCurrentPassword() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withNameInMetadata("John", "Doe")
+            .withEmail("Johndoe@example.com")
+            .withPassword(password)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String newPassword = "newpassword";
+        String wrongPassword = "wrong_password";
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, wrongPassword);
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(patch("/api/eperson/epersons/" + ePerson.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void patchChangePasswordWithNoCurrentPassword() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withNameInMetadata("John", "Doe")
+            .withEmail("Johndoe@example.com")
+            .withPassword(password)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String newPassword = "newpassword";
+        String patchBody = buildPasswordAddOperationPatchBody(newPassword, null);
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(patch("/api/eperson/epersons/" + ePerson.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isForbidden());
+    }
+
+    private String buildPasswordAddOperationPatchBody(String password, String currentPassword) {
+
+        Map<String, String> value = new HashMap<>();
+        if (password != null) {
+            value.put("new_password", password);
+        }
+        if (currentPassword != null) {
+            value.put("current_password", currentPassword);
+        }
+
+        return getPatchContent(List.of(new AddOperation("/password", value)));
+
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EntityTypeRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EntityTypeRestRepositoryIT.java
index 93aacb60e4..740a2c0dc3 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EntityTypeRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EntityTypeRestRepositoryIT.java
@@ -86,13 +86,13 @@ public class EntityTypeRestRepositoryIT extends AbstractEntityIntegrationTest {
                    .andExpect(jsonPath("$._links.self.href", containsString("api/core/entitytypes")))
                    //We have 4 facets in the default configuration, they need to all be present in the embedded section
                    .andExpect(jsonPath("$._embedded.entitytypes", containsInAnyOrder(
-                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context,
-                             Constants.ENTITY_TYPE_NONE)),
+                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Journal")),
                        EntityTypeMatcher
-                           .matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Publication")),
-                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Person")),
-                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Project")),
-                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "OrgUnit"))
+                           .matchEntityTypeEntry(entityTypeService.findByEntityType(context, "JournalIssue")),
+                       EntityTypeMatcher
+                           .matchEntityTypeEntry(entityTypeService.findByEntityType(context, "JournalVolume")),
+                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "OrgUnit")),
+                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Person"))
                    )));
 
         getClient().perform(get("/api/core/entitytypes").param("size", "5").param("page", "1"))
@@ -108,11 +108,12 @@ public class EntityTypeRestRepositoryIT extends AbstractEntityIntegrationTest {
                    .andExpect(jsonPath("$._links.self.href", containsString("api/core/entitytypes")))
                    //We have 4 facets in the default configuration, they need to all be present in the embedded section
                    .andExpect(jsonPath("$._embedded.entitytypes", containsInAnyOrder(
-                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Journal")),
+                       EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Project")),
                        EntityTypeMatcher
-                           .matchEntityTypeEntry(entityTypeService.findByEntityType(context, "JournalVolume")),
+                           .matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Publication")),
                        EntityTypeMatcher
-                           .matchEntityTypeEntry(entityTypeService.findByEntityType(context, "JournalIssue"))
+                           .matchEntityTypeEntry(entityTypeService.findByEntityType(context,
+                                                                                    Constants.ENTITY_TYPE_NONE))
                    )));
     }
 
@@ -137,10 +138,11 @@ public class EntityTypeRestRepositoryIT extends AbstractEntityIntegrationTest {
                    .param("size", "3"))
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$._embedded.entitytypes", containsInAnyOrder(
-                    EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Publication")),
-                    EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Person")),
+                    EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Journal")),
                     EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context,
-                    Constants.ENTITY_TYPE_NONE))
+                                                                                              "JournalIssue")),
+                    EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context,
+                                                                                              "JournalVolume"))
                     )))
                    .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
                            Matchers.containsString("/api/core/entitytypes?"),
@@ -165,7 +167,7 @@ public class EntityTypeRestRepositoryIT extends AbstractEntityIntegrationTest {
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$._embedded.entitytypes", containsInAnyOrder(
                     EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "OrgUnit")),
-                    EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Journal")),
+                    EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Person")),
                     EntityTypeMatcher.matchEntityTypeEntry(entityTypeService.findByEntityType(context, "Project"))
                     )))
                    .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EpoImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EpoImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..60408e6d8b
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EpoImportMetadataSourceServiceIT.java
@@ -0,0 +1,221 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.epo.service.EpoImportMetadataSourceServiceImpl;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link EpoImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class EpoImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private LiveImportClientImpl liveImportClient;
+
+    @Autowired
+    private EpoImportMetadataSourceServiceImpl epoServiceImpl;
+
+    @Test
+    public void epoImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        InputStream file2token = null;
+        InputStream file = null;
+        InputStream file2 = null;
+        InputStream file3 = null;
+        String originKey = epoServiceImpl.getConsumerKey();
+        String originSecret = epoServiceImpl.getConsumerSecret();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try {
+            file2token = getClass().getResourceAsStream("epo-token.json");
+            file = getClass().getResourceAsStream("epo-resp.xml");
+            file2 = getClass().getResourceAsStream("epo-first.xml");
+            file3 = getClass().getResourceAsStream("epo-second.xml");
+
+            String tokenResp = IOUtils.toString(file2token, Charset.defaultCharset());
+            String epoResp = IOUtils.toString(file, Charset.defaultCharset());
+            String epoResp2 = IOUtils.toString(file2, Charset.defaultCharset());
+            String epoResp3 = IOUtils.toString(file3, Charset.defaultCharset());
+
+            epoServiceImpl.setConsumerKey("test-key");
+            epoServiceImpl.setConsumerSecret("test-secret");
+            liveImportClient.setHttpClient(httpClient);
+
+            CloseableHttpResponse responseWithToken = mockResponse(tokenResp, 200, "OK");
+            CloseableHttpResponse response1 = mockResponse(epoResp, 200, "OK");
+            CloseableHttpResponse response2 = mockResponse(epoResp2, 200, "OK");
+            CloseableHttpResponse response3 = mockResponse(epoResp3, 200, "OK");
+
+            when(httpClient.execute(ArgumentMatchers.any()))
+                           .thenReturn(responseWithToken, response1, response2, response3);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = epoServiceImpl.getRecords("test query", 0, 2);
+            assertEquals(2, recordsImported.size());
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            if (Objects.nonNull(file2token)) {
+                file2token.close();
+            }
+            if (Objects.nonNull(file)) {
+                file.close();
+            }
+            if (Objects.nonNull(file2)) {
+                file2.close();
+            }
+            if (Objects.nonNull(file3)) {
+                file3.close();
+            }
+            epoServiceImpl.setConsumerKey(originKey);
+            epoServiceImpl.setConsumerSecret(originSecret);
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void epoImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        InputStream file = null;
+        InputStream file2 = null;
+        String originKey = epoServiceImpl.getConsumerKey();
+        String originSecret = epoServiceImpl.getConsumerSecret();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try {
+            file = getClass().getResourceAsStream("epo-token.json");
+            file2 = getClass().getResourceAsStream("epo-resp.xml");
+            String token = IOUtils.toString(file, Charset.defaultCharset());
+            String epoResp = IOUtils.toString(file2, Charset.defaultCharset());
+
+            epoServiceImpl.setConsumerKey("test-key");
+            epoServiceImpl.setConsumerSecret("test-secret");
+            liveImportClient.setHttpClient(httpClient);
+
+            CloseableHttpResponse responseWithToken = mockResponse(token, 200, "OK");
+            CloseableHttpResponse response1 = mockResponse(epoResp, 200, "OK");
+
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(responseWithToken, response1);
+
+            context.restoreAuthSystemState();
+            int tot = epoServiceImpl.getRecordsCount("test query");
+            assertEquals(10000, tot);
+        } finally {
+            if (Objects.nonNull(file)) {
+                file.close();
+            }
+            if (Objects.nonNull(file2)) {
+                file2.close();
+            }
+            epoServiceImpl.setConsumerKey(originKey);
+            epoServiceImpl.setConsumerSecret(originSecret);
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        //define first record
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO identifierOther = createMetadatumDTO("dc", "identifier", "other", "epodoc:ES2902749T");
+        MetadatumDTO identifier = createMetadatumDTO("dc", "identifier", null, "18705153");
+        MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2022-01-29");
+        MetadatumDTO dateSubmitted = createMetadatumDTO("dc", "date", "submitted", "2018-01-19");
+        MetadatumDTO applicant = createMetadatumDTO("dc", "contributor", null, "PANKA BLOOD TEST GMBH");
+        MetadatumDTO applicant2 = createMetadatumDTO("dc", "contributor", null, "Panka Blood Test GmbH");
+        MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "PANTEL KLAUS");
+        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", " BARTKOWIAK KAI");
+        MetadatumDTO author3 = createMetadatumDTO("dc", "contributor", "author", "PANTEL, Klaus, ");
+        MetadatumDTO author4 = createMetadatumDTO("dc", "contributor", "author", "BARTKOWIAK, Kai");
+        MetadatumDTO title = createMetadatumDTO("dc", "title", null, "Método para el diagnóstico del cáncer de mama");
+        MetadatumDTO subject = createMetadatumDTO("dc", "subject", null,
+                                              "G01N  33/   574            A I                    ");
+
+        metadatums.add(identifierOther);
+        metadatums.add(identifier);
+        metadatums.add(date);
+        metadatums.add(dateSubmitted);
+        metadatums.add(applicant);
+        metadatums.add(applicant2);
+        metadatums.add(author);
+        metadatums.add(author2);
+        metadatums.add(author3);
+        metadatums.add(author4);
+        metadatums.add(title);
+        metadatums.add(subject);
+
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO identifierOther2 = createMetadatumDTO("dc", "identifier", "other", "epodoc:TW202202864");
+        MetadatumDTO identifier2 = createMetadatumDTO("dc", "identifier", null, "109122801");
+        MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2022-01-16");
+        MetadatumDTO dateSubmitted2 = createMetadatumDTO("dc", "date", "submitted", "2020-01-06");
+        MetadatumDTO applicant3 = createMetadatumDTO("dc", "contributor", null, "ADVANTEST CORP [JP]");
+        MetadatumDTO applicant4 = createMetadatumDTO("dc", "contributor", null, "ADVANTEST CORPORATION");
+        MetadatumDTO author5 = createMetadatumDTO("dc", "contributor", "author", "POEPPE OLAF [DE]");
+        MetadatumDTO author6 = createMetadatumDTO("dc", "contributor", "author", " HILLIGES KLAUS-DIETER [DE]");
+        MetadatumDTO author7 = createMetadatumDTO("dc", "contributor", "author", " KRECH ALAN [US]");
+        MetadatumDTO author8 = createMetadatumDTO("dc", "contributor", "author", "POEPPE, OLAF, ");
+        MetadatumDTO author9 = createMetadatumDTO("dc", "contributor", "author", "HILLIGES, KLAUS-DIETER, ");
+        MetadatumDTO author10 = createMetadatumDTO("dc", "contributor", "author", "KRECH, ALAN");
+        MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
+                "Automated test equipment for testing one or more devices under test, method for automated"
+              + " testing of one or more devices under test, and computer program using a buffer memory");
+        MetadatumDTO subject2 = createMetadatumDTO("dc", "subject", null,
+                "G01R  31/   319            A I                    ");
+        MetadatumDTO subject3 = createMetadatumDTO("dc", "subject", null,
+                "G01R  31/  3193            A I                    ");
+        metadatums2.add(identifierOther2);
+        metadatums2.add(identifier2);
+        metadatums2.add(date2);
+        metadatums2.add(dateSubmitted2);
+        metadatums2.add(applicant3);
+        metadatums2.add(applicant4);
+        metadatums2.add(author5);
+        metadatums2.add(author6);
+        metadatums2.add(author7);
+        metadatums2.add(author8);
+        metadatums2.add(author9);
+        metadatums2.add(author10);
+        metadatums2.add(title2);
+        metadatums2.add(subject2);
+        metadatums2.add(subject3);
+
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalSourcesRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalSourcesRestControllerIT.java
index 9205c3b88e..65492cbbe8 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalSourcesRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalSourcesRestControllerIT.java
@@ -41,6 +41,7 @@ public class ExternalSourcesRestControllerIT extends AbstractControllerIntegrati
                             .andExpect(jsonPath("$._embedded.externalsources", Matchers.hasItems(
                                 ExternalSourceMatcher.matchExternalSource("mock", "mock", false),
                                 ExternalSourceMatcher.matchExternalSource("orcid", "orcid", false),
+                                ExternalSourceMatcher.matchExternalSource("scopus", "scopus", false),
                                 ExternalSourceMatcher.matchExternalSource(
                                     "sherpaJournalIssn", "sherpaJournalIssn", false),
                                 ExternalSourceMatcher.matchExternalSource(
@@ -52,7 +53,7 @@ public class ExternalSourcesRestControllerIT extends AbstractControllerIntegrati
                                 ExternalSourceMatcher.matchExternalSource(
                                         "openAIREFunding", "openAIREFunding", false)
                             )))
-                            .andExpect(jsonPath("$.page.totalElements", Matchers.is(7)));
+                            .andExpect(jsonPath("$.page.totalElements", Matchers.is(10)));
     }
 
     @Test
@@ -152,23 +153,19 @@ public class ExternalSourcesRestControllerIT extends AbstractControllerIntegrati
         getClient().perform(get("/api/integration/externalsources/search/findByEntityType")
                    .param("entityType", "Publication"))
                    .andExpect(status().isOk())
-                   // Expect *at least* 3 Publication sources
-                   .andExpect(jsonPath("$._embedded.externalsources", Matchers.hasItems(
-                              ExternalSourceMatcher.matchExternalSource(publicationProviders.get(0)),
-                              ExternalSourceMatcher.matchExternalSource(publicationProviders.get(1))
-                              )))
+                   // Expect that Publication sources match (check a max of 20 as that is default page size)
+                   .andExpect(jsonPath("$._embedded.externalsources",
+                                       ExternalSourceMatcher.matchAllExternalSources(publicationProviders, 20)
+                              ))
                    .andExpect(jsonPath("$.page.totalElements", Matchers.is(publicationProviders.size())));
 
         getClient().perform(get("/api/integration/externalsources/search/findByEntityType")
                    .param("entityType", "Journal"))
                    .andExpect(status().isOk())
-                   // Expect *at least* 5 Journal sources
-                   .andExpect(jsonPath("$._embedded.externalsources", Matchers.hasItems(
-                              ExternalSourceMatcher.matchExternalSource(journalProviders.get(0)),
-                              ExternalSourceMatcher.matchExternalSource(journalProviders.get(1)),
-                              ExternalSourceMatcher.matchExternalSource(journalProviders.get(2)),
-                              ExternalSourceMatcher.matchExternalSource(journalProviders.get(3))
-                              )))
+                   // Check that Journal sources match (check a max of 20 as that is default page size)
+                   .andExpect(jsonPath("$._embedded.externalsources",
+                                       ExternalSourceMatcher.matchAllExternalSources(journalProviders, 20)
+                             ))
                    .andExpect(jsonPath("$.page.totalElements", Matchers.is(journalProviders.size())));
     }
 
@@ -192,10 +189,9 @@ public class ExternalSourcesRestControllerIT extends AbstractControllerIntegrati
                    .param("entityType", "Journal")
                    .param("size", String.valueOf(pageSize)))
                    .andExpect(status().isOk())
-                   .andExpect(jsonPath("$._embedded.externalsources", Matchers.contains(
-                              ExternalSourceMatcher.matchExternalSource(journalProviders.get(0)),
-                              ExternalSourceMatcher.matchExternalSource(journalProviders.get(1))
-                              )))
+                   .andExpect(jsonPath("$._embedded.externalsources",
+                                       ExternalSourceMatcher.matchAllExternalSources(journalProviders, pageSize)
+                             ))
                    .andExpect(jsonPath("$.page.totalPages", Matchers.is(numberOfPages)))
                    .andExpect(jsonPath("$.page.totalElements", Matchers.is(numJournalProviders)));
 
@@ -204,10 +200,12 @@ public class ExternalSourcesRestControllerIT extends AbstractControllerIntegrati
                    .param("page", "1")
                    .param("size", String.valueOf(pageSize)))
                    .andExpect(status().isOk())
-                   .andExpect(jsonPath("$._embedded.externalsources", Matchers.contains(
-                              ExternalSourceMatcher.matchExternalSource(journalProviders.get(2)),
-                              ExternalSourceMatcher.matchExternalSource(journalProviders.get(3))
-                              )))
+                   // Check that second page has journal sources starting at index 2.
+                   .andExpect(jsonPath("$._embedded.externalsources",
+                                       ExternalSourceMatcher.matchAllExternalSources(
+                                           journalProviders.subList(2, journalProviders.size()),
+                                           pageSize)
+                              ))
                    .andExpect(jsonPath("$.page.totalPages", Matchers.is(numberOfPages)))
                    .andExpect(jsonPath("$.page.totalElements", Matchers.is(numJournalProviders)));
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/HealthIndicatorsIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/HealthIndicatorsIT.java
new file mode 100644
index 0000000000..8c1c534de1
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/HealthIndicatorsIT.java
@@ -0,0 +1,74 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.configuration.ActuatorConfiguration.UP_WITH_ISSUES_STATUS;
+import static org.dspace.app.rest.link.search.HealthIndicatorMatcher.match;
+import static org.dspace.app.rest.link.search.HealthIndicatorMatcher.matchDatabase;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.Map;
+
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.junit.Test;
+import org.springframework.boot.actuate.health.Status;
+
+/**
+ * Integration tests to verify the health indicators configuration.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class HealthIndicatorsIT extends AbstractControllerIntegrationTest {
+
+    private static final String HEALTH_PATH = "/actuator/health";
+
+    @Test
+    public void testWithAnonymousUser() throws Exception {
+
+        getClient().perform(get(HEALTH_PATH))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.status", is(UP_WITH_ISSUES_STATUS.getCode())))
+            .andExpect(jsonPath("$.components").doesNotExist());
+
+    }
+
+    @Test
+    public void testWithNotAdminUser() throws Exception {
+
+        String token = getAuthToken(eperson.getEmail(), password);
+
+        getClient(token).perform(get(HEALTH_PATH))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.status", is(UP_WITH_ISSUES_STATUS.getCode())))
+            .andExpect(jsonPath("$.components").doesNotExist());
+
+    }
+
+    @Test
+    public void testWithAdminUser() throws Exception {
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(get(HEALTH_PATH))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.status", is(UP_WITH_ISSUES_STATUS.getCode())))
+            .andExpect(jsonPath("$.components", allOf(
+                matchDatabase(Status.UP),
+                match("solrSearchCore", Status.UP, Map.of("status", 0, "detectedPathType", "root")),
+                match("solrStatisticsCore", Status.UP, Map.of("status", 0, "detectedPathType", "root")),
+                match("geoIp", UP_WITH_ISSUES_STATUS,
+                    Map.of("reason", "The required 'dbfile' configuration is missing in solr-statistics.cfg!"))
+                )));
+
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/InfoEndpointIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/InfoEndpointIT.java
new file mode 100644
index 0000000000..62de6e1d00
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/InfoEndpointIT.java
@@ -0,0 +1,81 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.services.ConfigurationService;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for info actuator.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class InfoEndpointIT extends AbstractControllerIntegrationTest {
+
+    private static final String INFO_PATH = "/actuator/info";
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Test
+    public void testWithAnonymousUser() throws Exception {
+
+        getClient().perform(get(INFO_PATH))
+            .andExpect(status().isUnauthorized());
+
+    }
+
+    @Test
+    public void testWithNotAdminUser() throws Exception {
+
+        String token = getAuthToken(eperson.getEmail(), password);
+
+        getClient(token).perform(get(INFO_PATH))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void testWithAdminUser() throws Exception {
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(get(INFO_PATH))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.app.name", matchProperty("dspace.name")))
+            .andExpect(jsonPath("$.app.dir", matchProperty("dspace.dir")))
+            .andExpect(jsonPath("$.app.url", matchProperty("dspace.server.url")))
+            .andExpect(jsonPath("$.app.db", matchProperty("db.url")))
+            .andExpect(jsonPath("$.app.solr.server", matchProperty("solr.server")))
+            .andExpect(jsonPath("$.app.solr.prefix", matchProperty("solr.multicorePrefix")))
+            .andExpect(jsonPath("$.app.mail.server", matchProperty("mail.server")))
+            .andExpect(jsonPath("$.app.mail.from-address", matchProperty("mail.from.address")))
+            .andExpect(jsonPath("$.app.mail.feedback-recipient", matchProperty("feedback.recipient")))
+            .andExpect(jsonPath("$.app.mail.mail-admin", matchProperty("mail.admin")))
+            .andExpect(jsonPath("$.app.mail.mail-helpdesk", matchProperty("mail.helpdesk")))
+            .andExpect(jsonPath("$.app.mail.alert-recipient", matchProperty("alert.recipient")))
+            .andExpect(jsonPath("$.app.cors.allowed-origins", matchProperty("rest.cors.allowed-origins")))
+            .andExpect(jsonPath("$.app.ui.url", matchProperty("dspace.ui.url")))
+            .andExpect(jsonPath("$.java").exists());
+
+    }
+
+    private Matcher<?> matchProperty(String name) {
+        return is(configurationService.getProperty(name));
+    }
+
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
index 372ab084dd..801976be9f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
@@ -9,10 +9,20 @@ package org.dspace.app.rest;
 
 import static com.jayway.jsonpath.JsonPath.read;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
+import static org.dspace.builder.OrcidHistoryBuilder.createOrcidHistory;
+import static org.dspace.builder.OrcidQueueBuilder.createOrcidQueue;
 import static org.dspace.core.Constants.WRITE;
+import static org.dspace.orcid.OrcidOperation.DELETE;
+import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.emptyOrNullString;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
@@ -79,6 +89,10 @@ import org.dspace.content.service.CollectionService;
 import org.dspace.core.Constants;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.service.OrcidHistoryService;
+import org.dspace.orcid.service.OrcidQueueService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.versioning.Version;
 import org.dspace.versioning.service.VersioningService;
@@ -97,6 +111,12 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
     @Autowired
     private CollectionService collectionService;
 
+    @Autowired
+    private OrcidQueueService orcidQueueService;
+
+    @Autowired
+    private OrcidHistoryService orcidHistoryService;
+
     @Autowired
     private ConfigurationService configurationService;
 
@@ -123,9 +143,11 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         Collection col2 = CollectionBuilder.createCollection(context, child1).withName("Collection 2").build();
 
         List<Item> items = new ArrayList();
-        // This comparator is used to sort our test Items by java.util.UUID (which sorts them based on the RFC
-        // and not based on String comparison, see also https://stackoverflow.com/a/51031298/3750035 )
-        Comparator<Item> compareByUUID = Comparator.comparing(i -> i.getID());
+        // Hibernate 5.x's org.hibernate.dialect.H2Dialect sorts UUIDs as if they are Strings.
+        // So, we must compare UUIDs as if they are strings.
+        // In Hibernate 6, the H2Dialect has been updated with native UUID type support, at which point
+        // we'd need to update the below comparator to compare them as java.util.UUID (which sorts based on RFC 4412).
+        Comparator<Item> compareByUUID = Comparator.comparing(i -> i.getID().toString());
 
         //2. Three public items that are readable by Anonymous with different subjects
         Item publicItem1 = ItemBuilder.createItem(context, col1)
@@ -204,9 +226,11 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                                            .build();
 
         List<Item> items = new ArrayList();
-        // This comparator is used to sort our test Items by java.util.UUID (which sorts them based on the RFC
-        // and not based on String comparison, see also https://stackoverflow.com/a/51031298/3750035 )
-        Comparator<Item> compareByUUID = Comparator.comparing(i -> i.getID());
+        // Hibernate 5.x's org.hibernate.dialect.H2Dialect sorts UUIDs as if they are Strings.
+        // So, we must compare UUIDs as if they are strings.
+        // In Hibernate 6, the H2Dialect has been updated with native UUID type support, at which point
+        // we'd need to update the below comparator to compare them as java.util.UUID (which sorts based on RFC 4412).
+        Comparator<Item> compareByUUID = Comparator.comparing(i -> i.getID().toString());
 
         //2. Three public items that are readable by Anonymous with different subjects
         Item publicItem1 = ItemBuilder.createItem(context, col1)
@@ -3213,16 +3237,23 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         Item item = ItemBuilder.createItem(context, collection).withTitle("Item").build();
 
-        Bundle bundle0 = BundleBuilder.createBundle(context, item).withName("Bundle 0").build();
-        Bundle bundle1 = BundleBuilder.createBundle(context, item).withName("Bundle 1").build();
-        Bundle bundle2 = BundleBuilder.createBundle(context, item).withName("Bundle 2").build();
-        Bundle bundle3 = BundleBuilder.createBundle(context, item).withName("Bundle 3").build();
-        Bundle bundle4 = BundleBuilder.createBundle(context, item).withName("Bundle 4").build();
-        Bundle bundle5 = BundleBuilder.createBundle(context, item).withName("Bundle 5").build();
-        Bundle bundle6 = BundleBuilder.createBundle(context, item).withName("Bundle 6").build();
-        Bundle bundle7 = BundleBuilder.createBundle(context, item).withName("Bundle 7").build();
-        Bundle bundle8 = BundleBuilder.createBundle(context, item).withName("Bundle 8").build();
-        Bundle bundle9 = BundleBuilder.createBundle(context, item).withName("Bundle 9").build();
+        List<Bundle> bundles = new ArrayList();
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 0").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 1").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 2").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 3").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 4").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 5").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 6").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 7").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 8").build());
+        bundles.add(BundleBuilder.createBundle(context, item).withName("Bundle 9").build());
+
+        // While in DSpace code, Bundles are *unordered*, in Hibernate v5 + H2 v2.x, they are returned sorted by UUID.
+        // So, we reorder this list of created Bundles by UUID to get their expected pagination ordering.
+        // NOTE: Once on Hibernate v6, this might need "toString()" removed as it may sort UUIDs based on RFC 4412.
+        Comparator<Bundle> compareByUUID = Comparator.comparing(b -> b.getID().toString());
+        bundles.sort(compareByUUID);
 
         context.restoreAuthSystemState();
 
@@ -3232,11 +3263,16 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         .andExpect(status().isOk())
         .andExpect(jsonPath("$", ItemMatcher.matchItemProperties(item)))
         .andExpect(jsonPath("$._embedded.bundles._embedded.bundles",Matchers.containsInAnyOrder(
-            BundleMatcher.matchProperties(bundle0.getName(), bundle0.getID(), bundle0.getHandle(), bundle0.getType()),
-            BundleMatcher.matchProperties(bundle1.getName(), bundle1.getID(), bundle1.getHandle(), bundle1.getType()),
-            BundleMatcher.matchProperties(bundle2.getName(), bundle2.getID(), bundle2.getHandle(), bundle2.getType()),
-            BundleMatcher.matchProperties(bundle3.getName(), bundle3.getID(), bundle3.getHandle(), bundle3.getType()),
-            BundleMatcher.matchProperties(bundle4.getName(), bundle4.getID(), bundle4.getHandle(), bundle4.getType())
+            BundleMatcher.matchProperties(bundles.get(0).getName(), bundles.get(0).getID(), bundles.get(0).getHandle(),
+                                          bundles.get(0).getType()),
+            BundleMatcher.matchProperties(bundles.get(1).getName(), bundles.get(1).getID(), bundles.get(1).getHandle(),
+                                          bundles.get(1).getType()),
+            BundleMatcher.matchProperties(bundles.get(2).getName(), bundles.get(2).getID(), bundles.get(2).getHandle(),
+                                          bundles.get(2).getType()),
+            BundleMatcher.matchProperties(bundles.get(3).getName(), bundles.get(3).getID(), bundles.get(3).getHandle(),
+                                          bundles.get(3).getType()),
+            BundleMatcher.matchProperties(bundles.get(4).getName(), bundles.get(4).getID(), bundles.get(4).getHandle(),
+                                          bundles.get(4).getType())
         )))
         .andExpect(jsonPath("$._links.self.href", Matchers.containsString("/api/core/items/" + item.getID())))
         .andExpect(jsonPath("$._embedded.bundles.page.size", is(5)))
@@ -3741,6 +3777,237 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                         .andExpect(jsonPath("$.metadata['relation.isPublicationOfAuthor']").doesNotExist());
     }
 
+    @Test
+    public void testDeletionOfOrcidOwner() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        Collection profileCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Profiles")
+            .withEntityType("Person")
+            .build();
+
+        Collection publicationCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Publications")
+            .withEntityType("Publication")
+            .build();
+
+        Collection projectCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Projects")
+            .withEntityType("Project")
+            .build();
+
+        Item profile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withDspaceObjectOwner(eperson.getFullName(), eperson.getID().toString())
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .build();
+
+        Item publication = ItemBuilder.createItem(context, publicationCollection)
+            .withTitle("Test publication")
+            .build();
+
+        Item project = ItemBuilder.createItem(context, projectCollection)
+            .withTitle("Test project")
+            .build();
+
+        createOrcidQueue(context, profile, publication).build();
+        createOrcidQueue(context, profile, project).build();
+        createOrcidHistory(context, profile, publication).build();
+        createOrcidHistory(context, profile, publication).build();
+        createOrcidHistory(context, profile, project).build();
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(delete("/api/core/items/" + profile.getID()))
+            .andExpect(status().is(204));
+
+        assertThat(orcidQueueService.findAll(context), empty());
+        assertThat(orcidHistoryService.findAll(context), empty());
+
+    }
+
+    @Test
+    public void testDeletionOfPublicationToBeSynchronizedWithOrcid() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        Collection profileCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Profiles")
+            .withEntityType("Person")
+            .build();
+
+        Collection publicationCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Publications")
+            .withEntityType("Publication")
+            .build();
+
+        EPerson firstOwner = EPersonBuilder.createEPerson(context)
+            .withEmail("owner1@test.com")
+            .build();
+
+        EPerson secondOwner = EPersonBuilder.createEPerson(context)
+            .withEmail("owner2@test.com")
+            .build();
+
+        EPerson thirdOwner = EPersonBuilder.createEPerson(context)
+            .withEmail("owner3@test.com")
+            .build();
+
+        Item firstProfile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withDspaceObjectOwner(firstOwner.getFullName(), firstOwner.getID().toString())
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", firstOwner)
+            .withOrcidSynchronizationPublicationsPreference(ALL)
+            .build();
+
+        Item secondProfile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withDspaceObjectOwner(secondOwner.getFullName(), secondOwner.getID().toString())
+            .withOrcidIdentifier("4444-1111-2222-3333")
+            .withOrcidAccessToken("bb4d18a0-8d9a-40f1-b601-a417255c8d20", eperson)
+            .build();
+
+        Item thirdProfile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withDspaceObjectOwner(thirdOwner.getFullName(), thirdOwner.getID().toString())
+            .withOrcidIdentifier("5555-1111-2222-3333")
+            .withOrcidAccessToken("cb4d18a0-8d9a-40f1-b601-a417255c8d20", thirdOwner)
+            .withOrcidSynchronizationPublicationsPreference(ALL)
+            .build();
+
+        Item publication = ItemBuilder.createItem(context, publicationCollection)
+            .withTitle("Test publication")
+            .build();
+
+        createOrcidQueue(context, firstProfile, publication).build();
+        createOrcidQueue(context, secondProfile, publication).build();
+
+        List<OrcidHistory> historyRecords = new ArrayList<OrcidHistory>();
+        historyRecords.add(createOrcidHistory(context, firstProfile, publication).build());
+        historyRecords.add(createOrcidHistory(context, firstProfile, publication).withPutCode("12345").build());
+        historyRecords.add(createOrcidHistory(context, secondProfile, publication).build());
+        historyRecords.add(createOrcidHistory(context, secondProfile, publication).withPutCode("67891").build());
+        historyRecords.add(createOrcidHistory(context, thirdProfile, publication).withPutCode("98765").build());
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(delete("/api/core/items/" + publication.getID()))
+            .andExpect(status().is(204));
+
+        List<OrcidQueue> orcidQueueRecords = orcidQueueService.findAll(context);
+        assertThat(orcidQueueRecords, hasSize(2));
+        assertThat(orcidQueueRecords, hasItem(matches(firstProfile, null, "Publication", "12345", DELETE)));
+        assertThat(orcidQueueRecords, hasItem(matches(thirdProfile, null, "Publication", "98765", DELETE)));
+
+        for (OrcidHistory historyRecord : historyRecords) {
+            historyRecord = context.reloadEntity(historyRecord);
+            assertThat(historyRecord, notNullValue());
+            assertThat(historyRecord.getEntity(), nullValue());
+        }
+    }
+
+    @Test
+    public void testDeletionOfFundingToBeSynchronizedWithOrcid() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        Collection profileCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Profiles")
+            .withEntityType("Person")
+            .build();
+
+        Collection fundingCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Fundings")
+            .withEntityType("Project")
+            .build();
+
+        EPerson firstOwner = EPersonBuilder.createEPerson(context)
+            .withEmail("owner2@test.com")
+            .build();
+
+        EPerson secondOwner = EPersonBuilder.createEPerson(context)
+            .withEmail("owner3@test.com")
+            .build();
+
+        EPerson thirdOwner = EPersonBuilder.createEPerson(context)
+            .withEmail("owner1@test.com")
+            .build();
+
+        Item firstProfile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withDspaceObjectOwner(firstOwner.getFullName(), firstOwner.getID().toString())
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("ab4d18a0-8d9a-40f1-b601-a417255c8d20", firstOwner)
+            .withOrcidSynchronizationFundingsPreference(ALL)
+            .build();
+
+        Item secondProfile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withDspaceObjectOwner(secondOwner.getFullName(), secondOwner.getID().toString())
+            .withOrcidIdentifier("4444-1111-2222-3333")
+            .withOrcidAccessToken("bb4d18a0-8d9a-40f1-b601-a417255c8d20", secondOwner)
+            .build();
+
+        Item thirdProfile = ItemBuilder.createItem(context, profileCollection)
+            .withTitle("Test User")
+            .withDspaceObjectOwner(thirdOwner.getFullName(), thirdOwner.getID().toString())
+            .withOrcidIdentifier("5555-1111-2222-3333")
+            .withOrcidAccessToken("cb4d18a0-8d9a-40f1-b601-a417255c8d20", thirdOwner)
+            .withOrcidSynchronizationFundingsPreference(ALL)
+            .build();
+
+        Item funding = ItemBuilder.createItem(context, fundingCollection)
+            .withTitle("Test funding")
+            .build();
+
+        createOrcidQueue(context, firstProfile, funding).build();
+        createOrcidQueue(context, secondProfile, funding).build();
+
+        List<OrcidHistory> historyRecords = new ArrayList<OrcidHistory>();
+        historyRecords.add(createOrcidHistory(context, firstProfile, funding).build());
+        historyRecords.add(createOrcidHistory(context, firstProfile, funding).withPutCode("12345").build());
+        historyRecords.add(createOrcidHistory(context, secondProfile, funding).build());
+        historyRecords.add(createOrcidHistory(context, secondProfile, funding).withPutCode("67891").build());
+        historyRecords.add(createOrcidHistory(context, thirdProfile, funding).build());
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(delete("/api/core/items/" + funding.getID()))
+            .andExpect(status().is(204));
+
+        List<OrcidQueue> orcidQueueRecords = orcidQueueService.findAll(context);
+        assertThat(orcidQueueRecords, hasSize(1));
+        assertThat(orcidQueueRecords, hasItem(matches(firstProfile, null, "Project", "12345", DELETE)));
+
+        for (OrcidHistory historyRecord : historyRecords) {
+            historyRecord = context.reloadEntity(historyRecord);
+            assertThat(historyRecord, notNullValue());
+            assertThat(historyRecord.getEntity(), nullValue());
+        }
+
+    }
+
     private void initPublicationAuthorsRelationships() throws SQLException {
         context.turnOffAuthorisationSystem();
 
@@ -3845,6 +4112,8 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                  .andExpect(jsonPath("$.inArchive", Matchers.is(false)))
                  .andExpect(jsonPath("$._links.self.href",
                      Matchers.containsString("/api/core/items/" + item.getID().toString())))
+                 .andExpect(jsonPath("$._links.accessStatus.href",
+                     Matchers.containsString("/api/core/items/" + item.getID().toString() + "/accessStatus")))
                  .andExpect(jsonPath("$._links.bundles.href",
                      Matchers.containsString("/api/core/items/" + item.getID().toString() + "/bundles")))
                  .andExpect(jsonPath("$._links.mappedCollections.href",
@@ -3877,6 +4146,8 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                  .andExpect(jsonPath("$.inArchive", Matchers.is(false)))
                  .andExpect(jsonPath("$._links.self.href",
                      Matchers.containsString("/api/core/items/" + item.getID().toString())))
+                 .andExpect(jsonPath("$._links.accessStatus.href",
+                     Matchers.containsString("/api/core/items/" + item.getID().toString() + "/accessStatus")))
                  .andExpect(jsonPath("$._links.bundles.href",
                      Matchers.containsString("/api/core/items/" + item.getID().toString() + "/bundles")))
                  .andExpect(jsonPath("$._links.mappedCollections.href",
@@ -3910,6 +4181,8 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                        Matchers.containsString("/api/core/items/" + item.getID().toString())))
                    .andExpect(jsonPath("$._links.self.href",
                        Matchers.containsString("/api/core/items/" + item.getID().toString())))
+                   .andExpect(jsonPath("$._links.accessStatus.href",
+                       Matchers.containsString("/api/core/items/" + item.getID().toString() + "/accessStatus")))
                    .andExpect(jsonPath("$._links.bundles.href",
                        Matchers.containsString("/api/core/items/" + item.getID().toString() + "/bundles")))
                    .andExpect(jsonPath("$._links.mappedCollections.href",
@@ -4360,4 +4633,35 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                    .andExpect(status().isUnauthorized());
     }
 
+    @Test
+    public void findAccessStatusForItemBadRequestTest() throws Exception {
+        getClient().perform(get("/api/core/items/{uuid}/accessStatus", "1"))
+                   .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void findAccessStatusForItemNotFoundTest() throws Exception {
+        UUID fakeUUID = UUID.randomUUID();
+        getClient().perform(get("/api/core/items/{uuid}/accessStatus", fakeUUID))
+                   .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void findAccessStatusForItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection owningCollection = CollectionBuilder.createCollection(context, parentCommunity)
+                                                       .withName("Owning Collection")
+                                                       .build();
+        Item item = ItemBuilder.createItem(context, owningCollection)
+                               .withTitle("Test item")
+                               .build();
+        context.restoreAuthSystemState();
+        getClient().perform(get("/api/core/items/{uuid}/accessStatus", item.getID()))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.status", notNullValue()));
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/LeftTiltedRelationshipRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LeftTiltedRelationshipRestRepositoryIT.java
index e50d0f4654..480ca7b18d 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/LeftTiltedRelationshipRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LeftTiltedRelationshipRestRepositoryIT.java
@@ -7,16 +7,25 @@
  */
 package org.dspace.app.rest;
 
+import static com.jayway.jsonpath.JsonPath.read;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.dspace.builder.ItemBuilder;
 import org.dspace.builder.RelationshipBuilder;
+import org.dspace.content.Item;
 import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.RelationshipType;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.http.MediaType;
 
 /**
  * This class carries out the same test cases as {@link RelationshipRestRepositoryIT}.
@@ -75,4 +84,159 @@ public class LeftTiltedRelationshipRestRepositoryIT extends RelationshipRestRepo
             )));
     }
 
+    /**
+     * This method will test the deletion of a Relationship and will then
+     * verify that the relation is removed
+     * @throws Exception
+     */
+    @Override
+    @Test
+    public void deleteRelationship() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Item author2 = ItemBuilder.createItem(context, col1)
+            .withTitle("Author2")
+            .withIssueDate("2016-02-13")
+            .withPersonIdentifierFirstName("Maria")
+            .withPersonIdentifierLastName("Smith")
+            .build();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+
+        // First create 1 relationship.
+        context.restoreAuthSystemState();
+
+        AtomicReference<Integer> idRef1 = new AtomicReference<>();
+        AtomicReference<Integer> idRef2 = new AtomicReference<>();
+        try {
+            // This post request will add a first relationship to the publication and thus create
+            // a first set of metadata for the author values, namely "Donald Smith"
+            getClient(adminToken).perform(post("/api/core/relationships")
+                    .param("relationshipType",
+                        isAuthorOfPublicationRelationshipType.getID()
+                            .toString())
+                    .contentType(MediaType.parseMediaType
+                        (org.springframework.data.rest.webmvc.RestMediaTypes
+                            .TEXT_URI_LIST_VALUE))
+                    .content(
+                        "https://localhost:8080/spring-rest/api/core" +
+                            "/items/" + publication1
+                            .getID() + "\n" +
+                            "https://localhost:8080/spring-rest/api/core" +
+                            "/items/" + author1
+                            .getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef1.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            // This test checks that there's one relationship on the publication
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    publication1.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(1)));
+
+            // This test checks that there's NO relationship on the first author
+            // NOTE: relationship is excluded because of tilted left
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    author1.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+
+            // This test checks that there's no relationship on the second author
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    author2.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+
+            // Creates another Relationship for the Publication
+            getClient(adminToken).perform(post("/api/core/relationships")
+                    .param("relationshipType",
+                        isAuthorOfPublicationRelationshipType.getID()
+                            .toString())
+                    .contentType(MediaType.parseMediaType
+                        (org.springframework.data.rest.webmvc.RestMediaTypes
+                            .TEXT_URI_LIST_VALUE))
+                    .content(
+                        "https://localhost:8080/spring-rest/api/core/items/" + publication1
+                            .getID() + "\n" +
+                            "https://localhost:8080/spring-rest/api/core/items/" + author2
+                            .getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef2.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            // This test checks that there are 2 relationships on the publication
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    publication1.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(2)));
+
+            // This test checks that there's no relationship on the first author
+            // NOTE: relationship is excluded because of tilted left
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    author1.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+
+            // This test checks that there's no relationship on the second author
+            // NOTE: relationship is excluded because of tilted left
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    author2.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+
+
+            // Now we delete the first relationship
+            getClient(adminToken).perform(delete("/api/core/relationships/" + idRef1));
+
+
+            // This test checks that there's one relationship on the publication
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    publication1.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(1)));
+
+            // This test checks that there's no relationship on the first author
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    author1.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+
+            // This test checks that there's no relationship on the second author
+            // NOTE: relationship is excluded because of tilted left
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    author2.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+
+
+            // Now we delete the second relationship
+            getClient(adminToken).perform(delete("/api/core/relationships/" + idRef2));
+
+
+            // This test checks that there's no relationship on the publication
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    publication1.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+
+            // This test checks that there's no relationship on the first author
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    author1.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+
+            // This test checks that there are no relationship on the second author
+            getClient(adminToken).perform(get("/api/core/items/" +
+                    author2.getID() + "/relationships"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("page.totalElements", is(0)));
+        } finally {
+            if (idRef1.get() != null) {
+                RelationshipBuilder.deleteRelationship(idRef1.get());
+            }
+            if (idRef2.get() != null) {
+                RelationshipBuilder.deleteRelationship(idRef2.get());
+            }
+        }
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java
index 56c8f637f1..1826cd0fbb 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java
@@ -1052,7 +1052,8 @@ public class MetadatafieldRestRepositoryIT extends AbstractControllerIntegration
                    // Metadata fields are returned alphabetically.
                    // So, on the last page we'll just ensure it *at least* includes the last field alphabetically
                    .andExpect(jsonPath("$._embedded.metadatafields", Matchers.hasItems(
-                              MetadataFieldMatcher.matchMetadataFieldByKeys("workflow", "score", null)
+                              MetadataFieldMatcher.matchMetadataField(
+                                  alphabeticMdFields.get(alphabeticMdFields.size() - 1))
                               )))
                    .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
                            Matchers.containsString("/api/core/metadatafields?"),
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidExternalSourcesIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidExternalSourcesIT.java
index d1acd482b8..04592c17da 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidExternalSourcesIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidExternalSourcesIT.java
@@ -33,8 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * This test suite includes static test with mock data and end to end test to
  * verify the integration with ORCID as an External Source. The end to end test
- * run only if the orcid.clientid property is configured but of course also
- * orcid.clientsecret is needed to successful run the tests. This can be enabled
+ * run only if the orcid.application-client-id property is configured but of course also
+ * orcid.application-client-secret is needed to successful run the tests. This can be enabled
  * setting the orcid credentials via env variables, see the comments in the
  * override section of the config-definition.xml
  * 
@@ -50,7 +50,7 @@ public class OrcidExternalSourcesIT extends AbstractControllerIntegrationTest {
     private OrcidV3AuthorDataProvider orcidV3AuthorDataProvider;
 
     public void onlyRunIfConfigExists() {
-        if (StringUtils.isBlank(configurationService.getProperty("orcid.clientid"))) {
+        if (StringUtils.isBlank(configurationService.getProperty("orcid.application-client-id"))) {
             Assume.assumeNoException(new IllegalStateException("Missing ORCID credentials"));
         }
     }
@@ -81,7 +81,7 @@ public class OrcidExternalSourcesIT extends AbstractControllerIntegrationTest {
                            hasJsonPath("$.externalSource", is("orcid")),
                            hasJsonPath("$.type", is("externalSourceEntry"))
                    )))
-                   .andExpect(jsonPath("$.metadata['dc.identifier.uri'][0].value",is("https://orcid.org/" + entry)))
+                   .andExpect(jsonPath("$.metadata['dc.identifier.uri'][0].value",is("https://sandbox.orcid.org/" + entry)))
                    .andExpect(jsonPath("$.metadata['person.familyName'][0].value",is("Bollini")))
                    .andExpect(jsonPath("$.metadata['person.givenName'][0].value",is("Andrea")))
                    .andExpect(jsonPath("$.metadata['person.identifier.orcid'][0].value",is(entry)));
@@ -103,7 +103,7 @@ public class OrcidExternalSourcesIT extends AbstractControllerIntegrationTest {
                            hasJsonPath("$.type", is("externalSourceEntry"))
                    )))
                   .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['dc.identifier.uri'][0].value",
-                                   is("https://orcid.org/0000-0002-9029-1854")))
+                                   is("https://sandbox.orcid.org/0000-0002-9029-1854")))
                   .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['person.familyName'][0].value",
                                    is("Bollini")))
                   .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['person.givenName'][0].value",
@@ -129,7 +129,7 @@ public class OrcidExternalSourcesIT extends AbstractControllerIntegrationTest {
                                hasJsonPath("$.type", is("externalSourceEntry")))
                    )))
                   .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['dc.identifier.uri'][0].value",
-                                   is("https://orcid.org/0000-0002-9029-1854")))
+                                   is("https://sandbox.orcid.org/0000-0002-9029-1854")))
                   .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['person.familyName'][0].value",
                                    is("Bollini")))
                   .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['person.givenName'][0].value",
@@ -211,7 +211,7 @@ public class OrcidExternalSourcesIT extends AbstractControllerIntegrationTest {
                                hasJsonPath("$.type", is("externalSourceEntry"))
                        )))
                       .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['dc.identifier.uri'][0].value",
-                                       is("https://orcid.org/0000-0002-9029-1854")))
+                                       is("https://sandbox.orcid.org/0000-0002-9029-1854")))
                       .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['person.familyName'][0].value",
                                        is("Bollini")))
                       .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['person.givenName'][0].value",
@@ -265,7 +265,7 @@ public class OrcidExternalSourcesIT extends AbstractControllerIntegrationTest {
                                    hasJsonPath("$.type", is("externalSourceEntry")))
                        )))
                       .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['dc.identifier.uri'][0].value",
-                                       is("https://orcid.org/0000-0002-9029-1854")))
+                                       is("https://sandbox.orcid.org/0000-0002-9029-1854")))
                       .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['person.familyName'][0].value",
                                        is("Bollini")))
                       .andExpect(jsonPath("$._embedded.externalSourceEntries[0].metadata['person.givenName'][0].value",
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
new file mode 100644
index 0000000000..4b441b1bc8
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
@@ -0,0 +1,569 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static java.util.Arrays.asList;
+import static org.dspace.app.matcher.MetadataValueMatcher.with;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.cookie;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.util.UUID;
+import javax.servlet.http.Cookie;
+
+import com.jayway.jsonpath.JsonPath;
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jwt.SignedJWT;
+import org.dspace.app.rest.model.AuthnRest;
+import org.dspace.app.rest.security.OrcidLoginFilter;
+import org.dspace.app.rest.security.jwt.EPersonClaimProvider;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.authenticate.OrcidAuthenticationBean;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.util.UUIDUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.orcid.jaxb.model.v3.release.record.Email;
+import org.orcid.jaxb.model.v3.release.record.Emails;
+import org.orcid.jaxb.model.v3.release.record.FamilyName;
+import org.orcid.jaxb.model.v3.release.record.GivenNames;
+import org.orcid.jaxb.model.v3.release.record.Name;
+import org.orcid.jaxb.model.v3.release.record.Person;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MvcResult;
+
+/**
+ * Integration tests for {@link OrcidLoginFilter}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OrcidLoginFilterIT extends AbstractControllerIntegrationTest {
+
+    public static final String[] PASSWORD_ONLY = { "org.dspace.authenticate.PasswordAuthentication" };
+
+    private final static String ORCID = "0000-1111-2222-3333";
+    private final static String CODE = "123456";
+
+    private final static String ACCESS_TOKEN = "c41e37e5-c2de-4177-91d6-ed9e9d1f31bf";
+    private final static String[] ORCID_SCOPES = { "FirstScope", "SecondScope" };
+
+    private OrcidClient originalOrcidClient;
+
+    private OrcidClient orcidClientMock = mock(OrcidClient.class);
+
+    private EPerson createdEperson;
+
+    @Autowired
+    private OrcidAuthenticationBean orcidAuthentication;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private EPersonService ePersonService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    @Before
+    public void setup() {
+        originalOrcidClient = orcidAuthentication.getOrcidClient();
+        orcidAuthentication.setOrcidClient(orcidClientMock);
+
+        configurationService.setProperty("plugin.sequence.org.dspace.authenticate.AuthenticationMethod",
+            asList("org.dspace.authenticate.OrcidAuthentication",
+                "org.dspace.authenticate.PasswordAuthentication"));
+    }
+
+    @After
+    public void after() throws Exception {
+        orcidAuthentication.setOrcidClient(originalOrcidClient);
+        if (createdEperson != null) {
+            context.turnOffAuthorisationSystem();
+            ePersonService.delete(context, createdEperson);
+            context.restoreAuthSystemState();
+        }
+        orcidTokenService.deleteAll(context);
+    }
+
+    @Test
+    public void testNoRedirectIfOrcidDisabled() throws Exception {
+        configurationService.setProperty("plugin.sequence.org.dspace.authenticate.AuthenticationMethod", PASSWORD_ONLY);
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void testEPersonCreationViaOrcidLogin() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+        when(orcidClientMock.getPerson(ACCESS_TOKEN, ORCID)).thenReturn(buildPerson("Test", "User", "test@email.it"));
+
+        MvcResult mvcResult = getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl(configurationService.getProperty("dspace.ui.url")))
+            .andExpect(cookie().exists("Authorization-cookie"))
+            .andReturn();
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verify(orcidClientMock).getPerson(ACCESS_TOKEN, ORCID);
+        verifyNoMoreInteractions(orcidClientMock);
+
+        String ePersonId = getEPersonIdFromAuthorizationCookie(mvcResult);
+
+        createdEperson = ePersonService.find(context, UUIDUtils.fromString(ePersonId));
+        assertThat(createdEperson, notNullValue());
+        assertThat(createdEperson.getEmail(), equalTo("test@email.it"));
+        assertThat(createdEperson.getFullName(), equalTo("Test User"));
+        assertThat(createdEperson.getNetid(), equalTo(ORCID));
+        assertThat(createdEperson.canLogIn(), equalTo(true));
+        assertThat(createdEperson.getMetadata(), hasItem(with("eperson.orcid", ORCID)));
+        assertThat(createdEperson.getMetadata(), hasItem(with("eperson.orcid.scope", ORCID_SCOPES[0], 0)));
+        assertThat(createdEperson.getMetadata(), hasItem(with("eperson.orcid.scope", ORCID_SCOPES[1], 1)));
+
+        assertThat(getOrcidAccessToken(createdEperson), is(ACCESS_TOKEN));
+    }
+
+    @Test
+    public void testEPersonCreationViaOrcidLoginWithoutEmail() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+        when(orcidClientMock.getPerson(ACCESS_TOKEN, ORCID)).thenReturn(buildPerson("Test", "User"));
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl("http://localhost:4000/error?status=401&code=orcid.generic-error"));
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verify(orcidClientMock).getPerson(ACCESS_TOKEN, ORCID);
+        verifyNoMoreInteractions(orcidClientMock);
+    }
+
+    @Test
+    public void testWithoutSelfRegistrationEnabled() throws Exception {
+
+        configurationService.setProperty("authentication-orcid.can-self-register", "false");
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+        when(orcidClientMock.getPerson(ACCESS_TOKEN, ORCID)).thenReturn(buildPerson("Test", "User"));
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl("http://localhost:4000/error?status=401&code=orcid.generic-error"))
+            .andExpect(cookie().doesNotExist("Authorization-cookie"))
+            .andReturn();
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verify(orcidClientMock).getPerson(ACCESS_TOKEN, ORCID);
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testWithoutAuthorizationCode() throws Exception {
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid"))
+            .andExpect(status().isUnauthorized());
+
+        verifyNoInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testEPersonLoggedInByNetId() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNetId(ORCID)
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(true)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        MvcResult mvcResult = getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl(configurationService.getProperty("dspace.ui.url")))
+            .andExpect(cookie().exists("Authorization-cookie"))
+            .andReturn();
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verifyNoMoreInteractions(orcidClientMock);
+
+        String ePersonId = getEPersonIdFromAuthorizationCookie(mvcResult);
+        assertThat(ePersonId, notNullValue());
+        assertThat(ePersonId, equalTo(ePerson.getID().toString()));
+
+    }
+
+    @Test
+    public void testEPersonCannotLogInByNetId() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+
+        context.turnOffAuthorisationSystem();
+
+        EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNetId(ORCID)
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(false)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl("http://localhost:4000/error?status=401&code=orcid.generic-error"))
+            .andExpect(cookie().doesNotExist("Authorization-cookie"));
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testEPersonLoggedInByEmail() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+        when(orcidClientMock.getPerson(ACCESS_TOKEN, ORCID)).thenReturn(buildPerson("Test", "User", "test@email.it"));
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(true)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        MvcResult mvcResult = getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl(configurationService.getProperty("dspace.ui.url")))
+            .andExpect(cookie().exists("Authorization-cookie"))
+            .andReturn();
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verify(orcidClientMock).getPerson(ACCESS_TOKEN, ORCID);
+        verifyNoMoreInteractions(orcidClientMock);
+
+        String ePersonId = getEPersonIdFromAuthorizationCookie(mvcResult);
+        assertThat(ePersonId, notNullValue());
+        assertThat(ePersonId, equalTo(ePerson.getID().toString()));
+
+    }
+
+    @Test
+    public void testEPersonCannotLogInByEmail() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+        when(orcidClientMock.getPerson(ACCESS_TOKEN, ORCID)).thenReturn(buildPerson("Test", "User", "test@email.it"));
+
+        context.turnOffAuthorisationSystem();
+
+        EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(false)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl("http://localhost:4000/error?status=401&code=orcid.generic-error"))
+            .andExpect(cookie().doesNotExist("Authorization-cookie"));
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verify(orcidClientMock).getPerson(ACCESS_TOKEN, ORCID);
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testNoAuthenticationIfAnErrorOccursRetrivingOrcidToken() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenThrow(new OrcidClientException(500, "internal error"));
+
+        context.turnOffAuthorisationSystem();
+
+        EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(false)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl("http://localhost:4000/error?status=401&code=orcid.generic-error"))
+            .andExpect(cookie().doesNotExist("Authorization-cookie"));
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testNoAuthenticationIfAnErrorOccursRetrivingOrcidPerson() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+        when(orcidClientMock.getPerson(ACCESS_TOKEN, ORCID)).thenThrow(new OrcidClientException(500, "Internal Error"));
+
+        context.turnOffAuthorisationSystem();
+
+        EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(false)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl("http://localhost:4000/error?status=401&code=orcid.generic-error"))
+            .andExpect(cookie().doesNotExist("Authorization-cookie"));
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verify(orcidClientMock).getPerson(ACCESS_TOKEN, ORCID);
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testLoggedInEPersonWithProfile() throws Exception {
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context)
+            .withName("Community")
+            .build();
+
+        CollectionBuilder.createCollection(context, community)
+            .withName("Persons")
+            .withEntityType("Person")
+            .build();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withPassword(password)
+            .withNetId(ORCID)
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(true)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonToken = getAuthToken("test@email.it", password);
+
+        getClient(ePersonToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.id", is(ePerson.getID().toString())))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")));
+
+        MvcResult mvcResult = getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl(configurationService.getProperty("dspace.ui.url")))
+            .andExpect(cookie().exists("Authorization-cookie"))
+            .andReturn();
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verifyNoMoreInteractions(orcidClientMock);
+
+        String ePersonId = getEPersonIdFromAuthorizationCookie(mvcResult);
+        assertThat(ePersonId, notNullValue());
+        assertThat(ePersonId, equalTo(ePerson.getID().toString()));
+
+        String profileItemId = getItemIdByProfileId(ePersonToken, ePersonId);
+        Item profileItem = itemService.find(context, UUID.fromString(profileItemId));
+        assertThat(profileItem, notNullValue());
+        assertThat(profileItem.getMetadata(), hasItem(with("person.identifier.orcid", ORCID)));
+        assertThat(profileItem.getMetadata(), hasItem(with("dspace.orcid.scope", ORCID_SCOPES[0], 0)));
+        assertThat(profileItem.getMetadata(), hasItem(with("dspace.orcid.scope", ORCID_SCOPES[1], 1)));
+
+        assertThat(getOrcidAccessToken(profileItem), is(ACCESS_TOKEN));
+
+    }
+
+    @Test
+    public void testRedirectToGivenTrustedUrl() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNetId(ORCID)
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(true)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+
+        String token = getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("redirectUrl", "http://localhost:8080/server/api/authn/status")
+            .param("code", CODE))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl("http://localhost:8080/server/api/authn/status"))
+            .andReturn().getResponse().getHeader("Authorization");
+
+        getClient(token).perform(get("/api/authn/status"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.authenticated", is(true)))
+            .andExpect(jsonPath("$.authenticationMethod", is("orcid")));
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testRedirectToGivenUntrustedUrl() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPersonBuilder.createEPerson(context)
+            .withEmail("test@email.it")
+            .withNetId(ORCID)
+            .withNameInMetadata("Test", "User")
+            .withCanLogin(true)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.getAccessToken(CODE)).thenReturn(buildOrcidTokenResponse(ORCID, ACCESS_TOKEN));
+
+        getClient().perform(get("/api/" + AuthnRest.CATEGORY + "/orcid")
+            .param("redirectUrl", "http://dspace.org")
+            .param("code", CODE))
+            .andExpect(status().isBadRequest());
+
+        verify(orcidClientMock).getAccessToken(CODE);
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    private OrcidTokenResponseDTO buildOrcidTokenResponse(String orcid, String accessToken) {
+        OrcidTokenResponseDTO token = new OrcidTokenResponseDTO();
+        token.setAccessToken(accessToken);
+        token.setOrcid(orcid);
+        token.setTokenType("Bearer");
+        token.setName("Test User");
+        token.setScope(String.join(" ", ORCID_SCOPES));
+        return token;
+    }
+
+    private Person buildPerson(String firstName, String lastName) {
+        return buildPerson(firstName, lastName, null);
+    }
+
+    private Person buildPerson(String firstName, String lastName, String email) {
+        Person person = new Person();
+
+        if (email != null) {
+            person.setEmails(buildEmails(email));
+        }
+
+        Name name = new Name();
+        name.setFamilyName(new FamilyName(lastName));
+        name.setGivenNames(new GivenNames(firstName));
+        person.setName(name);
+
+        return person;
+    }
+
+    private Emails buildEmails(String email) {
+        Email emailObject = new Email();
+        emailObject.setEmail(email);
+        Emails emails = new Emails();
+        emails.getEmails().add(emailObject);
+        return emails;
+    }
+
+    private String getEPersonIdFromAuthorizationCookie(MvcResult mvcResult) throws ParseException, JOSEException {
+        Cookie authorizationCookie = mvcResult.getResponse().getCookie("Authorization-cookie");
+        SignedJWT jwt = SignedJWT.parse(authorizationCookie.getValue());
+        return (String) jwt.getJWTClaimsSet().getClaim(EPersonClaimProvider.EPERSON_ID);
+    }
+
+    private String getItemIdByProfileId(String token, String id) throws SQLException, Exception {
+        MvcResult result = getClient(token).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isOk())
+            .andReturn();
+
+        return JsonPath.read(result.getResponse().getContentAsString(), "$.id");
+    }
+
+    private String getOrcidAccessToken(EPerson ePerson) {
+        OrcidToken orcidToken = orcidTokenService.findByEPerson(context, ePerson);
+        return orcidToken != null ? orcidToken.getAccessToken() : null;
+    }
+
+    private String getOrcidAccessToken(Item item) {
+        OrcidToken orcidToken = orcidTokenService.findByProfileItem(context, item);
+        return orcidToken != null ? orcidToken.getAccessToken() : null;
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/PubmedEuropeMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/PubmedEuropeMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..1573f0a838
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/PubmedEuropeMetadataSourceServiceIT.java
@@ -0,0 +1,217 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.dspace.importer.external.pubmedeurope.PubmedEuropeMetadataSourceServiceImpl;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link PubmedEuropeMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class PubmedEuropeMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private PubmedEuropeMetadataSourceServiceImpl pubmedEuropeMetadataServiceImpl;
+
+    @Autowired
+    private LiveImportClientImpl liveImportClientImpl;
+
+    @Test
+    public void pubmedEuropeImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        InputStream file = null;
+        InputStream file2 = null;
+        try {
+            file = getClass().getResourceAsStream("pubmedeurope-test.xml");
+            file2 = getClass().getResourceAsStream("pubmedeurope-empty.xml");
+            String pubmedEuropeXmlResp = IOUtils.toString(file, Charset.defaultCharset());
+            String pubmedEuropeXmlResp2 = IOUtils.toString(file2, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+
+            CloseableHttpResponse response = mockResponse(pubmedEuropeXmlResp, 200, "OK");
+            CloseableHttpResponse response2 = mockResponse(pubmedEuropeXmlResp2, 200, "OK");
+
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response, response2);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = pubmedEuropeMetadataServiceImpl.getRecords("test query", 0, 3);
+            assertEquals(3, recordsImported.size());
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+            if (Objects.nonNull(file)) {
+                file.close();
+            }
+            if (Objects.nonNull(file2)) {
+                file2.close();
+            }
+        }
+    }
+
+    @Test
+    public void pubmedEuropeImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream file = getClass().getResourceAsStream("pubmedeurope-test.xml")) {
+            String pubmedEuropeXmlResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(pubmedEuropeXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = pubmedEuropeMetadataServiceImpl.getRecordsCount("test query");
+            assertEquals(3, tot);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        //define first record
+        MetadatumDTO title = createMetadatumDTO("dc","title", null,
+                "First record of preserved soft parts in a Palaeozoic podocopid"
+                + " (Metacopina) ostracod, Cytherellina submagna: phylogenetic implications.");
+        MetadatumDTO contributor = createMetadatumDTO("dc", "contributor", "author", "Olempska E");
+        MetadatumDTO contributor2 = createMetadatumDTO("dc", "contributor", "author", "Horne DJ");
+        MetadatumDTO contributor3 = createMetadatumDTO("dc", "contributor", "author", "Szaniawski H");
+        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", null, "10.1098/rspb.2011.0943");
+        MetadatumDTO source = createMetadatumDTO("dc", "source", null, "Proceedings. Biological sciences");
+        MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2012");
+        MetadatumDTO language = createMetadatumDTO("dc", "language", "iso", "eng");
+        MetadatumDTO type = createMetadatumDTO("dc", "type", null, "Research Support, Non-U.S. Gov't");
+        MetadatumDTO type2 = createMetadatumDTO("dc", "type", null, "research-article");
+        MetadatumDTO type3 = createMetadatumDTO("dc", "type", null, "Journal Article");
+
+        MetadatumDTO issn = createMetadatumDTO("dc", "identifier", "issn", "0962-8452");
+        MetadatumDTO pmid = createMetadatumDTO("dc", "identifier", "other", "21733903");
+        MetadatumDTO description = createMetadatumDTO("dc", "description", "abstract", "The metacopines represent one"
+                + " of the oldest and most important extinct groups of ostracods, with a fossil record from"
+                + " the Mid-Ordovician to the Early Jurassic. Herein, we report the discovery of a representative"
+                + " of the group with three-dimensionally preserved soft parts. The specimen--a male of Cytherellina"
+                + " submagna--was found in the Early Devonian (416 Ma) of Podolia, Ukraine. A branchial plate (Bp)"
+                + " of the cephalic maxillula (Mx), a pair of thoracic appendages (walking legs), a presumed furca"
+                + " (Fu) and a copulatory organ are preserved. The material also includes phosphatized steinkerns"
+                + " with exceptionally preserved marginal pore canals and muscle scars. The morphology of the"
+                + " preserved limbs and valves of C. submagna suggests its relationship with extant Podocopida,"
+                + " particularly with the superfamilies Darwinuloidea and Sigillioidea, which have many similar"
+                + " characteristic features, including a large Bp on the Mx, the morphology of walking legs, Fu"
+                + " with two terminal claws, internal stop-teeth in the left valve, adductor muscle scar pattern,"
+                + " and a very narrow fused zone along the anterior and posterior margins. More precise"
+                + " determination of affinities will depend on the soft-part morphology of the cephalic segment,"
+                + " which has not been revealed in the present material.");
+
+        metadatums.add(doi);
+        metadatums.add(title);
+        metadatums.add(contributor);
+        metadatums.add(contributor2);
+        metadatums.add(contributor3);
+        metadatums.add(source);
+        metadatums.add(date);
+        metadatums.add(language);
+        metadatums.add(type);
+        metadatums.add(type2);
+        metadatums.add(type3);
+        metadatums.add(description);
+        metadatums.add(issn);
+        metadatums.add(pmid);
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO title2 = createMetadatumDTO("dc","title", null, "VODKA SYNEVIR");
+        MetadatumDTO contributor4 = createMetadatumDTO("dc", "contributor", "author", "BARANOV VALENTYN VOLODYMYROVYC");
+        MetadatumDTO contributor5 = createMetadatumDTO("dc", "contributor", "author", "DANCHAK ROMAN ADAMOVYCH");
+        MetadatumDTO contributor6 = createMetadatumDTO("dc", "contributor", "author", "FEDORCHUK NATALIIA HRYHORIVNA");
+        MetadatumDTO contributor7 = createMetadatumDTO("dc", "contributor", "author", "FEDOREIKO LIUBOV ROMANIVNA");
+        MetadatumDTO language2 = createMetadatumDTO("dc", "language", "iso", "eng");
+        MetadatumDTO type4 = createMetadatumDTO("dc", "type", null, "Patent");
+        MetadatumDTO pmid2 = createMetadatumDTO("dc", "identifier", "other", "UA37818");
+        MetadatumDTO description2 = createMetadatumDTO("dc", "description", "abstract",
+                "Vodka contains aqueous-alcoholic"
+                + " mixture, 65.8 % sugar syrup and apple vinegar."
+                + " As a result the vodka has light taste without vodka acid and light apple aroma.");
+        metadatums2.add(title2);
+        metadatums2.add(contributor4);
+        metadatums2.add(contributor5);
+        metadatums2.add(contributor6);
+        metadatums2.add(contributor7);
+        metadatums2.add(language2);
+        metadatums2.add(type4);
+        metadatums2.add(description2);
+        metadatums2.add(pmid2);
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+
+        //define second record
+        List<MetadatumDTO> metadatums3  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO title3 = createMetadatumDTO("dc","title", null, "A VODKA CHARKA");
+        MetadatumDTO contributor8 = createMetadatumDTO("dc", "contributor", "author", "BARANOV VALENTYN VOLODYMYROVYC");
+        MetadatumDTO contributor9 = createMetadatumDTO("dc", "contributor", "author", "DANCHAK ROMAN ADAMOVYCH");
+        MetadatumDTO contributor10 = createMetadatumDTO("dc", "contributor", "author", "FEDORCHUK NATALIIA HRYHORIVNA");
+        MetadatumDTO contributor11 = createMetadatumDTO("dc", "contributor", "author", "FEDOREIKO LIUBOV ROMANIVNA");
+        MetadatumDTO language3 = createMetadatumDTO("dc", "language", "iso", "eng");
+        MetadatumDTO type5 = createMetadatumDTO("dc", "type", null, "Patent");
+        MetadatumDTO pmid3 = createMetadatumDTO("dc", "identifier", "other", "UA37954");
+        MetadatumDTO description3 = createMetadatumDTO("dc", "description", "abstract", "The invention relates to"
+                + " food industry, and particularly to liqueur and vodka industry, to vodkas compositions."
+                + " The aim of this invention is producing vodka with high organoleptic indices, and particularly"
+                + " soft taste without vodka bitterness and without vodka aroma, and high biological properties,"
+                + " by selection of necessary ingredients at required quantities. Ingredients ratio at 100 l of"
+                + " finished drink: Carbohydrate module ôAlkosoftö, l 0.07-0.13Citric oil, kg 0,0015-0,0025"
+                + " Aqueous-alcoholic mixture as calculated per strength of 40% of volume rest."
+                + " Technical result - preparation of the vodka of given composition with a strength of 40% of"
+                + " volume, which is transparent, colorless, has mild taste without vodka bitterness and without"
+                + " strong vodka aroma which will not cause alcohol withdrawal syndrome and high charge on the body.");
+        metadatums3.add(title3);
+        metadatums3.add(contributor8);
+        metadatums3.add(contributor9);
+        metadatums3.add(contributor10);
+        metadatums3.add(contributor11);
+        metadatums3.add(language3);
+        metadatums3.add(type5);
+        metadatums3.add(description3);
+        metadatums3.add(pmid3);
+        ImportRecord thirdRecord = new ImportRecord(metadatums3);
+
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        records.add(thirdRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java
index 1c3ae58374..4a8abf3f59 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java
@@ -9,6 +9,11 @@ package org.dspace.app.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -22,9 +27,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.matcher.RegistrationMatcher;
 import org.dspace.app.rest.model.RegistrationRest;
+import org.dspace.app.rest.repository.RegistrationRestRepository;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.eperson.CaptchaServiceImpl;
+import org.dspace.eperson.InvalidReCaptchaException;
 import org.dspace.eperson.RegistrationData;
 import org.dspace.eperson.dao.RegistrationDataDAO;
+import org.dspace.eperson.service.CaptchaService;
 import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
 import org.junit.Test;
@@ -32,11 +41,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 public class RegistrationRestRepositoryIT extends AbstractControllerIntegrationTest {
 
+    @Autowired
+    private CaptchaServiceImpl captchaService;
     @Autowired
     private RegistrationDataDAO registrationDataDAO;
-
     @Autowired
     private ConfigurationService configurationService;
+    @Autowired
+    private RegistrationRestRepository registrationRestRepository;
 
     @Test
     public void findByTokenTestExistingUserTest() throws Exception {
@@ -95,7 +107,6 @@ public class RegistrationRestRepositoryIT extends AbstractControllerIntegrationT
     }
 
     private void createTokenForEmail(String email) throws Exception {
-        List<RegistrationData> registrationDatas;
         ObjectMapper mapper = new ObjectMapper();
         RegistrationRest registrationRest = new RegistrationRest();
         registrationRest.setEmail(email);
@@ -181,4 +192,133 @@ public class RegistrationRestRepositoryIT extends AbstractControllerIntegrationT
         }
     }
 
+    @Test
+    public void registrationFlowWithNoHeaderCaptchaTokenTest() throws Exception {
+        String originVerification = configurationService.getProperty("registration.verification.enabled");
+        String originSecret = configurationService.getProperty("google.recaptcha.key.secret");
+        String originVresion = configurationService.getProperty("google.recaptcha.version");
+        reloadCaptchaProperties("true", "test-secret", "v2");
+
+        ObjectMapper mapper = new ObjectMapper();
+        RegistrationRest registrationRest = new RegistrationRest();
+        registrationRest.setEmail(eperson.getEmail());
+
+        // when reCAPTCHA enabled and request doesn't contain "X-Recaptcha-Token” header
+        getClient().perform(post("/api/eperson/registrations")
+                   .content(mapper.writeValueAsBytes(registrationRest))
+                   .contentType(contentType))
+                   .andExpect(status().isForbidden());
+
+        reloadCaptchaProperties(originVerification, originSecret, originVresion);
+    }
+
+    @Test
+    public void registrationFlowWithInvalidCaptchaTokenTest() throws Exception {
+        String originVerification = configurationService.getProperty("registration.verification.enabled");
+        String originSecret = configurationService.getProperty("google.recaptcha.key.secret");
+        String originVresion = configurationService.getProperty("google.recaptcha.version");
+        reloadCaptchaProperties("true", "test-secret", "v2");
+
+        ObjectMapper mapper = new ObjectMapper();
+        RegistrationRest registrationRest = new RegistrationRest();
+        registrationRest.setEmail(eperson.getEmail());
+
+        String captchaToken = "invalid-captcha-Token";
+        // when reCAPTCHA enabled and request contains Invalid "X-Recaptcha-Token” header
+        getClient().perform(post("/api/eperson/registrations")
+                   .header("X-Recaptcha-Token", captchaToken)
+                   .content(mapper.writeValueAsBytes(registrationRest))
+                   .contentType(contentType))
+                   .andExpect(status().isForbidden());
+
+        reloadCaptchaProperties(originVerification, originSecret, originVresion);
+    }
+
+    @Test
+    public void registrationFlowWithValidCaptchaTokenTest() throws Exception {
+        String originVerification = configurationService.getProperty("registration.verification.enabled");
+        String originSecret = configurationService.getProperty("google.recaptcha.key.secret");
+        String originVresion = configurationService.getProperty("google.recaptcha.version");
+        reloadCaptchaProperties("true", "test-secret", "v2");
+
+        String captchaToken = "123456";
+        String captchaToken1 = "12345676866";
+
+        CaptchaService captchaServiceMock = mock(CaptchaService.class);
+
+        registrationRestRepository.setCaptchaService(captchaServiceMock);
+
+        doThrow(new InvalidReCaptchaException("Invalid captcha token"))
+            .when(captchaServiceMock).processResponse(any(), any());
+
+        doNothing().when(captchaServiceMock).processResponse(eq(captchaToken), eq("register_email"));
+
+        List<RegistrationData> registrationDataList = registrationDataDAO.findAll(context, RegistrationData.class);
+        assertEquals(0, registrationDataList.size());
+
+        ObjectMapper mapper = new ObjectMapper();
+        RegistrationRest registrationRest = new RegistrationRest();
+        registrationRest.setEmail(eperson.getEmail());
+        try {
+            // will throw InvalidReCaptchaException because 'X-Recaptcha-Token' not equal captchaToken
+            getClient().perform(post("/api/eperson/registrations")
+                       .header("X-Recaptcha-Token", captchaToken1)
+                       .content(mapper.writeValueAsBytes(registrationRest))
+                       .contentType(contentType))
+                       .andExpect(status().isForbidden());
+
+            getClient().perform(post("/api/eperson/registrations")
+                       .header("X-Recaptcha-Token", captchaToken)
+                       .content(mapper.writeValueAsBytes(registrationRest))
+                       .contentType(contentType))
+                       .andExpect(status().isCreated());
+
+            registrationDataList = registrationDataDAO.findAll(context, RegistrationData.class);
+            assertEquals(1, registrationDataList.size());
+            assertTrue(StringUtils.equalsIgnoreCase(registrationDataList.get(0).getEmail(), eperson.getEmail()));
+
+            String newEmail = "newEPersonTest@gmail.com";
+            registrationRest.setEmail(newEmail);
+            getClient().perform(post("/api/eperson/registrations")
+                       .header("X-Recaptcha-Token", captchaToken)
+                       .content(mapper.writeValueAsBytes(registrationRest))
+                       .contentType(contentType))
+                       .andExpect(status().isCreated());
+
+            registrationDataList = registrationDataDAO.findAll(context, RegistrationData.class);
+            assertTrue(registrationDataList.size() == 2);
+            assertTrue(StringUtils.equalsIgnoreCase(registrationDataList.get(0).getEmail(), newEmail) ||
+                       StringUtils.equalsIgnoreCase(registrationDataList.get(1).getEmail(), newEmail));
+
+            configurationService.setProperty("user.registration", false);
+
+            newEmail = "newEPersonTestTwo@gmail.com";
+            registrationRest.setEmail(newEmail);
+            getClient().perform(post("/api/eperson/registrations")
+                       .header("X-Recaptcha-Token", captchaToken)
+                       .content(mapper.writeValueAsBytes(registrationRest))
+                       .contentType(contentType))
+                       .andExpect(status().is(HttpServletResponse.SC_UNAUTHORIZED));
+
+            assertEquals(2, registrationDataList.size());
+            assertTrue(!StringUtils.equalsIgnoreCase(registrationDataList.get(0).getEmail(), newEmail) &&
+                       !StringUtils.equalsIgnoreCase(registrationDataList.get(1).getEmail(), newEmail));
+        } finally {
+            registrationRestRepository.setCaptchaService(captchaService);
+            Iterator<RegistrationData> iterator = registrationDataList.iterator();
+            while (iterator.hasNext()) {
+                RegistrationData registrationData = iterator.next();
+                registrationDataDAO.delete(context, registrationData);
+            }
+            reloadCaptchaProperties(originVerification, originSecret, originVresion);
+        }
+    }
+
+    private void reloadCaptchaProperties(String verification, String secret, String version) {
+        configurationService.setProperty("registration.verification.enabled", verification);
+        configurationService.setProperty("google.recaptcha.key.secret", secret);
+        configurationService.setProperty("google.recaptcha.version", version);
+        captchaService.init();
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipDeleteRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipDeleteRestRepositoryIT.java
index 7df0b40068..2c6b14aa7e 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipDeleteRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipDeleteRestRepositoryIT.java
@@ -232,7 +232,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(publicationAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> publicationRelationships = itemService.getMetadata(publicationItem,
             "relation", "isAuthorOfPublication", Item.ANY, Item.ANY);
-        assertThat(publicationRelationships.size(), equalTo(1));
+        assertThat(publicationRelationships.size(), equalTo(2));
 
         projectItem = itemService.find(context, projectItem.getID());
         List<MetadataValue> projectAuthorList =
@@ -242,7 +242,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(projectAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> projectRelationships = itemService.getMetadata(projectItem,
             "relation", "isPersonOfProject", Item.ANY, Item.ANY);
-        assertThat(projectRelationships.size(), equalTo(1));
+        assertThat(projectRelationships.size(), equalTo(2));
     }
 
     @Test
@@ -823,7 +823,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(publicationAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> publicationRelationships = itemService.getMetadata(publicationItem,
             "relation", "isAuthorOfPublication", Item.ANY, Item.ANY);
-        assertThat(publicationRelationships.size(), equalTo(1));
+        assertThat(publicationRelationships.size(), equalTo(2));
 
         projectItem = itemService.find(context, projectItem.getID());
         List<MetadataValue> projectAuthorList =
@@ -833,7 +833,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(projectAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> projectRelationships = itemService.getMetadata(projectItem,
             "relation", "isPersonOfProject", Item.ANY, Item.ANY);
-        assertThat(projectRelationships.size(), equalTo(1));
+        assertThat(projectRelationships.size(), equalTo(2));
     }
 
     @Test
@@ -878,7 +878,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(publicationAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> publicationRelationships = itemService.getMetadata(publicationItem,
             "relation", "isAuthorOfPublication", Item.ANY, Item.ANY);
-        assertThat(publicationRelationships.size(), equalTo(1));
+        assertThat(publicationRelationships.size(), equalTo(2));
 
         projectItem = itemService.find(context, projectItem.getID());
         List<MetadataValue> projectAuthorList =
@@ -888,7 +888,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(projectAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> projectRelationships = itemService.getMetadata(projectItem,
             "relation", "isPersonOfProject", Item.ANY, Item.ANY);
-        assertThat(projectRelationships.size(), equalTo(1));
+        assertThat(projectRelationships.size(), equalTo(2));
     }
 
     @Test
@@ -991,7 +991,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(publicationAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> publicationRelationships = itemService.getMetadata(publicationItem,
             "relation", "isAuthorOfPublication", Item.ANY, Item.ANY);
-        assertThat(publicationRelationships.size(), equalTo(1));
+        assertThat(publicationRelationships.size(), equalTo(2));
 
         projectItem = itemService.find(context, projectItem.getID());
         List<MetadataValue> projectAuthorList =
@@ -1001,7 +1001,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(projectAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> projectRelationships = itemService.getMetadata(projectItem,
             "relation", "isPersonOfProject", Item.ANY, Item.ANY);
-        assertThat(projectRelationships.size(), equalTo(1));
+        assertThat(projectRelationships.size(), equalTo(2));
     }
 
     @Test
@@ -1023,7 +1023,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(publicationAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> publicationRelationships = itemService.getMetadata(publicationItem,
             "relation", "isAuthorOfPublication", Item.ANY, Item.ANY);
-        assertThat(publicationRelationships.size(), equalTo(1));
+        assertThat(publicationRelationships.size(), equalTo(2));
 
         projectItem = itemService.find(context, projectItem.getID());
         List<MetadataValue> projectAuthorList =
@@ -1033,7 +1033,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
         assertThat(projectAuthorList.get(0).getAuthority(), startsWith("virtual::"));
         List<MetadataValue> projectRelationships = itemService.getMetadata(projectItem,
             "relation", "isPersonOfProject", Item.ANY, Item.ANY);
-        assertThat(projectRelationships.size(), equalTo(1));
+        assertThat(projectRelationships.size(), equalTo(2));
     }
 
     @Test
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
index cdd9c7f2c3..d8e53c770c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
@@ -23,11 +23,14 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -35,13 +38,14 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.JsonObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.dspace.app.rest.matcher.PageMatcher;
 import org.dspace.app.rest.matcher.RelationshipMatcher;
 import org.dspace.app.rest.model.RelationshipRest;
+import org.dspace.app.rest.model.patch.AddOperation;
+import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.test.AbstractEntityIntegrationTest;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.builder.CollectionBuilder;
@@ -166,6 +170,9 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
                              .withTitle("Author2")
                              .withIssueDate("2016-02-13")
                              .withAuthor("Smith, Maria")
+                             .withPersonIdentifierLastName("Smith")
+                             .withPersonIdentifierFirstName("Maria")
+                             .withMetadata("dspace", "entity", "type", "Person")
                              .build();
 
         author3 = ItemBuilder.createItem(context, col1)
@@ -527,6 +534,80 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         }
     }
 
+    @Test
+    public void createMultipleRelationshipsAppendToEndTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        authorizeService.addPolicy(context, publication1, Constants.WRITE, user1);
+        authorizeService.addPolicy(context, author1, Constants.WRITE, user1);
+        authorizeService.addPolicy(context, author2, Constants.WRITE, user1);
+
+        context.setCurrentUser(user1);
+        context.restoreAuthSystemState();
+
+
+        AtomicReference<Integer> idRef = new AtomicReference<>();
+        AtomicReference<Integer> idRef2 = new AtomicReference<>();
+        try {
+            String token = getAuthToken(user1.getEmail(), password);
+
+            // Add a relationship @ leftPlace 2
+            getClient(token).perform(post("/api/core/relationships")
+                                         .param("relationshipType",
+                                                isAuthorOfPublicationRelationshipType.getID()
+                                                                                     .toString())
+                                         .contentType(MediaType.parseMediaType
+                                                                   (org.springframework.data.rest.webmvc.RestMediaTypes
+                                                                        .TEXT_URI_LIST_VALUE))
+                                         .content(
+                                             "https://localhost:8080/server/api/core/items/" + publication1
+                                                 .getID() + "\n" +
+                                                 "https://localhost:8080/server/api/core/items/" + author1
+                                                 .getID()))
+                            .andExpect(status().isCreated())
+                            .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient().perform(get("/api/core/relationships/" + idRef))
+                       .andExpect(status().isOk())
+                       .andExpect(jsonPath("$.id", is(idRef.get())))
+                       .andExpect(jsonPath("$.leftPlace", is(1)));
+
+            getClient(token).perform(post("/api/core/relationships")
+                                         .param("relationshipType",
+                                                isAuthorOfPublicationRelationshipType.getID()
+                                                                                     .toString())
+                                         .contentType(MediaType.parseMediaType
+                                                                   (org.springframework.data.rest.webmvc.RestMediaTypes
+                                                                        .TEXT_URI_LIST_VALUE))
+                                         .content(
+                                             "https://localhost:8080/server/api/core/items/" + publication1
+                                                 .getID() + "\n" +
+                                                 "https://localhost:8080/server/api/core/items/" + author2
+                                                 .getID()))
+                            .andExpect(status().isCreated())
+                            .andDo(result -> idRef2.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient().perform(get("/api/core/relationships/" + idRef2))
+                       .andExpect(status().isOk())
+                       .andExpect(jsonPath("$.id", is(idRef2.get())))
+                       .andExpect(jsonPath("$.leftPlace", is(2)));
+
+            // Check Item author order
+            getClient().perform(get("/api/core/items/" + publication1.getID()))
+                       .andExpect(status().isOk())
+                       .andExpect(jsonPath("$.metadata", allOf(
+                           matchMetadata("dc.contributor.author", "Testy, TEst", 0),
+                           matchMetadata("dc.contributor.author", "Smith, Donald", 1),
+                           matchMetadata("dc.contributor.author", "Smith, Maria", 2)
+                       )));
+        } finally {
+            RelationshipBuilder.deleteRelationship(idRef.get());
+            if (idRef2.get() != null) {
+                RelationshipBuilder.deleteRelationship(idRef2.get());
+            }
+        }
+    }
+
     @Test
     public void createRelationshipAndAddLeftWardValueAfterwards() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -566,13 +647,14 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
                    .andExpect(jsonPath("$.leftwardValue", is(nullValue())))
                    .andExpect(jsonPath("$.rightwardValue", is(nullValue())));
 
-        JsonObject contentObj = new JsonObject();
-        contentObj.addProperty("leftwardValue", leftwardValue);
+        Map<String, String> map = new HashMap<>();
+        map.put("leftwardValue", leftwardValue);
+        String json = new ObjectMapper().writeValueAsString(map);
 
         // Add leftwardValue
         getClient(token).perform(put("/api/core/relationships/" + idRef)
                                      .contentType("application/json")
-                                     .content(contentObj.toString()))
+                                     .content(json))
                         .andExpect(status().isOk());
 
         // Verify leftwardValue is present and rightwardValue not
@@ -624,14 +706,15 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
                    .andExpect(jsonPath("$.leftwardValue", is(nullValue())))
                    .andExpect(jsonPath("$.rightwardValue", is(nullValue())));
 
-        JsonObject contentObj = new JsonObject();
-        contentObj.addProperty("leftwardValue", leftwardValue);
-        contentObj.addProperty("rightwardValue", rightwardValue);
+        Map<String, String> map = new HashMap<>();
+        map.put("leftwardValue", leftwardValue);
+        map.put("rightwardValue", rightwardValue);
+        String json = new ObjectMapper().writeValueAsString(map);
 
         // Add leftwardValue and rightwardValue
         getClient(token).perform(put("/api/core/relationships/" + idRef)
                                      .contentType("application/json")
-                                     .content(contentObj.toString()))
+                                     .content(json))
                         .andExpect(status().isOk());
 
         // Verify leftwardValue and rightwardValue are present
@@ -954,7 +1037,9 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         list = itemService.getMetadata(publication1, "dc", Item.ANY, Item.ANY, Item.ANY);
         assertEquals(16, list.size()); //also includes title, 4 date fields, uri
         list = itemService.getMetadata(publication1, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
-        assertEquals(20, list.size()); //also includes type and 3 relation.isAuthorOfPublication values
+        // also includes type, 3 relation.isAuthorOfPublication and 3 relation.isAuthorOfPublication.latestForDiscovery
+        // values
+        assertEquals(23, list.size());
 
         } finally {
             RelationshipBuilder.deleteRelationship(idRef1.get());
@@ -1524,8 +1609,12 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("page.totalElements", is(0)));
         } finally {
-            RelationshipBuilder.deleteRelationship(idRef1.get());
-            RelationshipBuilder.deleteRelationship(idRef2.get());
+            if (idRef1.get() != null) {
+                RelationshipBuilder.deleteRelationship(idRef1.get());
+            }
+            if (idRef2.get() != null) {
+                RelationshipBuilder.deleteRelationship(idRef2.get());
+            }
         }
     }
 
@@ -2511,6 +2600,104 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
 
     }
 
+    @Test
+    public void putRelationshipWithJsonMoveInFrontOtherMetadata() throws Exception {
+
+        String token = getAuthToken(admin.getEmail(), password);
+        Integer idRef = null;
+        Integer idRef2 = null;
+        try {
+            // Add a relationship
+            MvcResult mvcResult = getClient(token)
+                .perform(post("/api/core/relationships")
+                             .param("relationshipType", isAuthorOfPublicationRelationshipType.getID().toString())
+                             .contentType(MediaType.parseMediaType(
+                                 org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE))
+                             .content(
+                                 "https://localhost:8080/server/api/core/items/" + publication1.getID() + "\n" +
+                                     "https://localhost:8080/server/api/core/items/" + author1.getID()))
+                .andExpect(status().isCreated())
+                .andReturn();
+
+            ObjectMapper mapper = new ObjectMapper();
+            String content = mvcResult.getResponse().getContentAsString();
+            Map<String, Object> map = mapper.readValue(content, Map.class);
+            String id = String.valueOf(map.get("id"));
+            idRef = Integer.parseInt(id);
+
+            // Add some more metadata
+            List<Operation> ops = new ArrayList<Operation>();
+            ops.add(new AddOperation("/metadata/dc.contributor.author/-", "Metadata, First"));
+            ops.add(new AddOperation("/metadata/dc.contributor.author/-", "Metadata, Second"));
+
+            getClient(token).perform(patch("/api/core/items/" + publication1.getID())
+                                         .content(getPatchContent(ops))
+                                         .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON));
+
+            // Add another relationship
+            mvcResult = getClient(token)
+                .perform(post("/api/core/relationships")
+                             .param("relationshipType", isAuthorOfPublicationRelationshipType.getID().toString())
+                             .contentType(MediaType.parseMediaType(
+                                 org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE))
+                             .content(
+                                 "https://localhost:8080/server/api/core/items/" + publication1.getID() + "\n" +
+                                     "https://localhost:8080/server/api/core/items/" + author2.getID()))
+                .andExpect(status().isCreated())
+                .andReturn();
+
+            content = mvcResult.getResponse().getContentAsString();
+            map = mapper.readValue(content, Map.class);
+            id = String.valueOf(map.get("id"));
+            idRef2 = Integer.parseInt(id);
+
+            // Check Item author order
+            getClient().perform(get("/api/core/items/" + publication1.getID()))
+                       .andExpect(status().isOk())
+                       .andExpect(jsonPath("$.metadata", allOf(
+                           matchMetadata("dc.contributor.author", "Testy, TEst", 0),
+                           matchMetadata("dc.contributor.author", "Smith, Donald", 1),      // first relationship
+                           matchMetadata("dc.contributor.author", "Metadata, First", 2),
+                           matchMetadata("dc.contributor.author", "Metadata, Second", 3),
+                           matchMetadata("dc.contributor.author", "Smith, Maria", 4)        // second relationship
+                       )));
+
+            RelationshipRest relationshipRest = new RelationshipRest();
+            relationshipRest.setLeftPlace(0);
+            relationshipRest.setRightPlace(1);
+            relationshipRest.setLeftwardValue(null);
+            relationshipRest.setRightwardValue(null);
+
+            // Modify the place of the second relationship -> put it in front of all other metadata
+            getClient(token).perform(put("/api/core/relationships/" + idRef2)
+                                         .contentType(contentType)
+                                         .content(mapper.writeValueAsBytes(relationshipRest)))
+                            .andExpect(status().isOk());
+
+            // Verify the place has changed to the new value
+            getClient(token).perform(get("/api/core/relationships/" + idRef2))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.leftPlace", is(0)))
+                            .andExpect(jsonPath("$.rightPlace", is(1)));
+
+            // Verify the other metadata have moved back
+            getClient().perform(get("/api/core/items/" + publication1.getID()))
+                       .andExpect(status().isOk())
+                       .andExpect(jsonPath("$.metadata", allOf(
+                           matchMetadata("dc.contributor.author", "Smith, Maria", 0),       // second relationship
+                           matchMetadata("dc.contributor.author", "Testy, TEst", 1),
+                           matchMetadata("dc.contributor.author", "Smith, Donald", 2),      // first relationship
+                           matchMetadata("dc.contributor.author", "Metadata, First", 3),
+                           matchMetadata("dc.contributor.author", "Metadata, Second", 4)
+                       )));
+
+        } finally {
+            RelationshipBuilder.deleteRelationship(idRef);
+            RelationshipBuilder.deleteRelationship(idRef2);
+        }
+
+    }
+
     @Test
     public void orgUnitAndOrgUnitRelationshipVirtualMetadataTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -3162,4 +3349,28 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
                    .andExpect(jsonPath("$.page.totalElements", is(2)));
     }
 
+    @Test
+    public void findTheCreatedRelationshipTypeTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Relationship relationship = RelationshipBuilder
+            .createRelationshipBuilder(context, author1, orgUnit1, isOrgUnitOfPersonRelationshipType).build();
+
+        context.restoreAuthSystemState();
+
+        Integer relationshipId = relationship.getID();
+        getClient().perform(get("/api/core/relationships/" + relationshipId))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.id", is(relationship.getID())))
+                   .andExpect(jsonPath("$._embedded.relationships").doesNotExist())
+                   .andExpect(jsonPath("$._links.relationshipType.href",
+                       containsString("/api/core/relationships/" + relationshipId + "/relationshipType"))
+                   );
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/core/relationships/" + relationshipId + "/relationshipType"))
+                             .andExpect(status().isOk());
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipTypeRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipTypeRestRepositoryIT.java
index a2ed672a61..3295e03593 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipTypeRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipTypeRestRepositoryIT.java
@@ -22,13 +22,13 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import java.sql.SQLException;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.matcher.EntityTypeMatcher;
 import org.dspace.app.rest.matcher.RelationshipTypeMatcher;
 import org.dspace.app.rest.test.AbstractEntityIntegrationTest;
 import org.dspace.content.RelationshipType;
 import org.dspace.content.service.EntityTypeService;
 import org.dspace.content.service.RelationshipTypeService;
-import org.h2.util.StringUtils;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
new file mode 100644
index 0000000000..70009d049f
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
@@ -0,0 +1,2630 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static com.jayway.jsonpath.JsonPath.read;
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static java.util.Arrays.asList;
+import static java.util.UUID.fromString;
+import static org.dspace.app.matcher.LambdaMatcher.has;
+import static org.dspace.app.matcher.MetadataValueMatcher.with;
+import static org.dspace.app.rest.matcher.HalMatcher.matchLinks;
+import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
+import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
+import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataNotEmpty;
+import static org.dspace.app.rest.matcher.ResourcePolicyMatcher.matchResourcePolicyProperties;
+import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
+import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.io.UnsupportedEncodingException;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
+
+import com.jayway.jsonpath.JsonPath;
+import org.dspace.app.rest.model.patch.AddOperation;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.model.patch.RemoveOperation;
+import org.dspace.app.rest.model.patch.ReplaceOperation;
+import org.dspace.app.rest.repository.ResearcherProfileRestRepository;
+import org.dspace.app.rest.repository.patch.operation.ResearcherProfileAddOrcidOperation;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.OrcidTokenBuilder;
+import org.dspace.builder.RelationshipBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.RelationshipType;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.OrcidToken;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidQueueService;
+import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.util.UUIDUtils;
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MvcResult;
+
+/**
+ * Integration tests for {@link ResearcherProfileRestRepository}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class ResearcherProfileRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private OrcidTokenService orcidTokenService;
+
+    @Autowired
+    private OrcidQueueService orcidQueueService;
+
+    @Autowired
+    private ResearcherProfileAddOrcidOperation researcherProfileAddOrcidOperation;
+
+    @Autowired
+    private OrcidClient orcidClient;
+
+    private OrcidClient orcidClientMock = mock(OrcidClient.class);
+
+    private EPerson user;
+
+    private EPerson anotherUser;
+
+    private Collection personCollection;
+
+    /**
+     * Tests setup.
+     */
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        context.turnOffAuthorisationSystem();
+
+        user = EPersonBuilder.createEPerson(context)
+            .withEmail("user@example.com")
+            .withPassword(password)
+            .build();
+
+        anotherUser = EPersonBuilder.createEPerson(context)
+            .withEmail("anotherUser@example.com")
+            .withPassword(password)
+            .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        personCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Profile Collection")
+            .withEntityType("Person")
+            .withSubmitterGroup(user)
+            .withTemplateItem()
+            .build();
+
+        configurationService.setProperty("researcher-profile.collection.uuid", personCollection.getID().toString());
+
+        context.setCurrentUser(user);
+
+        context.restoreAuthSystemState();
+
+        researcherProfileAddOrcidOperation.setOrcidClient(orcidClientMock);
+
+    }
+
+    @After
+    public void after() {
+        orcidTokenService.deleteAll(context);
+        researcherProfileAddOrcidOperation.setOrcidClient(orcidClient);
+    }
+
+    /**
+     * Verify that the findById endpoint returns the own profile.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testFindById() throws Exception {
+
+        UUID id = user.getID();
+        String name = user.getFullName();
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        context.turnOffAuthorisationSystem();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withDspaceObjectOwner(name, id.toString())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(id.toString())))
+            .andExpect(jsonPath("$.visible", is(true)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + id, "item", "eperson")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("item")))
+            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.object.owner", name, id.toString(), 0)))
+            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.entity.type", "Person", 0)));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/eperson", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("eperson")))
+            .andExpect(jsonPath("$.name", is(name)));
+
+    }
+
+    /**
+     * Verify that the an admin user can call the findById endpoint to get a
+     * profile.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testFindByIdWithAdmin() throws Exception {
+
+        UUID id = user.getID();
+        String name = user.getFullName();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        context.turnOffAuthorisationSystem();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withDspaceObjectOwner(name, id.toString())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(id.toString())))
+            .andExpect(jsonPath("$.visible", is(true)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + id, "item", "eperson")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("item")))
+            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.object.owner", name, id.toString(), 0)))
+            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.entity.type", "Person", 0)));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/eperson", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("eperson")))
+            .andExpect(jsonPath("$.name", is(name)));
+
+    }
+
+    /**
+     * Verify that a standard user can't access the profile of another user.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testFindByIdWithoutOwnerUser() throws Exception {
+
+        UUID id = user.getID();
+        String name = user.getFullName();
+
+        String authToken = getAuthToken(anotherUser.getEmail(), password);
+
+        context.turnOffAuthorisationSystem();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withDspaceObjectOwner(name, id.toString())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isForbidden());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isForbidden());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/eperson", id))
+            .andExpect(status().isForbidden());
+
+    }
+
+    /**
+     * Verify that the createAndReturn endpoint create a new researcher profile.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testCreateAndReturn() throws Exception {
+
+        String id = user.getID().toString();
+        String name = user.getName();
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.id", is(id)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + id, "item", "eperson")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("item")))
+            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.object.owner", name, id, 0)))
+            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.entity.type", "Person", 0)));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/eperson", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("eperson")))
+            .andExpect(jsonPath("$.name", is(name)));
+
+        String itemId = getItemIdByProfileId(authToken, id);
+        Item profileItem = itemService.find(context, UUIDUtils.fromString(itemId));
+
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(get("/api/authz/resourcepolicies/search/resource")
+                .param("uuid", itemId))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.resourcepolicies", containsInAnyOrder(
+                matchResourcePolicyProperties(null, user, profileItem, null, Constants.READ, null),
+                matchResourcePolicyProperties(null, user, profileItem, null, Constants.WRITE, null))))
+            .andExpect(jsonPath("$.page.totalElements", is(2)));
+
+    }
+
+    @Test
+    public void testCreateAndReturnWithPublicProfile() throws Exception {
+
+        configurationService.setProperty("researcher-profile.set-new-profile-visible", true);
+        String id = user.getID().toString();
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.id", is(id)))
+            .andExpect(jsonPath("$.visible", is(true)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + id, "item", "eperson")));
+    }
+
+    /**
+     * Verify that an admin can call the createAndReturn endpoint to store a new
+     * researcher profile related to another user.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testCreateAndReturnWithAdmin() throws Exception {
+
+        String id = user.getID().toString();
+        String name = user.getName();
+
+        configurationService.setProperty("researcher-profile.collection.uuid", null);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .param("eperson", id)
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.id", is(id)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + id, "item", "eperson")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("item")))
+            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.object.owner", name, id, 0)))
+            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.entity.type", "Person", 0)));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/eperson", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.type", is("eperson")))
+            .andExpect(jsonPath("$.name", is(name)));
+
+        authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(id)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + id, "item", "eperson")));
+    }
+
+    @Test
+    public void testCreateAndReturnWithoutCollectionIdSet() throws Exception {
+
+        String id = user.getID().toString();
+
+        configurationService.setProperty("researcher-profile.collection.uuid", null);
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.id", is(id)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + id, "item", "eperson")));
+
+        String itemId = getItemIdByProfileId(authToken, id);
+        Item profileItem = itemService.find(context, UUIDUtils.fromString(itemId));
+        assertThat(profileItem, notNullValue());
+        assertThat(profileItem.getOwningCollection(), is(personCollection));
+
+    }
+
+    @Test
+    public void testCreateAndReturnWithCollectionHavingInvalidEntityTypeSet() throws Exception {
+
+        String id = user.getID().toString();
+
+        context.turnOffAuthorisationSystem();
+
+        Collection orgUnitCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("OrgUnit Collection")
+            .withEntityType("OrgUnit")
+            .withSubmitterGroup(user)
+            .withTemplateItem()
+            .build();
+
+        context.restoreAuthSystemState();
+
+        configurationService.setProperty("researcher-profile.collection.uuid", orgUnitCollection.getID().toString());
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.id", is(id)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + id, "item", "eperson")));
+
+        String itemId = getItemIdByProfileId(authToken, id);
+        Item profileItem = itemService.find(context, UUIDUtils.fromString(itemId));
+        assertThat(profileItem, notNullValue());
+        assertThat(profileItem.getOwningCollection(), is(personCollection));
+
+    }
+
+    /**
+     * Verify that a standard user can't call the createAndReturn endpoint to store
+     * a new researcher profile related to another user.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testCreateAndReturnWithoutOwnUser() throws Exception {
+
+        String authToken = getAuthToken(anotherUser.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .param("eperson", user.getID().toString())
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+    }
+
+    /**
+     * Verify that a conflict occurs if an user that have already a profile call the
+     * createAndReturn endpoint.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testCreateAndReturnWithProfileAlreadyAssociated() throws Exception {
+
+        String id = user.getID().toString();
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.id", is(id)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")));
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    /**
+     * Verify that an unprocessable entity status is back when the createAndReturn
+     * is called to create a profile for an unknown user.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testCreateAndReturnWithUnknownEPerson() throws Exception {
+
+        String unknownId = UUID.randomUUID().toString();
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .param("eperson", unknownId)
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isUnprocessableEntity());
+    }
+
+    /**
+     * Verify that a user can delete their profile using the delete endpoint.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testDelete() throws Exception {
+
+        configurationService.setProperty("researcher-profile.hard-delete.enabled", false);
+
+        String id = user.getID().toString();
+        String authToken = getAuthToken(user.getEmail(), password);
+        AtomicReference<UUID> itemIdRef = new AtomicReference<>();
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", hasJsonPath("$.metadata", matchMetadataNotEmpty("dspace.object.owner"))))
+            .andDo(result -> itemIdRef.set(fromString(read(result.getResponse().getContentAsString(), "$.id"))));
+
+        getClient(authToken).perform(delete("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNoContent());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNotFound());
+
+        getClient(authToken).perform(get("/api/core/items/{id}", itemIdRef.get()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", hasJsonPath("$.metadata", matchMetadataDoesNotExist("dspace.object.owner"))));
+
+    }
+
+    /**
+     * Verify that a user can hard delete their profile using the delete endpoint.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testHardDelete() throws Exception {
+
+        configurationService.setProperty("researcher-profile.hard-delete.enabled", true);
+
+        String id = user.getID().toString();
+        String authToken = getAuthToken(user.getEmail(), password);
+        AtomicReference<UUID> itemIdRef = new AtomicReference<>();
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", hasJsonPath("$.metadata", matchMetadataNotEmpty("dspace.object.owner"))))
+            .andDo(result -> itemIdRef.set(fromString(read(result.getResponse().getContentAsString(), "$.id"))));
+
+        getClient(authToken).perform(delete("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNoContent());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNotFound());
+
+        getClient(authToken).perform(get("/api/core/items/{id}", itemIdRef.get()))
+            .andExpect(status().isNotFound());
+
+    }
+
+    @Test
+    public void testDeleteWithProfileLinkedWithOrcid() throws Exception {
+
+        configurationService.setProperty("researcher-profile.hard-delete.enabled", false);
+
+        context.turnOffAuthorisationSystem();
+
+        Item profileItem = ItemBuilder.createItem(context, personCollection)
+            .withDspaceObjectOwner(user.getEmail(), user.getID().toString())
+            .withOrcidIdentifier("0000-1111-2222-3333")
+            .withOrcidAccessToken("access-token", eperson)
+            .withOrcidAuthenticated("authenticated")
+            .build();
+
+        String id = user.getID().toString();
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        context.restoreAuthSystemState();
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        assertThat(profileItem.getMetadata(), hasItem(with("person.identifier.orcid", "0000-1111-2222-3333")));
+        assertThat(profileItem.getMetadata(), hasItem(with("dspace.orcid.authenticated", "authenticated")));
+        assertThat(getOrcidAccessToken(profileItem), notNullValue());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", hasJsonPath("$.metadata", matchMetadataNotEmpty("dspace.object.owner"))));
+
+        getClient(authToken).perform(delete("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNoContent());
+
+        profileItem = context.reloadEntity(profileItem);
+
+        assertThat(profileItem.getMetadata(), not(hasItem(with("person.identifier.orcid", "0000-1111-2222-3333"))));
+        assertThat(profileItem.getMetadata(), not(hasItem(with("dspace.orcid.authenticated", "authenticated"))));
+        assertThat(getOrcidAccessToken(profileItem), nullValue());
+
+    }
+
+    /**
+     * Verify that an admin can delete a profile of another user using the delete
+     * endpoint.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testDeleteWithAdmin() throws Exception {
+
+        String id = user.getID().toString();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        String userToken = getAuthToken(user.getEmail(), password);
+
+        getClient(userToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        getClient(adminToken).perform(delete("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNoContent());
+
+        getClient(adminToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNotFound());
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNotFound());
+    }
+
+    /**
+     * Verify that an user can delete their profile using the delete endpoint even if
+     * was created by an admin.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testDeleteProfileCreatedByAnAdmin() throws Exception {
+
+        String id = user.getID().toString();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        String userToken = getAuthToken(user.getEmail(), password);
+
+        getClient(adminToken).perform(post("/api/eperson/profiles/")
+            .param("eperson", id)
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        getClient(adminToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        getClient(userToken).perform(delete("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNoContent());
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNotFound());
+
+        getClient(adminToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNotFound());
+
+    }
+
+    /**
+     * Verify that a standard user can't call the delete endpoint to delete a
+     * researcher profile related to another user.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testDeleteWithoutOwnUser() throws Exception {
+
+        String id = user.getID().toString();
+
+        String userToken = getAuthToken(user.getEmail(), password);
+        String anotherUserToken = getAuthToken(anotherUser.getEmail(), password);
+
+        getClient(userToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        getClient(anotherUserToken).perform(delete("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isForbidden());
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+    }
+
+    /**
+     * Verify that an user can change the profile visibility using the patch endpoint.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPatchToChangeVisibleAttribute() throws Exception {
+
+        String id = user.getID().toString();
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.visible", is(false)));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(false)));
+
+        String itemId = getItemIdByProfileId(authToken, id);
+
+        getClient().perform(get("/api/core/items/{id}", itemId))
+            .andExpect(status().isUnauthorized());
+
+        // change the visibility to true
+        List<Operation> operations = asList(new ReplaceOperation("/visible", true));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", id)
+            .content(getPatchContent(operations))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(true)));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(true)));
+
+        getClient().perform(get("/api/core/items/{id}", itemId))
+            .andExpect(status().isOk());
+
+        // change the visibility to false
+        operations = asList(new ReplaceOperation("/visible", false));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", id)
+            .content(getPatchContent(operations))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(false)));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(false)));
+
+        getClient().perform(get("/api/core/items/{id}", itemId))
+            .andExpect(status().isUnauthorized());
+
+    }
+
+    /**
+     * Verify that an user can not change the profile visibility of another user
+     * using the patch endpoint.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPatchToChangeVisibleAttributeWithoutOwnUser() throws Exception {
+
+        String id = user.getID().toString();
+
+        String userToken = getAuthToken(user.getEmail(), password);
+        String anotherUserToken = getAuthToken(anotherUser.getEmail(), password);
+
+        getClient(userToken).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated())
+            .andExpect(jsonPath("$.visible", is(false)));
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        // try to change the visibility to true
+        List<Operation> operations = asList(new ReplaceOperation("/visible", true));
+
+        getClient(anotherUserToken).perform(patch("/api/eperson/profiles/{id}", id)
+            .content(getPatchContent(operations))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(false)));
+    }
+
+    /**
+     * Verify that an admin can change the profile visibility of another user using
+     * the patch endpoint.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPatchToChangeVisibleAttributeWithAdmin() throws Exception {
+
+        String id = user.getID().toString();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        String userToken = getAuthToken(user.getEmail(), password);
+
+        getClient(userToken).perform(post("/api/eperson/profiles/")
+            .param("eperson", id)
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        // change the visibility to true
+        List<Operation> operations = asList(new ReplaceOperation("/visible", true));
+
+        getClient(adminToken).perform(patch("/api/eperson/profiles/{id}", id)
+            .content(getPatchContent(operations))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(true)));
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(true)));
+    }
+
+    /**
+     * Verify that an user can change the visibility of their profile using the patch
+     * endpoint even if was created by an admin.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPatchToChangeVisibilityOfProfileCreatedByAnAdmin() throws Exception {
+
+        String id = user.getID().toString();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        String userToken = getAuthToken(user.getEmail(), password);
+
+        getClient(adminToken).perform(post("/api/eperson/profiles/")
+            .param("eperson", id)
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        getClient(adminToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        // change the visibility to true
+        List<Operation> operations = asList(new ReplaceOperation("/visible", true));
+
+        getClient(userToken).perform(patch("/api/eperson/profiles/{id}", id)
+            .content(getPatchContent(operations))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(true)));
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.visible", is(true)));
+    }
+
+    @Test
+    public void testPatchToChangeVisibleAttributeOfNotExistProfile() throws Exception {
+
+        String id = user.getID().toString();
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated())
+                            .andExpect(jsonPath("$.visible", is(false)));
+
+        getClient(authToken).perform(delete("/api/eperson/profiles/{id}", id))
+                            .andExpect(status().isNoContent());
+
+        List<Operation> operations = asList(new ReplaceOperation("/visible", true));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", id)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isNotFound());
+    }
+
+    /**
+     * Verify that after an user login an automatic claim between the logged eperson
+     * and possible profiles without eperson is done.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testAutomaticProfileClaimByEmail() throws Exception {
+
+        String id = user.getID().toString();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+
+        // create and delete a profile
+        getClient(adminToken).perform(post("/api/eperson/profiles/")
+            .param("eperson", id)
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        String firstItemId = getItemIdByProfileId(adminToken, id);
+
+        getClient(adminToken).perform(delete("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNoContent());
+
+        getClient(adminToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNotFound());
+
+        // the automatic claim is done after the user login
+        String userToken = getAuthToken(user.getEmail(), password);
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        // the profile item should be the same
+        String secondItemId = getItemIdByProfileId(adminToken, id);
+        assertEquals("The item should be the same", firstItemId, secondItemId);
+
+    }
+
+    @Test
+    public void testAutomaticProfileClaimByEmailWithRegularEntity() throws Exception {
+
+        String userToken = getAuthToken(user.getEmail(), password);
+
+        context.turnOffAuthorisationSystem();
+
+        Item itemToBeClaimed = ItemBuilder.createItem(context, personCollection)
+            .withPersonEmail(user.getEmail())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String id = user.getID().toString();
+
+        getClient(userToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isNotFound());
+
+        // the automatic claim is done after the user login
+        String newUserToken = getAuthToken(user.getEmail(), password);
+
+        getClient(newUserToken).perform(get("/api/eperson/profiles/{id}", id))
+            .andExpect(status().isOk());
+
+        // the profile item should be the same
+        String firstItemId = itemToBeClaimed.getID().toString();
+        String secondItemId = getItemIdByProfileId(newUserToken, id);
+        assertEquals("The item should be the same", firstItemId, secondItemId);
+
+    }
+
+    @Test
+    public void testNoAutomaticProfileClaimOccursIfManyClaimableItemsAreFound() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withNameInMetadata("Test", "User")
+            .withPassword(password)
+            .withEmail("test@email.it")
+            .build();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withPersonEmail("test@email.it")
+            .build();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withPersonEmail("test@email.it")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String epersonId = ePerson.getID().toString();
+
+        getClient(getAuthToken(ePerson.getEmail(), password))
+            .perform(get("/api/eperson/profiles/{id}", epersonId))
+            .andExpect(status().isNotFound());
+
+    }
+
+    @Test
+    public void testNoAutomaticProfileClaimOccursIfItemHasNotAnEmail() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withNameInMetadata("Test", "User")
+            .withPassword(password)
+            .withEmail("test@email.it")
+            .build();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withPersonIdentifierFirstName("Test")
+            .withPersonIdentifierLastName("User")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String epersonId = ePerson.getID().toString();
+
+        getClient(getAuthToken(ePerson.getEmail(), password))
+            .perform(get("/api/eperson/profiles/{id}", epersonId))
+            .andExpect(status().isNotFound());
+
+    }
+
+    @Test
+    public void testNoAutomaticProfileClaimOccursIfTheUserHasAlreadyAProfile() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withNameInMetadata("Test", "User")
+            .withPassword(password)
+            .withEmail("test@email.it")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String epersonId = ePerson.getID().toString();
+
+        String token = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(token).perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        getClient(token).perform(get("/api/eperson/profiles/{id}", epersonId))
+            .andExpect(status().isOk());
+
+        String profileItemId = getItemIdByProfileId(token, epersonId);
+
+        context.turnOffAuthorisationSystem();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withPersonEmail("test@email.it")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        token = getAuthToken(ePerson.getEmail(), password);
+
+        String newProfileItemId = getItemIdByProfileId(token, epersonId);
+        assertEquals("The item should be the same", newProfileItemId, profileItemId);
+
+    }
+
+    @Test
+    public void testNoAutomaticProfileClaimOccursIfTheFoundProfileIsAlreadyClaimed() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withNameInMetadata("Test", "User")
+            .withPassword(password)
+            .withEmail("test@email.it")
+            .build();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withTitle("Admin User")
+            .withPersonEmail("test@email.it")
+            .withDspaceObjectOwner("Admin User", admin.getID().toString())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String epersonId = ePerson.getID().toString();
+
+        String token = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(token).perform(get("/api/eperson/profiles/{id}", epersonId))
+            .andExpect(status().isNotFound());
+
+    }
+
+    @Test
+    public void researcherProfileClaim() throws Exception {
+        String id = user.getID().toString();
+        String name = user.getName();
+
+        context.turnOffAuthorisationSystem();
+
+        final Item person = ItemBuilder.createItem(context, personCollection)
+                                      .withTitle("Test User 1")
+                                      .withPersonEmail(user.getEmail())
+                                      .build();
+
+        final Item otherPerson = ItemBuilder.createItem(context, personCollection)
+                                       .withTitle("Test User 2")
+                                       .withPersonEmail(user.getEmail())
+                                       .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(TEXT_URI_LIST)
+                                         .content("http://localhost:8080/server/api/core/items/" + person.getID().toString()))
+                            .andExpect(status().isCreated())
+                            .andExpect(jsonPath("$.id", is(id)))
+                            .andExpect(jsonPath("$.type", is("profile")))
+                            .andExpect(jsonPath("$", matchLinks("http://localhost/api/eperson/profiles/" + user.getID(),
+                                                                "item", "eperson")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", id))
+                            .andExpect(status().isOk());
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", id))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.type", is("item")))
+                            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.object.owner", name, id, 0)))
+                            .andExpect(jsonPath("$.metadata", matchMetadata("dspace.entity.type", "Person", 0)));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/eperson", id))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.type", is("eperson")))
+                            .andExpect(jsonPath("$.name", is(name)));
+
+        // trying to claim another profile
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(TEXT_URI_LIST)
+                                         .content("http://localhost:8080/server/api/core/items/" + otherPerson.getID().toString()))
+                            .andExpect(status().isUnprocessableEntity());
+
+        // other person trying to claim same profile
+        context.turnOffAuthorisationSystem();
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withEmail("foo@bar.baz")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        context.restoreAuthSystemState();
+
+        final String ePersonToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(ePersonToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(TEXT_URI_LIST)
+                                         .content("http://localhost:8080/server/api/core/items/" + person.getID().toString()))
+                            .andExpect(status().isBadRequest());
+
+        getClient(authToken).perform(delete("/api/eperson/profiles/{id}", id))
+                            .andExpect(status().isNoContent());
+    }
+
+    @Test
+    public void researcherProfileClaimWithoutEmail() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        final Item person = ItemBuilder.createItem(context, personCollection)
+            .withTitle("Test User 1")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(TEXT_URI_LIST)
+            .content("http://localhost:8080/server/api/core/items/" + person.getID().toString()))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void researcherProfileClaimWithDifferentEmail() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        final Item person = ItemBuilder.createItem(context, personCollection)
+            .withTitle("Test User 1")
+            .withPersonEmail(eperson.getEmail())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+            .contentType(TEXT_URI_LIST)
+            .content("http://localhost:8080/server/api/core/items/" + person.getID().toString()))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void testNotAdminUserClaimProfileOfAnotherUser() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        final Item person = ItemBuilder.createItem(context, personCollection)
+                                       .withTitle("Test User 1")
+                                       .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .param("eperson" , anotherUser.getID().toString())
+                                         .contentType(TEXT_URI_LIST)
+                                         .content("http://localhost:8080/server/api/core/items/" + person.getID().toString()))
+                            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void testAdminUserClaimProfileOfNotExistingPersonId() throws Exception {
+
+        String id = "bef23ba3-9aeb-4f7b-b153-77b0f1fc3612";
+
+        context.turnOffAuthorisationSystem();
+
+        final Item person = ItemBuilder.createItem(context, personCollection)
+                                       .withTitle("Test User 1")
+                                       .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .param("eperson" , id)
+                                         .contentType(TEXT_URI_LIST)
+                                         .content("http://localhost:8080/server/api/core/items/" + person.getID().toString()))
+                            .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void testAdminUserClaimProfileOfWrongPersonId() throws Exception {
+
+        String id = "invalid_id";
+
+        context.turnOffAuthorisationSystem();
+
+        final Item person = ItemBuilder.createItem(context, personCollection)
+                                       .withTitle("Test User 1")
+                                       .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .param("eperson" , id)
+                                         .contentType(TEXT_URI_LIST)
+                                         .content("http://localhost:8080/server/api/core/items/" + person.getID().toString()))
+                            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void claimForNotAllowedEntityType() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        final Collection publications = CollectionBuilder.createCollection(context, parentCommunity)
+                                                        .withEntityType("Publication")
+                                                        .build();
+
+        final Item publication = ItemBuilder.createItem(context, publications)
+                                       .withTitle("title")
+                                       .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(TEXT_URI_LIST)
+                                         .content("http://localhost:8080/server/api/core/items/" + publication.getID().toString()))
+                            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void testOrcidMetadataOfEpersonAreCopiedOnProfile() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .withOrcidScope("/first-scope")
+                                        .withOrcidScope("/second-scope")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "af097328-ac1c-4a3e-9eb4-069897874910").build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated())
+                            .andExpect(jsonPath("$.id", is(ePersonId.toString())))
+                            .andExpect(jsonPath("$.visible", is(false)))
+                            .andExpect(jsonPath("$.type", is("profile")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", ePersonId))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcid", is("0000-1111-2222-3333")))
+                            .andExpect(jsonPath("$.orcidSynchronization.mode", is("MANUAL")))
+                            .andExpect(jsonPath("$.orcidSynchronization.publicationsPreference", is("DISABLED")))
+                            .andExpect(jsonPath("$.orcidSynchronization.fundingsPreference", is("DISABLED")))
+                            .andExpect(jsonPath("$.orcidSynchronization.profilePreferences", empty()));
+
+        String itemId = getItemIdByProfileId(authToken, ePersonId);
+
+        Item profileItem = itemService.find(context, UUIDUtils.fromString(itemId));
+        assertThat(profileItem, notNullValue());
+
+        List<MetadataValue> metadata = profileItem.getMetadata();
+        assertThat(metadata, hasItem(with("person.identifier.orcid", "0000-1111-2222-3333")));
+        assertThat(metadata, hasItem(with("dspace.orcid.scope", "/first-scope", 0)));
+        assertThat(metadata, hasItem(with("dspace.orcid.scope", "/second-scope", 1)));
+
+        assertThat(getOrcidAccessToken(profileItem), is("af097328-ac1c-4a3e-9eb4-069897874910"));
+
+    }
+
+    @Test
+    public void testPatchToSetOrcidSynchronizationPreferenceForPublications() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .withOrcidScope("/first-scope")
+                                        .withOrcidScope("/second-scope")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "af097328-ac1c-4a3e-9eb4-069897874910").build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated());
+
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/publications", ALL.name()));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.publicationsPreference", is(ALL.name())));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", ePersonId))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.publicationsPreference", is(ALL.name())));
+
+        operations = asList(new ReplaceOperation("/orcid/publications", "INVALID_VALUE"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    @Test
+    public void testPatchToSetOrcidSynchronizationPreferenceForFundings() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .withOrcidScope("/first-scope")
+                                        .withOrcidScope("/second-scope")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "af097328-ac1c-4a3e-9eb4-069897874910").build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated());
+
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/fundings", ALL.name()));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.fundingsPreference", is(ALL.name())));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", ePersonId))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.fundingsPreference", is(ALL.name())));
+
+        operations = asList(new ReplaceOperation("/orcid/fundings", "INVALID_VALUE"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    @Test
+    public void testPatchToSetOrcidSynchronizationPreferenceForProfile() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .withOrcidScope("/first-scope")
+                                        .withOrcidScope("/second-scope")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "af097328-ac1c-4a3e-9eb4-069897874910").build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated());
+
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/profile", "IDENTIFIERS"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.profilePreferences",
+                                                containsInAnyOrder("IDENTIFIERS")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", ePersonId))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.profilePreferences",
+                                                containsInAnyOrder("IDENTIFIERS")));
+
+        operations = asList(new ReplaceOperation("/orcid/profiles", "INVALID_VALUE"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    @Test
+    public void testPatchToSetOrcidSynchronizationMode() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .withOrcidScope("/first-scope")
+                                        .withOrcidScope("/second-scope")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "af097328-ac1c-4a3e-9eb4-069897874910").build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated());
+
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/mode", "BATCH"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.mode", is("BATCH")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", ePersonId))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.mode", is("BATCH")));
+
+        operations = asList(new ReplaceOperation("/orcid/mode", "MANUAL"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.mode", is("MANUAL")));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}", ePersonId))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.orcidSynchronization.mode", is("MANUAL")));
+
+        operations = asList(new ReplaceOperation("/orcid/mode", "INVALID_VALUE"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    @Test
+    public void testPatchToSetOrcidSynchronizationPreferenceWithWrongPath() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .withOrcidScope("/first-scope")
+                                        .withOrcidScope("/second-scope")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "af097328-ac1c-4a3e-9eb4-069897874910").build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated());
+
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/wrong-path", "BATCH"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void testPatchToSetOrcidSynchronizationPreferenceWithProfileNotLinkedToOrcid() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated());
+
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/mode", "BATCH"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                                         .content(getPatchContent(operations))
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isBadRequest());
+
+    }
+
+    @Test
+    public void testPatchToSetOrcidSynchronizationPreferenceWithNotOwnerUser() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withOrcid("0000-1111-2222-3333")
+            .withEmail("test@email.it")
+            .withPassword(password)
+            .withNameInMetadata("Test", "User")
+            .withOrcidScope("/first-scope")
+            .withOrcidScope("/second-scope")
+            .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "af097328-ac1c-4a3e-9eb4-069897874910").build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+
+        getClient(getAuthToken(ePerson.getEmail(), password))
+            .perform(post("/api/eperson/profiles/")
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/publications", ALL.name()));
+
+        getClient(getAuthToken(user.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePersonId)
+            .content(getPatchContent(operations))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+    }
+
+    @Test
+    public void testPatchToSetOrcidSynchronizationPreferenceWithAdmin() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withOrcid("0000-1111-2222-3333")
+            .withEmail("test@email.it")
+            .withPassword(password)
+            .withNameInMetadata("Test", "User")
+            .withOrcidScope("/first-scope")
+            .withOrcidScope("/second-scope")
+            .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "af097328-ac1c-4a3e-9eb4-069897874910").build();
+
+        context.restoreAuthSystemState();
+
+        String ePersonId = ePerson.getID().toString();
+
+        getClient(getAuthToken(ePerson.getEmail(), password))
+            .perform(post("/api/eperson/profiles/")
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isCreated());
+
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/publications", ALL.name()));
+
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                .content(getPatchContent(operations))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.orcidSynchronization.publicationsPreference", is(ALL.name())));
+
+    }
+
+    @Test
+    public void testOwnerPatchToDisconnectProfileFromOrcidWithDisabledConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "disabled");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(ePerson.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+    }
+
+    @Test
+    public void testAdminPatchToDisconnectProfileFromOrcidWithDisabledConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", null);
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+    }
+
+    @Test
+    public void testAnotherUserPatchToDisconnectProfileFromOrcidWithDisabledConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        EPerson anotherUser = EPersonBuilder.createEPerson(context)
+                                            .withCanLogin(true)
+                                            .withEmail("user@email.it")
+                                            .withPassword(password)
+                                            .withNameInMetadata("Another", "User")
+                                            .build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(anotherUser.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+    }
+
+    @Test
+    public void testOwnerPatchToDisconnectProfileFromOrcidWithOnlyOwnerConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "only_owner");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(ePerson.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(ePerson.getID().toString())))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$.orcid").doesNotExist())
+            .andExpect(jsonPath("$.orcidSynchronization").doesNotExist());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), empty());
+        assertThat(getOrcidAccessToken(profile), nullValue());
+    }
+
+    @Test
+    public void testAdminPatchToDisconnectProfileFromOrcidWithOnlyOwnerConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "only_owner");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+    }
+
+    @Test
+    public void testAnotherUserPatchToDisconnectProfileFromOrcidWithOnlyOwnerConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "admin_and_owner");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(anotherUser.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+    }
+
+    @Test
+    public void testOwnerPatchToDisconnectProfileFromOrcidWithOnlyAdminConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "only_admin");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(ePerson.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+    }
+
+    @Test
+    public void testAdminPatchToDisconnectProfileFromOrcidWithOnlyAdminConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "only_admin");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(ePerson.getID().toString())))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$.orcid").doesNotExist())
+            .andExpect(jsonPath("$.orcidSynchronization").doesNotExist());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), empty());
+        assertThat(getOrcidAccessToken(profile), nullValue());
+    }
+
+    @Test
+    public void testAnotherUserPatchToDisconnectProfileFromOrcidWithOnlyAdminConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "only_admin");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(anotherUser.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+    }
+
+    @Test
+    public void testOwnerPatchToDisconnectProfileFromOrcidWithAdminAndOwnerConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "admin_and_owner");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(ePerson.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(ePerson.getID().toString())))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$.orcid").doesNotExist())
+            .andExpect(jsonPath("$.orcidSynchronization").doesNotExist());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), empty());
+        assertThat(getOrcidAccessToken(profile), nullValue());
+    }
+
+    @Test
+    public void testAdminPatchToDisconnectProfileFromOrcidWithAdminAndOwnerConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "admin_and_owner");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(ePerson.getID().toString())))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$.orcid").doesNotExist())
+            .andExpect(jsonPath("$.orcidSynchronization").doesNotExist());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), empty());
+        assertThat(getOrcidAccessToken(profile), nullValue());
+    }
+
+    @Test
+    public void testAnotherUserPatchToDisconnectProfileFromOrcidWithAdminAndOwnerConfiguration() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "admin_and_owner");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+                                        .withCanLogin(true)
+                                        .withOrcid("0000-1111-2222-3333")
+                                        .withOrcidScope("/read")
+                                        .withOrcidScope("/write")
+                                        .withEmail("test@email.it")
+                                        .withPassword(password)
+                                        .withNameInMetadata("Test", "User")
+                                        .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        getClient(getAuthToken(anotherUser.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", ePerson.getID().toString())
+                         .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+    }
+
+    @Test
+    public void testCloneFromExternalProfileAlreadyAssociated() throws Exception {
+
+        String id = user.getID().toString();
+        String authToken = getAuthToken(user.getEmail(), password);
+
+        getClient(authToken).perform(post("/api/eperson/profiles/").contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated()).andExpect(jsonPath("$.id", is(id)))
+                            .andExpect(jsonPath("$.visible", is(false))).andExpect(jsonPath("$.type", is("profile")));
+
+        getClient(authToken)
+            .perform(post("/api/eperson/profiles/").contentType(TEXT_URI_LIST)
+                                                   .content("http://localhost:8080/server/api/core/items/" + id))
+            .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void testOrcidSynchronizationPreferenceUpdateForceOrcidQueueRecalculation() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EntityType publicationType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
+        EntityType projectType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        EntityType personType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person").build();
+        EntityType orgUnitType = EntityTypeBuilder.createEntityTypeBuilder(context, "OrgUnit").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, personType, publicationType,
+            "isAuthorOfPublication", "isPublicationOfAuthor", 0, null, 0, null).build();
+
+        RelationshipType isOrgUnitOfPerson = createRelationshipTypeBuilder(context, personType, orgUnitType,
+            "isOrgUnitOfPerson", "isPersonOfOrgUnit", 0, null, 0, null).build();
+
+        RelationshipType isProjectOfPerson = createRelationshipTypeBuilder(context, projectType, personType,
+            "isProjectOfPerson", "isPersonOfProject", 0, null, 0, null).build();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withOrcid("0000-1111-2222-3333")
+            .withOrcidScope("/read")
+            .withOrcidScope("/write")
+            .withEmail("test@email.it")
+            .withPassword(password)
+            .withNameInMetadata("Test", "User")
+            .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        UUID ePersonId = ePerson.getID();
+
+        Item profile = createProfile(ePerson);
+
+        UUID profileItemId = profile.getID();
+
+        Collection publications = createCollection("Publications", "Publication");
+
+        Collection orgUnits = createCollection("OrgUnits", "OrgUnit");
+
+        Item publication = createPublication(publications, "Test publication", profile, isAuthorOfPublication);
+
+        Collection projects = createCollection("Projects", "Project");
+
+        Item firstProject = createProject(projects, "First project", profile, isProjectOfPerson);
+        Item secondProject = createProject(projects, "Second project", profile, isProjectOfPerson);
+
+        createOrgUnit(orgUnits, "OrgUnit", profile, isOrgUnitOfPerson);
+
+        context.restoreAuthSystemState();
+
+        // no preferences configured, so no orcid queue records created
+        assertThat(orcidQueueService.findByProfileItemId(context, profileItemId), empty());
+
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId.toString())
+            .content(getPatchContent(asList(new ReplaceOperation("/orcid/publications", "ALL"))))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk());
+
+        List<OrcidQueue> queueRecords = orcidQueueService.findByProfileItemId(context, profileItemId);
+        assertThat(queueRecords, hasSize(1));
+        assertThat(queueRecords, has(orcidQueueRecordWithEntity(publication)));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId.toString())
+            .content(getPatchContent(asList(new ReplaceOperation("/orcid/fundings", "ALL"))))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk());
+
+        queueRecords = orcidQueueService.findByProfileItemId(context, profileItemId);
+        assertThat(queueRecords, hasSize(3));
+        assertThat(queueRecords, has(orcidQueueRecordWithEntity(publication)));
+        assertThat(queueRecords, has(orcidQueueRecordWithEntity(firstProject)));
+        assertThat(queueRecords, has(orcidQueueRecordWithEntity(secondProject)));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId.toString())
+            .content(getPatchContent(asList(new ReplaceOperation("/orcid/publications", "DISABLED"))))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk());
+
+        queueRecords = orcidQueueService.findByProfileItemId(context, profileItemId);
+        assertThat(queueRecords, hasSize(2));
+        assertThat(queueRecords, has(orcidQueueRecordWithEntity(firstProject)));
+        assertThat(queueRecords, has(orcidQueueRecordWithEntity(secondProject)));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId.toString())
+            .content(getPatchContent(asList(new ReplaceOperation("/orcid/fundings", "DISABLED"))))
+            .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk());
+
+        assertThat(orcidQueueService.findByProfileItemId(context, profileItemId), empty());
+
+    }
+
+    @Test
+    public void testLinkProfileWithValidCode() throws Exception {
+
+        String code = "123456";
+        String orcid = "0000-0000-1111-2222";
+        String accessToken = "c41e37e5-c2de-4177-91d6-ed9e9d1f31bf";
+        String[] scopes = { "FirstScope", "SecondScope" };
+
+        context.turnOffAuthorisationSystem();
+
+        Item profileItem = createProfile(user);
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.getAccessToken(code)).thenReturn(buildOrcidTokenResponse(orcid, accessToken, scopes));
+
+        getClient(getAuthToken(user.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", user.getID().toString())
+                .content(getPatchContent(asList(new AddOperation("/orcid", code))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk());
+
+        verify(orcidClientMock).getAccessToken(code);
+        verifyNoMoreInteractions(orcidClientMock);
+
+        profileItem = context.reloadEntity(profileItem);
+        assertThat(profileItem, notNullValue());
+        assertThat(profileItem.getMetadata(), hasItem(with("person.identifier.orcid", orcid)));
+        assertThat(profileItem.getMetadata(), hasItem(with("dspace.orcid.scope", scopes[0], 0)));
+        assertThat(profileItem.getMetadata(), hasItem(with("dspace.orcid.scope", scopes[1], 1)));
+
+        assertThat(getOrcidAccessToken(profileItem), is(accessToken));
+
+        user = context.reloadEntity(user);
+        assertThat(user.getNetid(), is(orcid));
+    }
+
+    @Test
+    public void testLinkProfileWithAdmin() throws Exception {
+
+        String code = "123456";
+        String orcid = "0000-0000-1111-2222";
+        String accessToken = "c41e37e5-c2de-4177-91d6-ed9e9d1f31bf";
+        String[] scopes = { "FirstScope", "SecondScope" };
+
+        context.turnOffAuthorisationSystem();
+
+        Item profileItem = createProfile(user);
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.getAccessToken(code)).thenReturn(buildOrcidTokenResponse(orcid, accessToken, scopes));
+
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", user.getID().toString())
+                .content(getPatchContent(asList(new AddOperation("/orcid", code))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk());
+
+        verify(orcidClientMock).getAccessToken(code);
+        verifyNoMoreInteractions(orcidClientMock);
+
+        profileItem = context.reloadEntity(profileItem);
+        assertThat(profileItem, notNullValue());
+        assertThat(profileItem.getMetadata(), hasItem(with("person.identifier.orcid", orcid)));
+        assertThat(profileItem.getMetadata(), hasItem(with("dspace.orcid.scope", scopes[0], 0)));
+        assertThat(profileItem.getMetadata(), hasItem(with("dspace.orcid.scope", scopes[1], 1)));
+
+        assertThat(getOrcidAccessToken(profileItem), is(accessToken));
+
+        user = context.reloadEntity(user);
+        assertThat(user.getNetid(), is(orcid));
+
+    }
+
+    @Test
+    public void testLinkProfileWithInvalidCode() throws Exception {
+
+        String code = "123456";
+
+        context.turnOffAuthorisationSystem();
+
+        Item profileItem = createProfile(user);
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.getAccessToken(code)).thenThrow(new OrcidClientException(400, "{\n" +
+            "    \"error\": \"invalid_grant\",\n" +
+            "    \"error_description\": \"Invalid authorization code: 123456\"\n" +
+            "}"));
+
+        getClient(getAuthToken(user.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", user.getID().toString())
+                .content(getPatchContent(asList(new AddOperation("/orcid", code))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isUnprocessableEntity());
+
+        verify(orcidClientMock).getAccessToken(code);
+        verifyNoMoreInteractions(orcidClientMock);
+
+        assertThat(getOrcidAccessToken(profileItem), nullValue());
+    }
+
+    @Test
+    public void testLinkProfileWithGenericError() throws Exception {
+
+        String code = "123456";
+
+        context.turnOffAuthorisationSystem();
+
+        Item profileItem = createProfile(user);
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.getAccessToken(code)).thenThrow(new OrcidClientException(401, "Forbidden"));
+
+        getClient(getAuthToken(user.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", user.getID().toString())
+                .content(getPatchContent(asList(new AddOperation("/orcid", code))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isInternalServerError());
+
+        verify(orcidClientMock).getAccessToken(code);
+        verifyNoMoreInteractions(orcidClientMock);
+
+        assertThat(getOrcidAccessToken(profileItem), nullValue());
+    }
+
+    @Test
+    public void testLinkProfileForbiddenForNotOwnerUser() throws Exception {
+
+        String code = "123456";
+        String orcid = "0000-0000-1111-2222";
+        String accessToken = "c41e37e5-c2de-4177-91d6-ed9e9d1f31bf";
+        String[] scopes = { "FirstScope", "SecondScope" };
+
+        context.turnOffAuthorisationSystem();
+
+        Item profileItem = createProfile(user);
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.getAccessToken(code)).thenReturn(buildOrcidTokenResponse(orcid, accessToken, scopes));
+
+        getClient(getAuthToken(anotherUser.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", user.getID().toString())
+                .content(getPatchContent(asList(new AddOperation("/orcid", code))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isForbidden());
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+        profileItem = context.reloadEntity(profileItem);
+        assertThat(profileItem, notNullValue());
+        assertThat(profileItem.getMetadata(), not(hasItem(with("person.identifier.orcid", orcid))));
+        assertThat(profileItem.getMetadata(), not(hasItem(with("dspace.orcid.scope", scopes[0], 0))));
+        assertThat(profileItem.getMetadata(), not(hasItem(with("dspace.orcid.scope", scopes[1], 1))));
+
+        assertThat(getOrcidAccessToken(profileItem), nullValue());
+    }
+
+    @Test
+    public void testLinkProfileWithEPersonWithoutProfile() throws Exception {
+
+        String code = "123456";
+        String orcid = "0000-0000-1111-2222";
+        String accessToken = "c41e37e5-c2de-4177-91d6-ed9e9d1f31bf";
+        String[] scopes = { "FirstScope", "SecondScope" };
+
+        when(orcidClientMock.getAccessToken(code)).thenReturn(buildOrcidTokenResponse(orcid, accessToken, scopes));
+
+        getClient(getAuthToken(user.getEmail(), password))
+            .perform(patch("/api/eperson/profiles/{id}", user.getID().toString())
+                .content(getPatchContent(asList(new AddOperation("/orcid", code))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isNotFound());
+
+        verifyNoMoreInteractions(orcidClientMock);
+    }
+
+    private Item createProfile(EPerson ePerson) throws Exception {
+
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+
+        AtomicReference<UUID> ePersonIdRef = new AtomicReference<UUID>();
+        AtomicReference<UUID> itemIdRef = new AtomicReference<UUID>();
+
+        getClient(authToken).perform(post("/api/eperson/profiles/")
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isCreated())
+                            .andDo(result -> ePersonIdRef.set(fromString(read(result.getResponse().getContentAsString(),
+                                                                              "$.id"))));
+
+        getClient(authToken).perform(get("/api/eperson/profiles/{id}/item", ePersonIdRef.get())
+                                         .contentType(MediaType.APPLICATION_JSON_VALUE))
+                            .andExpect(status().isOk())
+                            .andDo(result -> itemIdRef.set(fromString(read(result.getResponse().getContentAsString(),
+                                                                           "$.id"))));
+
+        return itemService.find(context, itemIdRef.get());
+    }
+
+    private String getItemIdByProfileId(String token, String id) throws SQLException, Exception {
+        MvcResult result = getClient(token).perform(get("/api/eperson/profiles/{id}/item", id))
+                                           .andExpect(status().isOk())
+                                           .andReturn();
+
+        return readAttributeFromResponse(result, "$.id");
+    }
+
+    private String getOrcidAccessToken(Item item) {
+        OrcidToken orcidToken = orcidTokenService.findByProfileItem(context, item);
+        return orcidToken != null ? orcidToken.getAccessToken() : null;
+    }
+
+    private List<MetadataValue> getMetadataValues(Item item, String metadataField) {
+        return itemService.getMetadataByMetadataString(item, metadataField);
+    }
+
+    private Collection createCollection(String name, String entityType) throws SQLException {
+        return CollectionBuilder.createCollection(context, context.reloadEntity(parentCommunity))
+            .withName(name)
+            .withEntityType(entityType)
+            .build();
+    }
+
+    private Item createPublication(Collection collection, String title, Item author,
+        RelationshipType isAuthorOfPublication) {
+
+        Item publication = ItemBuilder.createItem(context, collection)
+            .withTitle(title)
+            .withAuthor(author.getName())
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, author, publication, isAuthorOfPublication).build();
+
+        return publication;
+
+    }
+
+    private Item createOrgUnit(Collection collection, String title, Item person,
+        RelationshipType isOrgUnitOfPerson) {
+
+        Item orgUnit = ItemBuilder.createItem(context, collection)
+            .withTitle(title)
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, person, orgUnit, isOrgUnitOfPerson).build();
+
+        return orgUnit;
+
+    }
+
+    private Item createProject(Collection collection, String title, Item person,
+        RelationshipType isProjectOfPerson) {
+
+        Item project = ItemBuilder.createItem(context, collection)
+            .withTitle(title)
+            .build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, project, person, isProjectOfPerson).build();
+
+        return project;
+
+    }
+
+    private Predicate<OrcidQueue> orcidQueueRecordWithEntity(Item entity) {
+        return orcidQueue -> entity.equals(orcidQueue.getEntity());
+    }
+
+    private <T> T readAttributeFromResponse(MvcResult result, String attribute) throws UnsupportedEncodingException {
+        return JsonPath.read(result.getResponse().getContentAsString(), attribute);
+    }
+
+    private OrcidTokenResponseDTO buildOrcidTokenResponse(String orcid, String accessToken, String[] scopes) {
+        OrcidTokenResponseDTO token = new OrcidTokenResponseDTO();
+        token.setAccessToken(accessToken);
+        token.setOrcid(orcid);
+        token.setTokenType("Bearer");
+        token.setName("Test User");
+        token.setScope(String.join(" ", scopes));
+        return token;
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java
index 5b3b70a70d..0283460711 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java
@@ -11,10 +11,13 @@ import static com.jayway.jsonpath.JsonPath.read;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
+import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE;
+import static org.springframework.http.MediaType.parseMediaType;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -29,6 +32,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.matcher.ResourcePolicyMatcher;
 import org.dspace.app.rest.model.ResourcePolicyRest;
 import org.dspace.app.rest.model.patch.AddOperation;
@@ -1223,7 +1227,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
     }
 
     @Test
-    public void patchReplaceStartDataTest() throws Exception {
+    public void patchReplaceStartDateTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
         EPerson eperson1 = EPersonBuilder.createEPerson(context)
@@ -1293,7 +1297,77 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
     }
 
     @Test
-    public void patchAddStartDataTest() throws Exception {
+    public void patchReplaceEndDateTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson eperson1 = EPersonBuilder.createEPerson(context)
+                                         .withEmail("eperson1@mail.com")
+                                         .withPassword("qwerty01")
+                                         .build();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+                                                 .withAdminGroup(eperson1)
+                                                 .build();
+
+        Item publicItem1 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item")
+                                      .build();
+
+        Calendar calendar = Calendar.getInstance();
+
+        calendar.set(Calendar.YEAR, 2019);
+        calendar.set(Calendar.MONTH, 9);
+        calendar.set(Calendar.DATE, 31);
+
+        Date date = calendar.getTime();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(publicItem1)
+            .withGroup(EPersonServiceFactory.getInstance().getGroupService().findByName(context, Group.ANONYMOUS))
+            .withEndDate(date)
+            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        Calendar newCalendar = Calendar.getInstance();
+        SimpleDateFormat formatDate = new SimpleDateFormat("yyyy-MM-dd");
+
+        newCalendar.set(Calendar.YEAR, 2020);
+        newCalendar.set(Calendar.MONTH, 0);
+        newCalendar.set(Calendar.DATE, 1);
+
+        Date newDate = newCalendar.getTime();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/endDate", formatDate.format(newDate));
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson1.getEmail(), "qwerty01");
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+                                         .content(patchBody)
+                                         .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.name", is(resourcePolicy.getRpName())),
+                                hasJsonPath("$.description", is(resourcePolicy.getRpDescription())),
+                                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])),
+                                hasJsonPath("$.endDate", is(formatDate.format(newDate))),
+                                hasJsonPath("$.startDate", is(resourcePolicy.getStartDate())))));
+
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])),
+                                hasJsonPath("$.endDate", is(formatDate.format(newDate))))));
+    }
+
+    @Test
+    public void patchAddStartDateTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
         EPerson eperson1 = EPersonBuilder.createEPerson(context)
@@ -1354,7 +1428,66 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
     }
 
     @Test
-    public void patchRemoveStartDataTest() throws Exception {
+    public void patchAddEndDateTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson eperson1 = EPersonBuilder.createEPerson(context)
+                                         .withEmail("eperson1@mail.com")
+                                         .withPassword("qwerty01")
+                                         .build();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+                                                 .withAdminGroup(eperson1)
+                                                 .build();
+
+        Item publicItem1 = ItemBuilder.createItem(context, collection)
+                                      .withTitle("Public item")
+                                      .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+                                                             .withAction(Constants.READ)
+                                                             .withDspaceObject(publicItem1)
+                                                             .withGroup(
+                                                                 EPersonServiceFactory.getInstance().getGroupService()
+                                                                                      .findByName(context,
+                                                                                          Group.ANONYMOUS))
+                                                             .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+                                                             .build();
+
+        context.restoreAuthSystemState();
+
+        Calendar newCalendar = Calendar.getInstance();
+        SimpleDateFormat formatDate = new SimpleDateFormat("yyyy-MM-dd");
+        Date newDate = new Date();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation addOperation = new AddOperation("/endDate", formatDate.format(newDate));
+        ops.add(addOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson1.getEmail(), "qwerty01");
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.name", is(resourcePolicy.getRpName())),
+                                hasJsonPath("$.description", is(resourcePolicy.getRpDescription())),
+                                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])),
+                                hasJsonPath("$.startDate", is(resourcePolicy.getStartDate())),
+                                hasJsonPath("$.endDate", is(formatDate.format(newDate))))));
+
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])),
+                                hasJsonPath("$.endDate", is(formatDate.format(newDate))))));
+    }
+
+    @Test
+    public void patchRemoveStartDateTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
         EPerson eperson1 = EPersonBuilder.createEPerson(context)
@@ -1475,7 +1608,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
     }
 
     @Test
-    public void patchReplaceStartDataUnAuthenticatedTest() throws Exception {
+    public void patchReplaceStartDateUnAuthenticatedTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
         Community community = CommunityBuilder.createCommunity(context).build();
@@ -1530,7 +1663,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
     }
 
     @Test
-    public void patchReplaceStartDataForbiddenTest() throws Exception {
+    public void patchReplaceStartDateForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
         EPerson eperson1 = EPersonBuilder.createEPerson(context)
@@ -1626,7 +1759,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
     }
 
     @Test
-    public void patchReplaceEndDateBeforeStartDataTest() throws Exception {
+    public void patchReplaceEndDateBeforeStartDateTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
         EPerson eperson1 = EPersonBuilder.createEPerson(context)
@@ -2143,6 +2276,474 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
                 hasJsonPath("$.name", is(name)))));
     }
 
+    @Test
+    public void patchAddActionTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+            .withAdminGroup(eperson)
+            .build();
+
+        Item myItem = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(myItem)
+            .withUser(eperson)
+            .withName("My Name")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        //Patch with a write action
+        String action = Constants.actionText[1];
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation addOperation = new AddOperation("/action", action);
+        ops.add(addOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(action)))));
+
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(action)))));
+    }
+
+    @Test
+    public void patchReplaceActionTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+            .withAdminGroup(eperson)
+            .build();
+
+        Item myItem = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(myItem)
+            .withUser(eperson)
+            .withName("My name")
+            .withPolicyType(ResourcePolicy.TYPE_SUBMISSION)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String newAction = Constants.actionText[1];
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/action", newAction);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(newAction)))));
+
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(newAction)))));
+    }
+
+    @Test
+    public void patchReplaceActionUnauthenticatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+
+        Item item = ItemBuilder.createItem(context, collection).build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.WRITE)
+            .withDspaceObject(item)
+            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        int newAction = Constants.ADD;
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/action", newAction);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        getClient().perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isUnauthorized());
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])))));
+    }
+
+    @Test
+    public void patchReplaceActionForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(item)
+            .withUser(eperson)
+            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        int newAction = Constants.WRITE;
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/action", newAction);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void patchReplaceActionNotFoundTest() throws Exception {
+        int action = Constants.WRITE;
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/policyType", action);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + Integer.MAX_VALUE)
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void patchReplaceActionUnprocessableEntityTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+            .withAdminGroup(eperson)
+            .build();
+
+        Item publicItem1 = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(publicItem1)
+            .withUser(eperson)
+            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        int newAction = -1;
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/action", newAction);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void patchAddPolicyTypeTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+            .withAdminGroup(eperson)
+            .build();
+
+        Item myItem = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(myItem)
+            .withUser(eperson)
+            .withName("My Name")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String policyType = ResourcePolicy.TYPE_CUSTOM;
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation addOperation = new AddOperation("/policyType", policyType);
+        ops.add(addOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.policyType", is(policyType)),
+                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])))));
+
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])),
+                hasJsonPath("$.policyType", is(policyType)))));
+    }
+
+    @Test
+    public void patchRemovePolicyTypeTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+            .withAdminGroup(eperson)
+            .build();
+
+        Item myItem = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(myItem)
+            .withUser(eperson)
+            .withName("My Name")
+            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        RemoveOperation removeOperation = new RemoveOperation("/policyType");
+        ops.add(removeOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])))))
+            .andExpect(jsonPath("$.policyType").doesNotExist());
+
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])))))
+            .andExpect(jsonPath("$.policyType").doesNotExist());
+    }
+
+    @Test
+    public void patchReplacePolicyTypeTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+            .withAdminGroup(eperson)
+            .build();
+
+        Item myItem = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(myItem)
+            .withUser(eperson)
+            .withName("My name")
+            .withPolicyType(ResourcePolicy.TYPE_SUBMISSION)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String newPolicyType = ResourcePolicy.TYPE_CUSTOM;
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/policyType", newPolicyType);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.policyType", is(newPolicyType)),
+                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])))));
+
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])),
+                hasJsonPath("$.policyType", is(newPolicyType)))));
+    }
+
+    @Test
+    public void patchReplacePolicyTypeUnauthenticatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+
+        Item item = ItemBuilder.createItem(context, collection).build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.WRITE)
+            .withDspaceObject(item)
+            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String newPolicyType = ResourcePolicy.TYPE_SUBMISSION;
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/policyType", newPolicyType);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        getClient().perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isUnauthorized());
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", Matchers.allOf(
+                hasJsonPath("$.action", is(Constants.actionText[resourcePolicy.getAction()])),
+                hasJsonPath("$.policyType", is(resourcePolicy.getRpType())))));
+    }
+
+    @Test
+    public void patchReplacePolicyTypeForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(item)
+            .withUser(eperson)
+            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String newPolicyType = ResourcePolicy.TYPE_SUBMISSION;
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/policyType", newPolicyType);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void patchRemovePolicyTypeNotFoundTest() throws Exception {
+        List<Operation> ops = new ArrayList<Operation>();
+        RemoveOperation removeOperation = new RemoveOperation("/policyType");
+        ops.add(removeOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + Integer.MAX_VALUE)
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void patchReplacePolicyTypeBadRequestTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+            .withAdminGroup(eperson)
+            .build();
+
+        Item publicItem1 = ItemBuilder.createItem(context, collection)
+            .withTitle("Public item")
+            .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+            .withAction(Constants.READ)
+            .withDspaceObject(publicItem1)
+            .withUser(eperson)
+            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String newPolicyType = "";
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation replaceOperation = new ReplaceOperation("/policyType", newPolicyType);
+        ops.add(replaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(patch("/api/authz/resourcepolicies/" + resourcePolicy.getID())
+            .content(patchBody)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
     @Test
     public void patchAddNameBadRequestTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -2594,4 +3195,495 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
                              .andExpect(jsonPath("$._links.resource.href", Matchers.allOf(
                                         Matchers.containsString("/api/authz/resourcepolicies/search/resource"))));
     }
+
+    @Test
+    public void patchReplaceEPersonAdminTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson newEPerson = EPersonBuilder.createEPerson(context)
+                                           .withEmail("newEPerson@mail.com")
+                                           .withPassword(password)
+                                           .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection 1")
+                                          .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+                                            .withAction(Constants.ADD)
+                                            .withDspaceObject(col)
+                                            .withUser(eperson)
+                                            .withDescription("My Description")
+                                            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+                                            .build();
+
+        context.restoreAuthSystemState();
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+
+        // verify origin resourcepolicy
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.eperson.id", is(eperson.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.group", nullValue()));
+
+        // update eperson of the resourcePolicy
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/eperson")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/epersons/" + newEPerson.getID()))
+                             .andExpect(status().isNoContent());
+
+        // verify that the resourcePolicy is related to new eperson
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.eperson.id", is(newEPerson.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.group", nullValue()));
+    }
+
+    @Test
+    public void patchReplaceEPersonForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson newEPerson = EPersonBuilder.createEPerson(context)
+                                           .withEmail("newEPerson@mail.com")
+                                           .withPassword(password)
+                                           .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection 1")
+                                          .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+                                            .withAction(Constants.ADD)
+                                            .withDspaceObject(col)
+                                            .withUser(eperson)
+                                            .withDescription("My Description")
+                                            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+                                            .build();
+
+        context.restoreAuthSystemState();
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        String tokenEPerson = getAuthToken(eperson.getEmail(), password);
+
+        // verify origin resourcepolicy
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.eperson.id", is(eperson.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.group", nullValue()));
+
+        // try to update eperson of resourcepolicy with normal user
+        getClient(tokenEPerson).perform(put("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/eperson")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/epersons/" + newEPerson.getID()))
+                             .andExpect(status().isForbidden());
+
+        // verify that resourcepolicy hasn't been changed
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.eperson.id", is(eperson.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.group", nullValue()));
+    }
+
+    @Test
+    public void patchReplaceEPersonUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson newEPerson = EPersonBuilder.createEPerson(context)
+                                           .withEmail("newEPerson@mail.com")
+                                           .withPassword(password)
+                                           .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection 1")
+                                          .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+                                            .withAction(Constants.ADD)
+                                            .withDspaceObject(col)
+                                            .withUser(eperson)
+                                            .withDescription("My Description")
+                                            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+                                            .build();
+
+        context.restoreAuthSystemState();
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+
+        // verify origin resourcepolicy
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.eperson.id", is(eperson.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.group", nullValue()));
+
+        // try to update eperson of resourcepolicy with anonymous user
+        getClient().perform(put("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/eperson")
+                   .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                   .content("/api/eperson/epersons/" + newEPerson.getID()))
+                   .andExpect(status().isUnauthorized());
+
+        // verify that resourcepolicy hasn't been changed
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.eperson.id", is(eperson.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.group", nullValue()));
+    }
+
+    @Test
+    public void patchReplaceGroupAdminTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group originGroup = GroupBuilder.createGroup(context)
+                                        .withName("origin Test Group")
+                                        .build();
+
+        Group newGroup = GroupBuilder.createGroup(context)
+                                     .withName("testGroupName")
+                                     .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection 1")
+                                          .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+                                            .withAction(Constants.ADD)
+                                            .withDspaceObject(col)
+                                            .withGroup(originGroup)
+                                            .withDescription("My Description")
+                                            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+                                            .build();
+
+        context.restoreAuthSystemState();
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+
+        // verify origin resourcepolicy
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.group.id", is(originGroup.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.eperson", nullValue()));
+
+        // update group of the resourcePolicy
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/group")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/groups/" + newGroup.getID()))
+                             .andExpect(status().isNoContent());
+
+        // verify that the resourcePolicy is related to new group
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.group.id", is(newGroup.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.eperson", nullValue()));
+    }
+
+    @Test
+    public void patchReplaceGroupForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group originGroup = GroupBuilder.createGroup(context)
+                                        .withName("origin Test Group")
+                                        .build();
+
+        Group newGroup = GroupBuilder.createGroup(context)
+                                     .withName("testGroupName")
+                                     .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection 1")
+                                          .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+                                            .withAction(Constants.ADD)
+                                            .withDspaceObject(col)
+                                            .withGroup(originGroup)
+                                            .withDescription("My Description")
+                                            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+                                            .build();
+
+        context.restoreAuthSystemState();
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        String tokenEPerson = getAuthToken(eperson.getEmail(), password);
+
+        // verify origin resourcepolicy
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.group.id", is(originGroup.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.eperson", nullValue()));
+
+        // try to update group of resourcepolicy with normal user
+        getClient(tokenEPerson).perform(put("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/group")
+                               .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                               .content("/api/eperson/groups/" + newGroup.getID()))
+                               .andExpect(status().isForbidden());
+
+        // verify that resourcepolicy hasn't been changed
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.group.id", is(originGroup.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.eperson", nullValue()));
+    }
+
+    @Test
+    public void patchReplaceGroupUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group originGroup = GroupBuilder.createGroup(context)
+                                        .withName("origin Test Group")
+                                        .build();
+
+        Group newGroup = GroupBuilder.createGroup(context)
+                                     .withName("testGroupName")
+                                     .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection 1")
+                                          .build();
+
+        ResourcePolicy resourcePolicy = ResourcePolicyBuilder.createResourcePolicy(context)
+                                            .withAction(Constants.ADD)
+                                            .withDspaceObject(col)
+                                            .withGroup(originGroup)
+                                            .withDescription("My Description")
+                                            .withPolicyType(ResourcePolicy.TYPE_CUSTOM)
+                                            .build();
+
+        context.restoreAuthSystemState();
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+
+        // verify origin resourcepolicy
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.group.id", is(originGroup.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.eperson", nullValue()));
+
+        // try to update group of resourcepolicy with anonymous user
+        getClient().perform(put("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/group")
+                   .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                   .content("/api/eperson/groups/" + newGroup.getID()))
+                   .andExpect(status().isUnauthorized());
+
+        // verify that resourcepolicy hasn't been changed
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/" + resourcePolicy.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.group.id", is(originGroup.getID().toString())))
+                             .andExpect(jsonPath("$._embedded.eperson", nullValue()));
+    }
+
+    @Test
+    public void updateResourcePolicyOfEPersonToGroupTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group group = GroupBuilder.createGroup(context)
+                                  .withName("My group")
+                                  .build();
+
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("My community")
+                                              .build();
+
+        ResourcePolicy resourcePolicyOfEPerson = ResourcePolicyBuilder.createResourcePolicy(context)
+                                                             .withDspaceObject(community)
+                                                             .withAction(Constants.READ)
+                                                             .withUser(eperson)
+                                                             .build();
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/authz/resourcepolicies/" + resourcePolicyOfEPerson.getID()))
+                       .andExpect(status().isOk())
+                       .andExpect(content().contentType(contentType))
+                       .andExpect(jsonPath("$", is(ResourcePolicyMatcher.matchResourcePolicy(resourcePolicyOfEPerson))))
+                       .andExpect(jsonPath("$._links.self.href", Matchers.containsString("/api/authz/resourcepolicies/"
+                                            + resourcePolicyOfEPerson.getID())));
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicyOfEPerson.getID() + "/group")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/groups/" + group.getID()))
+                             .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void updateResourcePolicyOfGroupToEPersonTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Group group = GroupBuilder.createGroup(context)
+                                  .withName("My group")
+                                  .build();
+
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("My community")
+                                              .build();
+
+        ResourcePolicy resourcePolicyOfGroup = ResourcePolicyBuilder.createResourcePolicy(context)
+                                                                    .withDspaceObject(community)
+                                                                    .withAction(Constants.ADD)
+                                                                    .withGroup(group).build();
+
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/search/group")
+                 .param("uuid", group.getID().toString()))
+                 .andExpect(status().isOk())
+                 .andExpect(content().contentType(contentType))
+                 .andExpect(jsonPath("$._embedded.resourcepolicies", Matchers.containsInAnyOrder(
+                            ResourcePolicyMatcher.matchResourcePolicy(resourcePolicyOfGroup))))
+                 .andExpect(jsonPath("$._links.self.href", Matchers.containsString(
+                                     "api/authz/resourcepolicies/search/group")))
+                 .andExpect(jsonPath("$.page.totalElements", is(1)));
+
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/eperson")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/epersons/" + eperson.getID()))
+                             .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void updateEPersonOfNotExistingResourcePolicyTest() throws Exception {
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + Integer.MAX_VALUE + "/eperson")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/epersons/" + eperson.getID()))
+                             .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void updateGroupOfNotExistingResourcePolicyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group group = GroupBuilder.createGroup(context)
+                                  .withName("My group")
+                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + Integer.MAX_VALUE + "/group")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/groups/" + group.getID()))
+                             .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void updateResourcePolicyOfGroupWithEmptyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group group = GroupBuilder.createGroup(context)
+                                  .withName("My group")
+                                  .build();
+
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("My community")
+                                              .build();
+
+
+        ResourcePolicy resourcePolicyOfGroup = ResourcePolicyBuilder.createResourcePolicy(context)
+                                                                    .withDspaceObject(community)
+                                                                    .withAction(Constants.ADD)
+                                                                    .withGroup(group).build();
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/group")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content(StringUtils.EMPTY))
+                             .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void updateResourcePolicyOfGroupWithMultipleGroupsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group group1 = GroupBuilder.createGroup(context).withName("My group").build();
+        Group group2 = GroupBuilder.createGroup(context).withName("My group2").build();
+
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("My community")
+                                              .build();
+
+        ResourcePolicy resourcePolicyOfGroup = ResourcePolicyBuilder.createResourcePolicy(context)
+                                                                    .withDspaceObject(community)
+                                                                    .withAction(Constants.ADD)
+                                                                    .withGroup(group1).build();
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/group")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/groups/" + group1.getID() +
+                                      "\n/api/eperson/groups/" + group2.getID()))
+                             .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void updateResourcePolicyOfEPersonWithEmptyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).withName("My community").build();
+
+        ResourcePolicy rpOfEPerson = ResourcePolicyBuilder.createResourcePolicy(context)
+                                                          .withDspaceObject(community)
+                                                          .withAction(Constants.READ)
+                                                          .withUser(eperson)
+                                                          .build();
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + rpOfEPerson.getID() + "/eperson")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content(StringUtils.EMPTY))
+                             .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void updateResourcePolicyOfEPersonWithMultipleEPersonsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson eperson1 = EPersonBuilder.createEPerson(context)
+                                         .withEmail("eperson1@mail.com")
+                                         .withPassword(password)
+                                         .build();
+        EPerson eperson2 = EPersonBuilder.createEPerson(context)
+                                         .withEmail("eperson2@mail.com")
+                                         .withPassword(password)
+                                         .build();
+
+        Community community = CommunityBuilder.createCommunity(context).withName("My community").build();
+
+        ResourcePolicy rpOfEPerson = ResourcePolicyBuilder.createResourcePolicy(context)
+                                                          .withDspaceObject(community)
+                                                          .withAction(Constants.READ)
+                                                          .withUser(eperson)
+                                                          .build();
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + rpOfEPerson.getID() + "/eperson")
+                             .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                             .content("/api/eperson/epersons/" + eperson1.getID() +
+                                      "\n/api/eperson/epersons/" + eperson2.getID()))
+                             .andExpect(status().isUnprocessableEntity());
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScieloImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScieloImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..aafc75a065
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScieloImportMetadataSourceServiceIT.java
@@ -0,0 +1,236 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.dspace.importer.external.scielo.service.ScieloImportMetadataSourceServiceImpl;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link ScieloImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class ScieloImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private LiveImportClientImpl liveImportClientImpl;
+
+    @Autowired
+    private ScieloImportMetadataSourceServiceImpl scieloServiceImpl;
+
+    @Test
+    public void scieloImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream scieloResp = getClass().getResourceAsStream("scielo-test.txt")) {
+
+            String scieloRipResp = IOUtils.toString(scieloResp, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(scieloRipResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = scieloServiceImpl.getRecords("test query", 0, 2);
+            assertEquals(2, recordsImported.size());
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void scieloImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream file = getClass().getResourceAsStream("scielo-test.txt")) {
+            String scieloResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(scieloResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = scieloServiceImpl.getRecordsCount("test query");
+            assertEquals(2, tot);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test(expected = MethodNotFoundException.class)
+    public void scieloImportMetadataFindMatchingRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        org.dspace.content.Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                                              .withName("Collection 1")
+                                                              .build();
+
+        Item testItem = ItemBuilder.createItem(context, col1)
+                                   .withTitle("test item")
+                                   .withIssueDate("2021")
+                                   .build();
+        context.restoreAuthSystemState();
+        scieloServiceImpl.findMatchingRecords(testItem);
+    }
+
+    @Test(expected = MethodNotFoundException.class)
+    public void scieloImportMetadataGetRecordsCountByQueryTest() throws Exception {
+        Query q = new Query();
+        q.addParameter("query", "test query");
+        scieloServiceImpl.getRecordsCount(q);
+    }
+
+    @Test
+    public void scieloImportMetadataGetRecordsByIdTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream scieloResp = getClass().getResourceAsStream("scielo-single-record.txt")) {
+
+            String scieloRipResp = IOUtils.toString(scieloResp, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(scieloRipResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            collection2match.remove(1);
+            ImportRecord record = scieloServiceImpl.getRecord("S0185-30582021000200231-mex");
+            assertNotNull(record);
+            Collection<ImportRecord> recordsImported = Arrays.asList(record);
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        //define first record
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO ispartof = createMetadatumDTO("dc", "relation", "ispartof", "Nova tellus");
+        MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2021");
+        MetadatumDTO citation = createMetadatumDTO("oaire", "citation", "issue", "2");
+        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", "doi", "10.19130/iifl.nt.2021.39.2.901");
+        MetadatumDTO endPage = createMetadatumDTO("oaire", "citation", "endPage", "236");
+        MetadatumDTO subject = createMetadatumDTO("dc", "subject", null, "Roma");
+        MetadatumDTO subject2 = createMetadatumDTO("dc", "subject", null, "Historia");
+        MetadatumDTO subject3 = createMetadatumDTO("dc", "subject", null, "ritos funerarios");
+        MetadatumDTO subject4 = createMetadatumDTO("dc", "subject", null, "inframundo");
+        MetadatumDTO subject5 = createMetadatumDTO("dc", "subject", null, "epitafios");
+        MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "Torres Marzo, Ricardo");
+        MetadatumDTO title = createMetadatumDTO("dc", "title", null, "Requena Jiménez, Miguel, Los espacios"
+                                       + " de la muerte en Roma, Madrid, Síntesis, 2021, 365 págs."
+                                       + " más bibliografía en línea, ISBN 978-84-135759-6-4.");
+        MetadatumDTO volume = createMetadatumDTO("oaire", "citation", "volume", "39");
+        MetadatumDTO issn = createMetadatumDTO("dc", "identifier", "issn", "0185-3058");
+        MetadatumDTO other = createMetadatumDTO("dc", "identifier", "other", "S0185-30582021000200231-mex");
+        MetadatumDTO startPage = createMetadatumDTO("oaire", "citation", "startPage", "231");
+
+        metadatums.add(ispartof);
+        metadatums.add(date);
+        metadatums.add(citation);
+        metadatums.add(doi);
+        metadatums.add(endPage);
+        metadatums.add(subject);
+        metadatums.add(subject2);
+        metadatums.add(subject3);
+        metadatums.add(subject4);
+        metadatums.add(subject5);
+        metadatums.add(author);
+        metadatums.add(title);
+        metadatums.add(volume);
+        metadatums.add(issn);
+        metadatums.add(other);
+        metadatums.add(startPage);
+
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO ispartof2 = createMetadatumDTO("dc", "relation", "ispartof", "Revista de Derecho Privado");
+        MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2021");
+        MetadatumDTO citation2 = createMetadatumDTO("oaire", "citation", "issue", "41");
+        MetadatumDTO doi2 = createMetadatumDTO("dc", "identifier", "doi", "10.18601/01234366.n41.14");
+        MetadatumDTO endPage2 = createMetadatumDTO("oaire", "citation", "endPage", "418");
+        MetadatumDTO subject6 = createMetadatumDTO("dc", "subject", null, "sopravvenienza contrattuale");
+        MetadatumDTO subject7 = createMetadatumDTO("dc", "subject", null, "covro");
+        MetadatumDTO subject8 = createMetadatumDTO("dc", "subject", null, "buona fede in senso oggettivo");
+        MetadatumDTO subject9 = createMetadatumDTO("dc", "subject", null, "obbligo di rinegoziare");
+        MetadatumDTO subject10 = createMetadatumDTO("dc", "subject", null, "revisione del contratto");
+        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "MAGRI, GEO");
+        MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
+                "Rinegoziazione e revisione del contratto. Tribunale di Roma, Sez. VI, 27 agosto 2020");
+        MetadatumDTO issn2 = createMetadatumDTO("dc", "identifier", "issn", "0123-4366");
+        MetadatumDTO other2 = createMetadatumDTO("dc", "identifier", "other", "S0123-43662021000200397-col");
+        MetadatumDTO startPage2 = createMetadatumDTO("oaire", "citation", "startPage", "397");
+        MetadatumDTO description = createMetadatumDTO("dc", "description", "abstract",
+                "ABSTRACT: The Tribunal of Rome imposes an obligation to renegotiate long-term contracts,"
+              + " the balance of which has been modified by the covro pandemic. The decision establishes a"
+              + " general obligation for the parties to execute the contract in good faith and gives the judge"
+              + " the possibility of a judicial review. This is a long-awaited decision in doctrine which complies"
+              + " with the indications of the Supreme Court of Cassation expressed in its memorandum 56/2020.");
+
+        metadatums2.add(ispartof2);
+        metadatums2.add(date2);
+        metadatums2.add(citation2);
+        metadatums2.add(doi2);
+        metadatums2.add(endPage2);
+        metadatums2.add(subject6);
+        metadatums2.add(subject7);
+        metadatums2.add(subject8);
+        metadatums2.add(subject9);
+        metadatums2.add(subject10);
+        metadatums2.add(author2);
+        metadatums2.add(title2);
+        metadatums2.add(issn2);
+        metadatums2.add(other2);
+        metadatums2.add(startPage2);
+        metadatums2.add(description);
+
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..b9310e3adb
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java
@@ -0,0 +1,232 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.dspace.importer.external.scopus.service.ScopusImportMetadataSourceServiceImpl;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link ScopusImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class ScopusImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private ScopusImportMetadataSourceServiceImpl scopusServiceImpl;
+
+    @Autowired
+    private LiveImportClientImpl liveImportClientImpl;
+
+    @Test
+    public void scopusImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        String originApiKey = scopusServiceImpl.getApiKey();
+        if (StringUtils.isBlank(originApiKey)) {
+            scopusServiceImpl.setApiKey("testApiKey");
+        }
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream file = getClass().getResourceAsStream("scopus-ex.xml")) {
+            String scopusXmlResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(scopusXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = scopusServiceImpl.getRecords("roma", 0, 2);
+            assertEquals(2, recordsImported.size());
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+            scopusServiceImpl.setApiKey(originApiKey);
+        }
+    }
+
+    @Test
+    public void scopusImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        String originApiKey = scopusServiceImpl.getApiKey();
+        if (StringUtils.isBlank(originApiKey)) {
+            scopusServiceImpl.setApiKey("testApiKey");
+        }
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream file = getClass().getResourceAsStream("scopus-ex.xml")) {
+            String scopusXmlResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(scopusXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = scopusServiceImpl.getRecordsCount("roma");
+            assertEquals(2, tot);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+            scopusServiceImpl.setApiKey(originApiKey);
+        }
+    }
+
+    @Test
+    public void scopusImportMetadataGetRecordsEmptyResponceTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        String originApiKey = scopusServiceImpl.getApiKey();
+        if (StringUtils.isBlank(originApiKey)) {
+            scopusServiceImpl.setApiKey("testApiKey");
+        }
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream file = getClass().getResourceAsStream("scopus-empty-resp.xml")) {
+            String scopusXmlResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(scopusXmlResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            Collection<ImportRecord> recordsImported = scopusServiceImpl.getRecords("roma", 0, 20);
+            ImportRecord  importedRecord = recordsImported.iterator().next();
+            assertTrue(importedRecord.getValueList().isEmpty());
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+            scopusServiceImpl.setApiKey(originApiKey);
+        }
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        //define first record
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", null, "10.3934/mine.2023004");
+        MetadatumDTO title = createMetadatumDTO("dc","title", null,
+                "Hardy potential versus lower order terms in Dirichlet problems: regularizing effects<sup>†</sup>");
+        MetadatumDTO type = createMetadatumDTO("dc", "type", null, "Journal");
+        MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2023-01-01");
+        MetadatumDTO scopusId = createMetadatumDTO("dc", "identifier", "other", "2-s2.0-85124241875");
+        MetadatumDTO citationVolume = createMetadatumDTO("oaire", "citation", "volume", "5");
+        MetadatumDTO citationIssue = createMetadatumDTO("oaire", "citation", "issue", "1");
+        MetadatumDTO subject = createMetadatumDTO("dc", "subject", null,
+                                                  "Hardy potentials | Laplace equation | Summability of solutions");
+        MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "Arcoya D.");
+        MetadatumDTO scopusAuthorId = createMetadatumDTO("person", "identifier", "scopus-author-id", "6602330574");
+        MetadatumDTO orgunit = createMetadatumDTO("person", "affiliation", "name", "Universidad de Granada");
+        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "Boccardo L.");
+        MetadatumDTO scopusAuthorId2 = createMetadatumDTO("person", "identifier", "scopus-author-id", "7003612261");
+        MetadatumDTO orgunit2 = createMetadatumDTO("person", "affiliation", "name","Sapienza Università di Roma");
+        MetadatumDTO author3 = createMetadatumDTO("dc", "contributor", "author", "Orsina L.");
+        MetadatumDTO scopusAuthorId3 = createMetadatumDTO("person", "identifier", "scopus-author-id", "6602595438");
+        MetadatumDTO orgunit3 = createMetadatumDTO("person", "affiliation", "name","Sapienza Università di Roma");
+        MetadatumDTO rights = createMetadatumDTO("dc", "rights", null, "true");
+        MetadatumDTO ispartof = createMetadatumDTO("dc", "relation", "ispartof", "Mathematics In Engineering");
+        MetadatumDTO ispartofseries = createMetadatumDTO("dc","relation","ispartofseries","Mathematics In Engineering");
+
+        metadatums.add(doi);
+        metadatums.add(title);
+        metadatums.add(type);
+        metadatums.add(date);
+        metadatums.add(scopusId);
+        metadatums.add(citationVolume);
+        metadatums.add(citationIssue);
+        metadatums.add(subject);
+        metadatums.add(author);
+        metadatums.add(scopusAuthorId);
+        metadatums.add(orgunit);
+        metadatums.add(author2);
+        metadatums.add(scopusAuthorId2);
+        metadatums.add(orgunit2);
+        metadatums.add(author3);
+        metadatums.add(scopusAuthorId3);
+        metadatums.add(orgunit3);
+        metadatums.add(rights);
+        metadatums.add(ispartof);
+        metadatums.add(ispartofseries);
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO doi2 = createMetadatumDTO("dc", "identifier", null, "10.3934/mine.2023001");
+        MetadatumDTO title2 = createMetadatumDTO("dc","title", null,
+                "Large deviations for a binary collision model: energy evaporation<sup>†</sup>");
+        MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2023-01-01");
+        MetadatumDTO scopusId2 = createMetadatumDTO("dc", "identifier", "other", "2-s2.0-85124226483");
+        MetadatumDTO type2 = createMetadatumDTO("dc", "type", null, "Journal");
+        MetadatumDTO citationVolume2 = createMetadatumDTO("oaire", "citation", "volume", "5");
+        MetadatumDTO citationIssue2 = createMetadatumDTO("oaire", "citation", "issue", "1");
+
+        MetadatumDTO subject2 = createMetadatumDTO("dc", "subject", null,
+        "Boltzmann equation | Discrete energy model | Kac model | Large deviations | Violation of energy conservation");
+
+        MetadatumDTO author4 = createMetadatumDTO("dc", "contributor", "author", "Basile G.");
+        MetadatumDTO scopusAuthorId4 = createMetadatumDTO("person", "identifier", "scopus-author-id", "55613229065");
+        MetadatumDTO orgunit4 = createMetadatumDTO("person", "affiliation", "name","Sapienza Università di Roma");
+        MetadatumDTO author5 = createMetadatumDTO("dc", "contributor", "author", "Benedetto D.");
+        MetadatumDTO scopusAuthorId5 = createMetadatumDTO("person", "identifier", "scopus-author-id", "55893665100");
+        MetadatumDTO orgunit5 = createMetadatumDTO("person", "affiliation", "name","Sapienza Università di Roma");
+        MetadatumDTO author6 = createMetadatumDTO("dc", "contributor", "author", "Caglioti E.");
+        MetadatumDTO scopusAuthorId6 = createMetadatumDTO("person", "identifier", "scopus-author-id", "7004588675");
+        MetadatumDTO orgunit6 = createMetadatumDTO("person", "affiliation", "name","Sapienza Università di Roma");
+        MetadatumDTO author7 = createMetadatumDTO("dc", "contributor", "author", "Bertini L.");
+        MetadatumDTO scopusAuthorId7 = createMetadatumDTO("person", "identifier", "scopus-author-id", "7005555198");
+        MetadatumDTO orgunit7 = createMetadatumDTO("person", "affiliation", "name","Sapienza Università di Roma");
+        MetadatumDTO rights2 = createMetadatumDTO("dc", "rights", null, "true");
+        MetadatumDTO ispartof2 = createMetadatumDTO("dc", "relation", "ispartof", "Mathematics In Engineering");
+        MetadatumDTO ispartofseries2 = createMetadatumDTO("dc", "relation", "ispartofseries",
+                                                          "Mathematics In Engineering");
+        metadatums2.add(doi2);
+        metadatums2.add(title2);
+        metadatums2.add(type2);
+        metadatums2.add(date2);
+        metadatums2.add(scopusId2);
+        metadatums2.add(citationVolume2);
+        metadatums2.add(citationIssue2);
+        metadatums2.add(subject2);
+        metadatums2.add(author4);
+        metadatums2.add(scopusAuthorId4);
+        metadatums2.add(orgunit4);
+        metadatums2.add(author5);
+        metadatums2.add(scopusAuthorId5);
+        metadatums2.add(orgunit5);
+        metadatums2.add(author6);
+        metadatums2.add(scopusAuthorId6);
+        metadatums2.add(orgunit6);
+        metadatums2.add(author7);
+        metadatums2.add(scopusAuthorId7);
+        metadatums2.add(orgunit7);
+        metadatums2.add(rights2);
+        metadatums2.add(ispartof2);
+        metadatums2.add(ispartofseries2);
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScriptRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScriptRestRepositoryIT.java
index 9976fb4be1..0513a0d5f4 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScriptRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScriptRestRepositoryIT.java
@@ -8,12 +8,15 @@
 package org.dspace.app.rest;
 
 import static com.jayway.jsonpath.JsonPath.read;
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
+import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -28,7 +31,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.dspace.app.rest.converter.DSpaceRunnableParameterConverter;
 import org.dspace.app.rest.matcher.BitstreamMatcher;
@@ -40,6 +43,7 @@ import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.GroupBuilder;
 import org.dspace.builder.ItemBuilder;
 import org.dspace.builder.ProcessBuilder;
 import org.dspace.content.Bitstream;
@@ -48,10 +52,12 @@ import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.content.ProcessStatus;
 import org.dspace.content.service.BitstreamService;
+import org.dspace.eperson.Group;
 import org.dspace.scripts.DSpaceCommandLineParameter;
 import org.dspace.scripts.Process;
 import org.dspace.scripts.configuration.ScriptConfiguration;
 import org.dspace.scripts.service.ProcessService;
+import org.dspace.services.ConfigurationService;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
 import org.junit.After;
@@ -69,6 +75,9 @@ public class ScriptRestRepositoryIT extends AbstractControllerIntegrationTest {
     @Autowired
     private BitstreamService bitstreamService;
 
+    @Autowired
+    private ConfigurationService configurationService;
+
     @Autowired
     private List<ScriptConfiguration> scriptConfigurations;
 
@@ -211,29 +220,26 @@ public class ScriptRestRepositoryIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void postProcessNonAdminAuthorizeException() throws Exception {
-
         String token = getAuthToken(eperson.getEmail(), password);
 
-        getClient(token).perform(post("/api/system/scripts/mock-script/processes").contentType("multipart/form-data"))
+        getClient(token).perform(multipart("/api/system/scripts/mock-script/processes"))
                         .andExpect(status().isForbidden());
     }
 
     @Test
     public void postProcessAnonymousAuthorizeException() throws Exception {
-        getClient().perform(post("/api/system/scripts/mock-script/processes").contentType("multipart/form-data"))
+        getClient().perform(multipart("/api/system/scripts/mock-script/processes"))
                    .andExpect(status().isUnauthorized());
     }
 
     @Test
     public void postProcessAdminWrongOptionsException() throws Exception {
-
-
         String token = getAuthToken(admin.getEmail(), password);
         AtomicReference<Integer> idRef = new AtomicReference<>();
 
         try {
             getClient(token)
-                    .perform(post("/api/system/scripts/mock-script/processes").contentType("multipart/form-data"))
+                    .perform(multipart("/api/system/scripts/mock-script/processes"))
                     .andExpect(status().isAccepted())
                     .andExpect(jsonPath("$", is(
                             ProcessMatcher.matchProcess("mock-script",
@@ -277,9 +283,8 @@ public class ScriptRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         try {
             getClient(token)
-                    .perform(post("/api/system/scripts/mock-script/processes").contentType("multipart/form-data")
-                                                                              .param("properties",
-                                                                                     new Gson().toJson(list)))
+                    .perform(multipart("/api/system/scripts/mock-script/processes")
+                                 .param("properties", new ObjectMapper().writeValueAsString(list)))
                     .andExpect(status().isAccepted())
                     .andExpect(jsonPath("$", is(
                             ProcessMatcher.matchProcess("mock-script",
@@ -296,8 +301,7 @@ public class ScriptRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void postProcessNonExistingScriptNameException() throws Exception {
         String token = getAuthToken(admin.getEmail(), password);
 
-        getClient(token).perform(post("/api/system/scripts/mock-script-invalid/processes")
-                                         .contentType("multipart/form-data"))
+        getClient(token).perform(multipart("/api/system/scripts/mock-script-invalid/processes"))
                         .andExpect(status().isBadRequest());
     }
 
@@ -323,9 +327,8 @@ public class ScriptRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         try {
             getClient(token)
-                    .perform(post("/api/system/scripts/mock-script/processes").contentType("multipart/form-data")
-                                                                              .param("properties",
-                                                                                     new Gson().toJson(list)))
+                    .perform(multipart("/api/system/scripts/mock-script/processes")
+                                 .param("properties", new ObjectMapper().writeValueAsString(list)))
                     .andExpect(status().isAccepted())
                     .andExpect(jsonPath("$", is(
                             ProcessMatcher.matchProcess("mock-script",
@@ -361,9 +364,8 @@ public class ScriptRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         try {
             getClient(token)
-                    .perform(post("/api/system/scripts/mock-script/processes").contentType("multipart/form-data")
-                                                                              .param("properties",
-                                                                                     new Gson().toJson(list)))
+                    .perform(multipart("/api/system/scripts/mock-script/processes")
+                                 .param("properties", new ObjectMapper().writeValueAsString(list)))
                     .andExpect(status().isAccepted())
                     .andExpect(jsonPath("$", is(
                             ProcessMatcher.matchProcess("mock-script",
@@ -468,9 +470,10 @@ public class ScriptRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         try {
             getClient(token)
-                    .perform(fileUpload("/api/system/scripts/mock-script/processes").file(bitstreamFile)
-                                                                                    .param("properties",
-                                                                                           new Gson().toJson(list)))
+                    .perform(multipart("/api/system/scripts/mock-script/processes")
+                                 .file(bitstreamFile)
+                                 .characterEncoding("UTF-8")
+                                 .param("properties", new ObjectMapper().writeValueAsString(list)))
                     .andExpect(status().isAccepted())
                     .andExpect(jsonPath("$", is(
                             ProcessMatcher.matchProcess("mock-script",
@@ -484,6 +487,100 @@ public class ScriptRestRepositoryIT extends AbstractControllerIntegrationTest {
         }
     }
 
+    @Test
+    public void scriptTypeConversionTest() throws Exception {
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(get("/api/system/scripts/type-conversion-test"))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", ScriptMatcher
+                                .matchScript("type-conversion-test",
+                                             "Test the type conversion different option types")))
+                        .andExpect(jsonPath("$.parameters", containsInAnyOrder(
+                                allOf(
+                                        hasJsonPath("$.name", is("-b")),
+                                        hasJsonPath("$.description", is("option set to the boolean class")),
+                                        hasJsonPath("$.type", is("boolean")),
+                                        hasJsonPath("$.mandatory", is(false)),
+                                        hasJsonPath("$.nameLong", is("--boolean"))
+                                ),
+                                allOf(
+                                        hasJsonPath("$.name", is("-s")),
+                                        hasJsonPath("$.description", is("string option with an argument")),
+                                        hasJsonPath("$.type", is("String")),
+                                        hasJsonPath("$.mandatory", is(false)),
+                                        hasJsonPath("$.nameLong", is("--string"))
+                                ),
+                                allOf(
+                                        hasJsonPath("$.name", is("-n")),
+                                        hasJsonPath("$.description", is("string option without an argument")),
+                                        hasJsonPath("$.type", is("boolean")),
+                                        hasJsonPath("$.mandatory", is(false)),
+                                        hasJsonPath("$.nameLong", is("--noargument"))
+                                ),
+                                allOf(
+                                        hasJsonPath("$.name", is("-f")),
+                                        hasJsonPath("$.description", is("file option with an argument")),
+                                        hasJsonPath("$.type", is("InputStream")),
+                                        hasJsonPath("$.mandatory", is(false)),
+                                        hasJsonPath("$.nameLong", is("--file"))
+                                )
+                        ) ));
+    }
+
+    @Test
+    public void TrackSpecialGroupduringprocessSchedulingTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Group specialGroup = GroupBuilder.createGroup(context)
+            .withName("Special Group")
+            .addMember(admin)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        configurationService.setProperty("authentication-password.login.specialgroup", specialGroup.getName());
+
+        LinkedList<DSpaceCommandLineParameter> parameters = new LinkedList<>();
+
+        parameters.add(new DSpaceCommandLineParameter("-r", "test"));
+        parameters.add(new DSpaceCommandLineParameter("-i", null));
+
+        List<ParameterValueRest> list = parameters.stream()
+            .map(dSpaceCommandLineParameter -> dSpaceRunnableParameterConverter
+                .convert(dSpaceCommandLineParameter, Projection.DEFAULT))
+            .collect(Collectors.toList());
+
+
+
+        String token = getAuthToken(admin.getEmail(), password);
+        List<ProcessStatus> acceptableProcessStatuses = new LinkedList<>();
+        acceptableProcessStatuses.addAll(Arrays.asList(ProcessStatus.SCHEDULED,
+                                                       ProcessStatus.RUNNING,
+                                                       ProcessStatus.COMPLETED));
+
+        AtomicReference<Integer> idRef = new AtomicReference<>();
+
+        try {
+            getClient(token).perform(post("/api/system/scripts/mock-script/processes")
+                                         .contentType("multipart/form-data")
+                                         .param("properties", new ObjectMapper().writeValueAsString(list)))
+                .andExpect(status().isAccepted())
+                .andExpect(jsonPath("$", is(ProcessMatcher.matchProcess("mock-script",
+                                                                        String.valueOf(admin.getID()),
+                                                                        parameters, acceptableProcessStatuses))))
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.processId")));
+
+            Process process = processService.find(context, idRef.get());
+            List<Group> groups = process.getGroups();
+            boolean isPresent = groups.stream().anyMatch(g -> g.getID().equals(specialGroup.getID()));
+            assertTrue(isPresent);
+
+        } finally {
+            ProcessBuilder.deleteProcess(idRef.get());
+        }
+    }
+
 
     @After
     public void destroy() throws Exception {
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java
index fd84aa023b..cbcf970547 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java
@@ -107,7 +107,7 @@ public class SitemapRestControllerIT extends AbstractControllerIntegrationTest {
                                       //** THEN **
                                       .andExpect(status().isOk())
                                       //We expect the content type to match
-                                      .andExpect(content().contentType("text/html"))
+                                      .andExpect(content().contentType("text/html;charset=UTF-8"))
                                       .andReturn();
 
         String response = result.getResponse().getContentAsString();
@@ -123,7 +123,7 @@ public class SitemapRestControllerIT extends AbstractControllerIntegrationTest {
                                       //** THEN **
                                       .andExpect(status().isOk())
                                       //We expect the content type to match
-                                      .andExpect(content().contentType("text/html"))
+                                      .andExpect(content().contentType("text/html;charset=UTF-8"))
                                       .andReturn();
 
         String response = result.getResponse().getContentAsString();
@@ -140,7 +140,7 @@ public class SitemapRestControllerIT extends AbstractControllerIntegrationTest {
                                       //** THEN **
                                       .andExpect(status().isOk())
                                       //We expect the content type to match
-                                      .andExpect(content().contentType("application/xml"))
+                                      .andExpect(content().contentType("application/xml;charset=UTF-8"))
                                       .andReturn();
 
         String response = result.getResponse().getContentAsString();
@@ -156,7 +156,7 @@ public class SitemapRestControllerIT extends AbstractControllerIntegrationTest {
                                       //** THEN **
                                       .andExpect(status().isOk())
                                       //We expect the content type to match
-                                      .andExpect(content().contentType("application/xml"))
+                                      .andExpect(content().contentType("application/xml;charset=UTF-8"))
                                       .andReturn();
 
         String response = result.getResponse().getContentAsString();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
index 5dd24451c5..5544ecdb03 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
@@ -22,13 +22,13 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.matcher.UsageReportMatcher;
 import org.dspace.app.rest.model.UsageReportPointCityRest;
 import org.dspace.app.rest.model.UsageReportPointCountryRest;
@@ -50,6 +50,7 @@ import org.dspace.builder.SiteBuilder;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
+import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.Site;
 import org.dspace.core.Constants;
@@ -281,42 +282,40 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 1);
-        expectedPoint.setType("community");
-        expectedPoint.setId(communityVisited.getID().toString());
-
         // And request that community's TotalVisits stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + communityVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(communityVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                               TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint))))
-                             );
+                       UsageReportMatcher.matchUsageReport(
+                           communityVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                           TOTAL_VISITS_REPORT_ID,
+                           List.of(
+                               getExpectedDsoViews(communityVisited, 1)
+                           )
+                       )
+                   )));
     }
 
     @Test
     public void totalVisitsReport_Community_NotVisited() throws Exception {
         // ** WHEN **
         // Community is never visited
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 0);
-        expectedPoint.setType("community");
-        expectedPoint.setId(communityNotVisited.getID().toString());
-
         // And request that community's TotalVisits stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + communityNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(communityNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                               TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint))))
-                             );
+                       UsageReportMatcher.matchUsageReport(
+                           communityNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                           TOTAL_VISITS_REPORT_ID,
+                           List.of(
+                               getExpectedDsoViews(communityNotVisited, 0)
+                           )
+                       )
+                   )));
     }
 
     @Test
@@ -339,42 +338,40 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 2);
-        expectedPoint.setType("collection");
-        expectedPoint.setId(collectionVisited.getID().toString());
-
         // And request that collection's TotalVisits stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + collectionVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(collectionVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                               TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint))))
-                             );
+                       UsageReportMatcher.matchUsageReport(
+                           collectionVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                           TOTAL_VISITS_REPORT_ID,
+                           List.of(
+                               getExpectedDsoViews(collectionVisited, 2)
+                           )
+                       )
+                   )));
     }
 
     @Test
     public void totalVisitsReport_Collection_NotVisited() throws Exception {
         // ** WHEN **
         // Collection is never visited
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 0);
-        expectedPoint.setType("collection");
-        expectedPoint.setId(collectionNotVisited.getID().toString());
-
         // And request that collection's TotalVisits stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + collectionNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(collectionNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                               TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint))))
-                             );
+                       UsageReportMatcher.matchUsageReport(
+                           collectionNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                           TOTAL_VISITS_REPORT_ID,
+                           List.of(
+                               getExpectedDsoViews(collectionNotVisited, 0)
+                           )
+                       )
+                   )));
     }
 
     @Test
@@ -392,42 +389,42 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 1);
-        expectedPoint.setType("item");
-        expectedPoint.setId(itemVisited.getID().toString());
-
         // And request that collection's TotalVisits stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + itemVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(itemVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                               TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint))))
-                             );
+                       UsageReportMatcher.matchUsageReport(
+                           itemVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                           TOTAL_VISITS_REPORT_ID,
+                           List.of(
+                               getExpectedDsoViews(itemVisited, 1)
+                           )
+                       )
+                   )));
     }
 
     @Test
     public void totalVisitsReport_Item_NotVisited() throws Exception {
         // ** WHEN **
         //Item is never visited
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 0);
-        expectedPoint.setType("item");
-        expectedPoint.setId(itemNotVisitedWithBitstreams.getID().toString());
+        List<UsageReportPointRest> expectedPoints = List.of(
+            getExpectedDsoViews(itemNotVisitedWithBitstreams, 0)
+        );
 
         // And request that item's TotalVisits stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
-                   .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                               TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint))))
-                             );
+                             .andExpect(jsonPath("$", Matchers.is(
+                                 UsageReportMatcher.matchUsageReport(
+                                     itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                                     TOTAL_VISITS_REPORT_ID,
+                                     expectedPoints
+                                 )
+                             )));
 
         // only admin access visits report
         getClient(loggedInToken).perform(
@@ -445,19 +442,25 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                 get("/api/statistics/usagereports/"
                         + itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                                TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                        TOTAL_VISITS_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
 
-           getClient().perform(
+       getClient().perform(
                 get("/api/statistics/usagereports/"
                         + itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                                TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                        TOTAL_VISITS_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
     }
 
     @Test
@@ -475,10 +478,9 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 1);
-        expectedPoint.setType("bitstream");
-        expectedPoint.setId(bitstreamVisited.getID().toString());
+        List<UsageReportPointRest> expectedPoints = List.of(
+            getExpectedDsoViews(bitstreamVisited, 1)
+        );
 
         // And request that bitstream's TotalVisits stat report
         getClient(adminToken).perform(
@@ -486,10 +488,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                               TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint))))
-                             );
+                       UsageReportMatcher.matchUsageReport(
+                           bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                           TOTAL_VISITS_REPORT_ID,
+                           expectedPoints
+                       )
+                   )));
 
         // only admin access visits report
         getClient(loggedInToken).perform(
@@ -506,28 +510,34 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
         getClient(loggedInToken).perform(
                 get("/api/statistics/usagereports/" + bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID,
-                                Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                        TOTAL_VISITS_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
 
         getClient().perform(
                 get("/api/statistics/usagereports/" + bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID,
-                                Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                        TOTAL_VISITS_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
     }
 
     @Test
     public void totalVisitsReport_Bitstream_NotVisited() throws Exception {
         // ** WHEN **
         // Bitstream is never visited
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 0);
-        expectedPoint.setType("bitstream");
-        expectedPoint.setId(bitstreamNotVisited.getID().toString());
+
+        List<UsageReportPointRest> expectedPoints = List.of(
+            getExpectedDsoViews(bitstreamNotVisited, 0)
+        );
 
         String authToken = getAuthToken(admin.getEmail(), password);
         // And request that bitstream's TotalVisits stat report
@@ -536,10 +546,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(bitstreamNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                               TOTAL_VISITS_REPORT_ID, Arrays.asList(expectedPoint))))
-                             );
+                       UsageReportMatcher.matchUsageReport(
+                           bitstreamNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                           TOTAL_VISITS_REPORT_ID,
+                           expectedPoints
+                       )
+                   )));
 
         String tokenEPerson = getAuthToken(eperson.getEmail(), password);
         getClient(tokenEPerson).perform(
@@ -556,18 +568,24 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
         getClient(tokenEPerson).perform(
                 get("/api/statistics/usagereports/" + bitstreamNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                bitstreamNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID,
-                                Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        bitstreamNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                        TOTAL_VISITS_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
 
       getClient().perform(
                 get("/api/statistics/usagereports/" + bitstreamNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                bitstreamNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID,
-                                Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        bitstreamNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                        TOTAL_VISITS_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
     }
 
     @Test
@@ -593,9 +611,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                               TOTAL_VISITS_PER_MONTH_REPORT_ID, expectedPoints))));
+                       UsageReportMatcher.matchUsageReport(
+                           itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                           TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                           expectedPoints
+                       )
+                   )));
 
         // only admin has access
         getClient(loggedInToken).perform(
@@ -612,26 +633,30 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
         getClient(loggedInToken).perform(
                 get("/api/statistics/usagereports/" + itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                                TOTAL_VISITS_PER_MONTH_REPORT_ID, expectedPoints))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                        TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                        expectedPoints
+                        )
+                )));
 
        getClient().perform(
                 get("/api/statistics/usagereports/" + itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                                TOTAL_VISITS_PER_MONTH_REPORT_ID, expectedPoints))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                        TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
     }
 
     @Test
     public void totalVisitsPerMonthReport_Item_NotVisited() throws Exception {
         // ** WHEN **
         // Item is not visited
-        List<UsageReportPointRest> expectedPoints = this.getListOfVisitsPerMonthsPoints(0);
-
         // And request that item's TotalVisitsPerMonth stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + itemNotVisitedWithBitstreams.getID() + "_" +
@@ -639,10 +664,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(
+                       UsageReportMatcher.matchUsageReport(
                                itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                               TOTAL_VISITS_PER_MONTH_REPORT_ID, expectedPoints))));
+                               TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                               this.getListOfVisitsPerMonthsPoints(0)
+                       )
+                   )));
     }
 
     @Test
@@ -665,17 +692,18 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        List<UsageReportPointRest> expectedPoints = this.getListOfVisitsPerMonthsPoints(2);
-
         // And request that collection's TotalVisitsPerMonth stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + collectionVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(collectionVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                               TOTAL_VISITS_PER_MONTH_REPORT_ID, expectedPoints))));
+                       UsageReportMatcher.matchUsageReport(
+                           collectionVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                           TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                           this.getListOfVisitsPerMonthsPoints(2)
+                       )
+                   )));
     }
 
     @Test
@@ -693,10 +721,9 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 1);
-        expectedPoint.setType("bitstream");
-        expectedPoint.setId(bitstreamVisited.getID().toString());
+        List<UsageReportPointRest> expectedPoints = List.of(
+            getExpectedDsoViews(bitstreamVisited, 1)
+        );
 
         // And request that bitstreams's TotalDownloads stat report
         getClient(adminToken).perform(
@@ -704,9 +731,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
-                               TOTAL_DOWNLOADS_REPORT_ID, Arrays.asList(expectedPoint)))));
+                       UsageReportMatcher.matchUsageReport(
+                           bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
+                           TOTAL_DOWNLOADS_REPORT_ID,
+                           expectedPoints
+                       )
+                   )));
 
         // only admin has access to downloads report
         getClient(loggedInToken).perform(
@@ -723,18 +753,24 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
         getClient(loggedInToken).perform(
                 get("/api/statistics/usagereports/" + bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID, TOTAL_DOWNLOADS_REPORT_ID,
-                                Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
+                        TOTAL_DOWNLOADS_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
 
         getClient().perform(
                 get("/api/statistics/usagereports/" + bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID, TOTAL_DOWNLOADS_REPORT_ID,
-                                Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
+                        TOTAL_DOWNLOADS_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
     }
 
     @Test
@@ -752,11 +788,6 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPoint = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint.addValue("views", 1);
-        expectedPoint.setId("BitstreamVisitedName");
-        expectedPoint.setType("bitstream");
-
         // And request that item's TotalDownloads stat report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + itemNotVisitedWithBitstreams.getID() + "_" +
@@ -764,9 +795,14 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
-                               TOTAL_DOWNLOADS_REPORT_ID, Arrays.asList(expectedPoint)))));
+                       UsageReportMatcher.matchUsageReport(
+                           itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
+                           TOTAL_DOWNLOADS_REPORT_ID,
+                           List.of(
+                               getExpectedDsoViews(bitstreamVisited, 1)
+                           )
+                       )
+                   )));
     }
 
     @Test
@@ -780,9 +816,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
-                               TOTAL_DOWNLOADS_REPORT_ID, new ArrayList<>()))));
+                       UsageReportMatcher.matchUsageReport(
+                           itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
+                           TOTAL_DOWNLOADS_REPORT_ID,
+                           List.of()
+                       )
+                   )));
     }
 
     @Test
@@ -810,10 +849,9 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointCountryRest expectedPoint = new UsageReportPointCountryRest();
-        expectedPoint.addValue("views", 1);
-        expectedPoint.setId("US");
-        expectedPoint.setLabel("United States");
+        List<UsageReportPointRest> expectedPoints = List.of(
+            getExpectedCountryViews("US", "United States", 1)
+        );
 
         // And request that collection's TopCountries report
         getClient(adminToken).perform(
@@ -821,9 +859,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(collectionVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
-                               TOP_COUNTRIES_REPORT_ID, Arrays.asList(expectedPoint)))));
+                       UsageReportMatcher.matchUsageReport(
+                           collectionVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                           TOP_COUNTRIES_REPORT_ID,
+                           expectedPoints
+                       )
+                   )));
 
         // only admin has access to countries report
         getClient(loggedInToken).perform(
@@ -840,18 +881,24 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
         getClient(loggedInToken).perform(
                 get("/api/statistics/usagereports/" + collectionVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                collectionVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID, TOP_COUNTRIES_REPORT_ID,
-                                Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        collectionVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                        TOP_COUNTRIES_REPORT_ID,
+                        expectedPoints
+                        )
+                )));
 
       getClient().perform(
                 get("/api/statistics/usagereports/" + collectionVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(UsageReportMatcher.matchUsageReport(
-                                collectionVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID, TOP_COUNTRIES_REPORT_ID,
-                                Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        collectionVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                        TOP_COUNTRIES_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
     }
 
     /**
@@ -877,20 +924,20 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointCountryRest expectedPoint = new UsageReportPointCountryRest();
-        expectedPoint.addValue("views", 2);
-        expectedPoint.setId("US");
-        expectedPoint.setLabel("United States");
-
         // And request that collection's TopCountries report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + communityVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(communityVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
-                               TOP_COUNTRIES_REPORT_ID, Arrays.asList(expectedPoint)))));
+                       UsageReportMatcher.matchUsageReport(
+                           communityVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                           TOP_COUNTRIES_REPORT_ID,
+                           List.of(
+                               getExpectedCountryViews("US", "United States", 2)
+                           )
+                       )
+                   )));
     }
 
     /**
@@ -906,9 +953,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(itemNotVisitedWithBitstreams.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
-                               TOP_COUNTRIES_REPORT_ID, new ArrayList<>()))));
+                       UsageReportMatcher.matchUsageReport(
+                           itemNotVisitedWithBitstreams.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                           TOP_COUNTRIES_REPORT_ID,
+                           List.of()
+                       )
+                   )));
     }
 
     /**
@@ -929,9 +979,9 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointCityRest expectedPoint = new UsageReportPointCityRest();
-        expectedPoint.addValue("views", 1);
-        expectedPoint.setId("New York");
+        List<UsageReportPointRest> expectedPoints = List.of(
+            getExpectedCityViews("New York", 1)
+        );
 
         // And request that item's TopCities report
         getClient(adminToken).perform(
@@ -939,9 +989,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                               TOP_CITIES_REPORT_ID, Arrays.asList(expectedPoint)))));
+                       UsageReportMatcher.matchUsageReport(
+                           itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                           TOP_CITIES_REPORT_ID,
+                           expectedPoints
+                       )
+                   )));
 
         // only admin has access to cities report
         getClient(loggedInToken).perform(
@@ -958,18 +1011,24 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
         getClient(loggedInToken).perform(
                 get("/api/statistics/usagereports/" + itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(
-                                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                                        TOP_CITIES_REPORT_ID, Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                        TOP_CITIES_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
 
         getClient().perform(
                 get("/api/statistics/usagereports/" + itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$",
-                        Matchers.is(
-                                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                                        TOP_CITIES_REPORT_ID, Arrays.asList(expectedPoint)))));
+                .andExpect(jsonPath("$", Matchers.is(
+                    UsageReportMatcher.matchUsageReport(
+                        itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                        TOP_CITIES_REPORT_ID,
+                        expectedPoints
+                    )
+                )));
     }
 
     /**
@@ -1000,19 +1059,20 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                                 .andExpect(status().isCreated());
 
-        UsageReportPointCityRest expectedPoint = new UsageReportPointCityRest();
-        expectedPoint.addValue("views", 3);
-        expectedPoint.setId("New York");
-
         // And request that community's TopCities report
         getClient(adminToken).perform(
             get("/api/statistics/usagereports/" + communityVisited.getID() + "_" + TOP_CITIES_REPORT_ID))
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(communityVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                               TOP_CITIES_REPORT_ID, Arrays.asList(expectedPoint)))));
+                       UsageReportMatcher.matchUsageReport(
+                           communityVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                           TOP_CITIES_REPORT_ID,
+                           List.of(
+                               getExpectedCityViews("New York", 3)
+                           )
+                       )
+                   )));
     }
 
     /**
@@ -1028,9 +1088,12 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
                    // ** THEN **
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", Matchers.is(
-                       UsageReportMatcher
-                           .matchUsageReport(collectionNotVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                               TOP_CITIES_REPORT_ID, new ArrayList<>()))));
+                       UsageReportMatcher.matchUsageReport(
+                           collectionNotVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                           TOP_CITIES_REPORT_ID,
+                           List.of()
+                       )
+                   )));
     }
 
     @Test
@@ -1155,18 +1218,6 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                    .andExpect(status().isCreated());
 
-        List<UsageReportPointRest> points = new ArrayList<>();
-        UsageReportPointDsoTotalVisitsRest expectedPoint1 = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint1.addValue("views", 1);
-        expectedPoint1.setType("item");
-        expectedPoint1.setId(itemVisited.getID().toString());
-        UsageReportPointDsoTotalVisitsRest expectedPoint2 = new UsageReportPointDsoTotalVisitsRest();
-        expectedPoint2.addValue("views", 2);
-        expectedPoint2.setType("item");
-        expectedPoint2.setId(itemVisited2.getID().toString());
-        points.add(expectedPoint1);
-        points.add(expectedPoint2);
-
         // And request the sites global usage report (show top most popular items)
         getClient(adminToken)
             .perform(get("/api/statistics/usagereports/search/object?uri=http://localhost:8080/server/api/core" +
@@ -1175,8 +1226,15 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.usagereports", not(empty())))
             .andExpect(jsonPath("$._embedded.usagereports", Matchers.containsInAnyOrder(
-                UsageReportMatcher
-                    .matchUsageReport(site.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID, points))));
+                UsageReportMatcher.matchUsageReport(
+                    site.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                    TOTAL_VISITS_REPORT_ID,
+                    List.of(
+                        getExpectedDsoViews(itemVisited, 1),
+                        getExpectedDsoViews(itemVisited2, 2)
+                    )
+                )
+            )));
     }
 
     @Test
@@ -1194,20 +1252,6 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                    .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPointTotalVisits = new UsageReportPointDsoTotalVisitsRest();
-        expectedPointTotalVisits.addValue("views", 1);
-        expectedPointTotalVisits.setType("community");
-        expectedPointTotalVisits.setId(communityVisited.getID().toString());
-
-        UsageReportPointCityRest expectedPointCity = new UsageReportPointCityRest();
-        expectedPointCity.addValue("views", 1);
-        expectedPointCity.setId("New York");
-
-        UsageReportPointCountryRest expectedPointCountry = new UsageReportPointCountryRest();
-        expectedPointCountry.addValue("views", 1);
-        expectedPointCountry.setId("US");
-        expectedPointCountry.setLabel("United States");
-
         // And request the community usage reports
         getClient(adminToken)
             .perform(get("/api/statistics/usagereports/search/object?uri=http://localhost:8080/server/api/core" +
@@ -1216,27 +1260,39 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.usagereports", not(empty())))
             .andExpect(jsonPath("$._embedded.usagereports", Matchers.containsInAnyOrder(
-                UsageReportMatcher
-                    .matchUsageReport(communityVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID,
-                        Arrays.asList(expectedPointTotalVisits)),
-                UsageReportMatcher.matchUsageReport(communityVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                UsageReportMatcher.matchUsageReport(
+                    communityVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                    TOTAL_VISITS_REPORT_ID,
+                    List.of(
+                        getExpectedDsoViews(communityVisited, 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    communityVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
                     TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                    this.getListOfVisitsPerMonthsPoints(1)),
-                UsageReportMatcher.matchUsageReport(communityVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                    TOP_CITIES_REPORT_ID, Arrays.asList(expectedPointCity)),
-                UsageReportMatcher.matchUsageReport(communityVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
-                    TOP_COUNTRIES_REPORT_ID, Arrays.asList(expectedPointCountry))
-                                                                                       )));
+                    this.getListOfVisitsPerMonthsPoints(1)
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    communityVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                    TOP_CITIES_REPORT_ID,
+                    List.of(
+                        getExpectedCityViews("New York", 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    communityVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                    TOP_COUNTRIES_REPORT_ID,
+                    List.of(
+                        getExpectedCountryViews("US", "United States", 1)
+                    )
+                )
+            )));
     }
 
     @Test
     public void usageReportsSearch_Collection_NotVisited() throws Exception {
         // ** WHEN **
         // Collection is not visited
-        UsageReportPointDsoTotalVisitsRest expectedPointTotalVisits = new UsageReportPointDsoTotalVisitsRest();
-        expectedPointTotalVisits.addValue("views", 0);
-        expectedPointTotalVisits.setType("collection");
-        expectedPointTotalVisits.setId(collectionNotVisited.getID().toString());
         // And request the collection's usage reports
         getClient(adminToken)
             .perform(get("/api/statistics/usagereports/search/object?uri=http://localhost:8080/server/api/core" +
@@ -1245,18 +1301,29 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.usagereports", not(empty())))
             .andExpect(jsonPath("$._embedded.usagereports", Matchers.containsInAnyOrder(
-                UsageReportMatcher
-                    .matchUsageReport(collectionNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
-                        TOTAL_VISITS_REPORT_ID,
-                        Arrays.asList(expectedPointTotalVisits)),
-                UsageReportMatcher
-                    .matchUsageReport(collectionNotVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                        TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                        this.getListOfVisitsPerMonthsPoints(0)),
-                UsageReportMatcher.matchUsageReport(collectionNotVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                    TOP_CITIES_REPORT_ID, new ArrayList<>()),
-                UsageReportMatcher.matchUsageReport(collectionNotVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
-                    TOP_COUNTRIES_REPORT_ID, new ArrayList<>()))));
+                UsageReportMatcher.matchUsageReport(
+                    collectionNotVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                    TOTAL_VISITS_REPORT_ID,
+                    List.of(
+                        getExpectedDsoViews(collectionNotVisited, 0)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    collectionNotVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                    TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                    this.getListOfVisitsPerMonthsPoints(0)
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    collectionNotVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                    TOP_CITIES_REPORT_ID,
+                    List.of()
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    collectionNotVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                    TOP_COUNTRIES_REPORT_ID,
+                    List.of()
+                )
+            )));
     }
 
     @Test
@@ -1274,20 +1341,6 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                    .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPointTotalVisits = new UsageReportPointDsoTotalVisitsRest();
-        expectedPointTotalVisits.addValue("views", 1);
-        expectedPointTotalVisits.setType("item");
-        expectedPointTotalVisits.setId(itemVisited.getID().toString());
-
-        UsageReportPointCityRest expectedPointCity = new UsageReportPointCityRest();
-        expectedPointCity.addValue("views", 1);
-        expectedPointCity.setId("New York");
-
-        UsageReportPointCountryRest expectedPointCountry = new UsageReportPointCountryRest();
-        expectedPointCountry.addValue("views", 1);
-        expectedPointCountry.setId("US");
-        expectedPointCountry.setLabel("United States");
-
         // And request the community usage reports
         getClient(adminToken)
             .perform(get("/api/statistics/usagereports/search/object?uri=http://localhost:8080/server/api/core" +
@@ -1296,18 +1349,38 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.usagereports", not(empty())))
             .andExpect(jsonPath("$._embedded.usagereports", Matchers.containsInAnyOrder(
-                UsageReportMatcher
-                    .matchUsageReport(itemVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID,
-                        Arrays.asList(expectedPointTotalVisits)),
-                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                    TOTAL_VISITS_REPORT_ID,
+                    List.of(
+                        getExpectedDsoViews(itemVisited, 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
                     TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                    this.getListOfVisitsPerMonthsPoints(1)),
-                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                    TOP_CITIES_REPORT_ID, Arrays.asList(expectedPointCity)),
-                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
-                    TOP_COUNTRIES_REPORT_ID, Arrays.asList(expectedPointCountry)),
-                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
-                    TOTAL_DOWNLOADS_REPORT_ID, new ArrayList<>()))));
+                    this.getListOfVisitsPerMonthsPoints(1)
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                    TOP_CITIES_REPORT_ID,
+                    List.of(
+                        getExpectedCityViews("New York", 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                    TOP_COUNTRIES_REPORT_ID,
+                    List.of(
+                        getExpectedCountryViews("US", "United States", 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
+                    TOTAL_DOWNLOADS_REPORT_ID,
+                    List.of()
+                )
+            )));
     }
 
     @Test
@@ -1355,32 +1428,6 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                    .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPointTotalVisits = new UsageReportPointDsoTotalVisitsRest();
-        expectedPointTotalVisits.addValue("views", 1);
-        expectedPointTotalVisits.setType("item");
-        expectedPointTotalVisits.setId(itemVisited.getID().toString());
-
-        UsageReportPointCityRest expectedPointCity = new UsageReportPointCityRest();
-        expectedPointCity.addValue("views", 1);
-        expectedPointCity.setId("New York");
-
-        UsageReportPointCountryRest expectedPointCountry = new UsageReportPointCountryRest();
-        expectedPointCountry.addValue("views", 1);
-        expectedPointCountry.setId("US");
-        expectedPointCountry.setLabel("United States");
-
-        List<UsageReportPointRest> totalDownloadsPoints = new ArrayList<>();
-        UsageReportPointDsoTotalVisitsRest expectedPointTotalVisitsBit1 = new UsageReportPointDsoTotalVisitsRest();
-        expectedPointTotalVisitsBit1.addValue("views", 1);
-        expectedPointTotalVisitsBit1.setId("bitstream1");
-        expectedPointTotalVisitsBit1.setType("bitstream");
-        UsageReportPointDsoTotalVisitsRest expectedPointTotalVisitsBit2 = new UsageReportPointDsoTotalVisitsRest();
-        expectedPointTotalVisitsBit2.addValue("views", 2);
-        expectedPointTotalVisitsBit2.setId("bitstream2");
-        expectedPointTotalVisitsBit2.setType("bitstream");
-        totalDownloadsPoints.add(expectedPointTotalVisitsBit1);
-        totalDownloadsPoints.add(expectedPointTotalVisitsBit2);
-
         // And request the community usage reports
         getClient(adminToken)
             .perform(get("/api/statistics/usagereports/search/object?uri=http://localhost:8080/server/api/core" +
@@ -1389,18 +1436,41 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.usagereports", not(empty())))
             .andExpect(jsonPath("$._embedded.usagereports", Matchers.containsInAnyOrder(
-                UsageReportMatcher
-                    .matchUsageReport(itemVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID,
-                        Arrays.asList(expectedPointTotalVisits)),
-                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                    TOTAL_VISITS_REPORT_ID,
+                    List.of(
+                        getExpectedDsoViews(itemVisited, 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
                     TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                    this.getListOfVisitsPerMonthsPoints(1)),
-                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                    TOP_CITIES_REPORT_ID, Arrays.asList(expectedPointCity)),
-                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
-                    TOP_COUNTRIES_REPORT_ID, Arrays.asList(expectedPointCountry)),
-                UsageReportMatcher.matchUsageReport(itemVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
-                    TOTAL_DOWNLOADS_REPORT_ID, totalDownloadsPoints))));
+                    getListOfVisitsPerMonthsPoints(1)
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                    TOP_CITIES_REPORT_ID,
+                    List.of(
+                        getExpectedCityViews("New York", 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                    TOP_COUNTRIES_REPORT_ID,
+                    List.of(
+                        getExpectedCountryViews("US", "United States", 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    itemVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
+                    TOTAL_DOWNLOADS_REPORT_ID,
+                    List.of(
+                        getExpectedDsoViews(bitstream1, 1),
+                        getExpectedDsoViews(bitstream2, 2)
+                    )
+                )
+            )));
     }
 
     @Test
@@ -1418,20 +1488,9 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .contentType(contentType))
                    .andExpect(status().isCreated());
 
-        UsageReportPointDsoTotalVisitsRest expectedPointTotalVisits = new UsageReportPointDsoTotalVisitsRest();
-        expectedPointTotalVisits.addValue("views", 1);
-        expectedPointTotalVisits.setType("bitstream");
-        expectedPointTotalVisits.setLabel("BitstreamVisitedName");
-        expectedPointTotalVisits.setId(bitstreamVisited.getID().toString());
-
-        UsageReportPointCityRest expectedPointCity = new UsageReportPointCityRest();
-        expectedPointCity.addValue("views", 1);
-        expectedPointCity.setId("New York");
-
-        UsageReportPointCountryRest expectedPointCountry = new UsageReportPointCountryRest();
-        expectedPointCountry.addValue("views", 1);
-        expectedPointCountry.setId("US");
-        expectedPointCountry.setLabel("United States");
+        List<UsageReportPointRest> expectedTotalVisits = List.of(
+            getExpectedDsoViews(bitstreamVisited, 1)
+        );
 
         // And request the community usage reports
         getClient(adminToken)
@@ -1441,18 +1500,36 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.usagereports", not(empty())))
             .andExpect(jsonPath("$._embedded.usagereports", Matchers.containsInAnyOrder(
-                UsageReportMatcher
-                    .matchUsageReport(bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID, TOTAL_VISITS_REPORT_ID,
-                        Arrays.asList(expectedPointTotalVisits)),
-                UsageReportMatcher.matchUsageReport(bitstreamVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
+                UsageReportMatcher.matchUsageReport(
+                    bitstreamVisited.getID() + "_" + TOTAL_VISITS_REPORT_ID,
+                    TOTAL_VISITS_REPORT_ID,
+                    expectedTotalVisits
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    bitstreamVisited.getID() + "_" + TOTAL_VISITS_PER_MONTH_REPORT_ID,
                     TOTAL_VISITS_PER_MONTH_REPORT_ID,
-                    this.getListOfVisitsPerMonthsPoints(1)),
-                UsageReportMatcher.matchUsageReport(bitstreamVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
-                    TOP_CITIES_REPORT_ID, Arrays.asList(expectedPointCity)),
-                UsageReportMatcher.matchUsageReport(bitstreamVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
-                    TOP_COUNTRIES_REPORT_ID, Arrays.asList(expectedPointCountry)),
-                UsageReportMatcher.matchUsageReport(bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
-                    TOTAL_DOWNLOADS_REPORT_ID, Arrays.asList(expectedPointTotalVisits)))));
+                    this.getListOfVisitsPerMonthsPoints(1)
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    bitstreamVisited.getID() + "_" + TOP_CITIES_REPORT_ID,
+                    TOP_CITIES_REPORT_ID,
+                    List.of(
+                        getExpectedCityViews("New York", 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    bitstreamVisited.getID() + "_" + TOP_COUNTRIES_REPORT_ID,
+                    TOP_COUNTRIES_REPORT_ID,
+                    List.of(
+                        getExpectedCountryViews("US", "United States", 1)
+                    )
+                ),
+                UsageReportMatcher.matchUsageReport(
+                    bitstreamVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID,
+                    TOTAL_DOWNLOADS_REPORT_ID,
+                    expectedTotalVisits
+                )
+            )));
     }
 
     // Create expected points from -6 months to now, with given number of views in current month
@@ -1475,4 +1552,34 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
         }
         return expectedPoints;
     }
+
+    private UsageReportPointDsoTotalVisitsRest getExpectedDsoViews(DSpaceObject dso, int views) {
+        UsageReportPointDsoTotalVisitsRest point = new UsageReportPointDsoTotalVisitsRest();
+
+        point.addValue("views", views);
+        point.setType(StringUtils.lowerCase(Constants.typeText[dso.getType()]));
+        point.setId(dso.getID().toString());
+        point.setLabel(dso.getName());
+
+        return point;
+    }
+
+    private UsageReportPointCountryRest getExpectedCountryViews(String id, String label, int views) {
+        UsageReportPointCountryRest point = new UsageReportPointCountryRest();
+
+        point.addValue("views", views);
+        point.setId(id);
+        point.setLabel(label);
+
+        return point;
+    }
+
+    private UsageReportPointCityRest getExpectedCityViews(String id, int views) {
+        UsageReportPointCityRest point = new UsageReportPointCityRest();
+
+        point.addValue("views", views);
+        point.setId(id);
+
+        return point;
+    }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
index 7c262dbeaa..5f93411bb9 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
@@ -205,7 +205,7 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                    // We expect the content type to be "application/hal+json;charset=UTF-8"
                    .andExpect(content().contentType(contentType))
                    // Match only that a section exists with a submission configuration behind
-                   .andExpect(jsonPath("$._embedded.submissionsections", hasSize(7)))
+                   .andExpect(jsonPath("$._embedded.submissionsections", hasSize(8)))
                    .andExpect(jsonPath("$._embedded.submissionsections",
                                        Matchers.hasItem(
                                            allOf(
@@ -257,10 +257,10 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                         Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                         Matchers.containsString("/api/config/submissiondefinitions?"),
-                        Matchers.containsString("page=4"), Matchers.containsString("size=1"))))
+                        Matchers.containsString("page=5"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$.page.size", is(1)))
-                .andExpect(jsonPath("$.page.totalElements", is(5)))
-                .andExpect(jsonPath("$.page.totalPages", is(5)))
+                .andExpect(jsonPath("$.page.totalElements", is(6)))
+                .andExpect(jsonPath("$.page.totalPages", is(6)))
                 .andExpect(jsonPath("$.page.number", is(0)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
@@ -283,10 +283,10 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                         Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                         Matchers.containsString("/api/config/submissiondefinitions?"),
-                        Matchers.containsString("page=4"), Matchers.containsString("size=1"))))
+                        Matchers.containsString("page="), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$.page.size", is(1)))
-                .andExpect(jsonPath("$.page.totalElements", is(5)))
-                .andExpect(jsonPath("$.page.totalPages", is(5)))
+                .andExpect(jsonPath("$.page.totalElements", is(6)))
+                .andExpect(jsonPath("$.page.totalPages", is(6)))
                 .andExpect(jsonPath("$.page.number", is(1)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
@@ -309,10 +309,10 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                         Matchers.containsString("page=2"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                         Matchers.containsString("/api/config/submissiondefinitions?"),
-                        Matchers.containsString("page=4"), Matchers.containsString("size=1"))))
+                        Matchers.containsString("page=5"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$.page.size", is(1)))
-                .andExpect(jsonPath("$.page.totalElements", is(5)))
-                .andExpect(jsonPath("$.page.totalPages", is(5)))
+                .andExpect(jsonPath("$.page.totalElements", is(6)))
+                .andExpect(jsonPath("$.page.totalPages", is(6)))
                 .andExpect(jsonPath("$.page.number", is(2)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
@@ -335,10 +335,10 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                 Matchers.containsString("page=3"), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=4"), Matchers.containsString("size=1"))))
+                Matchers.containsString("page=5"), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$.page.size", is(1)))
-            .andExpect(jsonPath("$.page.totalElements", is(5)))
-            .andExpect(jsonPath("$.page.totalPages", is(5)))
+            .andExpect(jsonPath("$.page.totalElements", is(6)))
+            .andExpect(jsonPath("$.page.totalPages", is(6)))
             .andExpect(jsonPath("$.page.number", is(3)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
@@ -353,16 +353,18 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
             .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
                 Matchers.containsString("page=3"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.next").doesNotExist())
+                .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=5"), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
                 Matchers.containsString("page=4"), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=4"), Matchers.containsString("size=1"))))
+                Matchers.containsString("page=5"), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$.page.size", is(1)))
-            .andExpect(jsonPath("$.page.totalElements", is(5)))
-            .andExpect(jsonPath("$.page.totalPages", is(5)))
+            .andExpect(jsonPath("$.page.totalElements", is(6)))
+            .andExpect(jsonPath("$.page.totalPages", is(6)))
             .andExpect(jsonPath("$.page.number", is(4)));
     }
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
index 6a83401f93..241bdefe21 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
@@ -11,6 +11,7 @@ import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -66,13 +67,13 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                    .andExpect(content().contentType(contentType))
                    //The configuration file for the test env includes 6 forms
                    .andExpect(jsonPath("$.page.size", is(20)))
-                   .andExpect(jsonPath("$.page.totalElements", equalTo(7)))
+                   .andExpect(jsonPath("$.page.totalElements", equalTo(8)))
                    .andExpect(jsonPath("$.page.totalPages", equalTo(1)))
                    .andExpect(jsonPath("$.page.number", is(0)))
                    .andExpect(
                        jsonPath("$._links.self.href", Matchers.startsWith(REST_SERVER_URL + "config/submissionforms")))
-                   //The array of submissionforms should have a size of 6
-                   .andExpect(jsonPath("$._embedded.submissionforms", hasSize(equalTo(7))))
+                   //The array of submissionforms should have a size of 8
+                   .andExpect(jsonPath("$._embedded.submissionforms", hasSize(equalTo(8))))
         ;
     }
 
@@ -83,12 +84,12 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(contentType))
                 .andExpect(jsonPath("$.page.size", is(20)))
-                .andExpect(jsonPath("$.page.totalElements", equalTo(7)))
+                .andExpect(jsonPath("$.page.totalElements", equalTo(8)))
                 .andExpect(jsonPath("$.page.totalPages", equalTo(1)))
                 .andExpect(jsonPath("$.page.number", is(0)))
                 .andExpect(jsonPath("$._links.self.href", Matchers.startsWith(REST_SERVER_URL
                            + "config/submissionforms")))
-                .andExpect(jsonPath("$._embedded.submissionforms", hasSize(equalTo(7))));
+                .andExpect(jsonPath("$._embedded.submissionforms", hasSize(equalTo(8))));
     }
 
     @Test
@@ -113,20 +114,20 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                        .startsWith(REST_SERVER_URL + "config/submissionforms/traditionalpageone")))
                    // check the first two rows
                    .andExpect(jsonPath("$.rows[0].fields", contains(
-                        SubmissionFormFieldMatcher.matchFormFieldDefinition("name", "Author",
+                        SubmissionFormFieldMatcher.matchFormFieldDefinition("name", "Author", null,
                 null, true,"Add an author", "dc.contributor.author"))))
                    .andExpect(jsonPath("$.rows[1].fields", contains(
-                        SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Title",
+                        SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Title", null,
                                 "You must enter a main title for this item.", false,
                                 "Enter the main title of the item.", "dc.title"))))
                    // check a row with multiple fields
                    .andExpect(jsonPath("$.rows[3].fields",
                         contains(
                                 SubmissionFormFieldMatcher.matchFormFieldDefinition("date", "Date of Issue",
-                                        "You must enter at least the year.", false,
+                                        null, "You must enter at least the year.", false,
                                         "Please give the date", "col-sm-4",
                                         "dc.date.issued"),
-                                SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Publisher",
+                                SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Publisher", null,
                                         null, false,"Enter the name of",
                                         "col-sm-8","dc.publisher"))))
         ;
@@ -144,18 +145,18 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                    .andExpect(jsonPath("$._links.self.href", Matchers
                        .startsWith(REST_SERVER_URL + "config/submissionforms/traditionalpageone")))
                    .andExpect(jsonPath("$.rows[0].fields", contains(
-                        SubmissionFormFieldMatcher.matchFormFieldDefinition("name", "Author",
+                        SubmissionFormFieldMatcher.matchFormFieldDefinition("name", "Author", null,
                           null, true,"Add an author", "dc.contributor.author"))))
                    .andExpect(jsonPath("$.rows[1].fields", contains(
-                        SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Title",
+                        SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Title", null,
                                 "You must enter a main title for this item.", false,
                                 "Enter the main title of the item.", "dc.title"))))
                    .andExpect(jsonPath("$.rows[3].fields",contains(
-                                SubmissionFormFieldMatcher.matchFormFieldDefinition("date", "Date of Issue",
+                                SubmissionFormFieldMatcher.matchFormFieldDefinition("date", "Date of Issue", null,
                                         "You must enter at least the year.", false,
                                         "Please give the date", "col-sm-4",
                                         "dc.date.issued"),
-                                SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Publisher",
+                                SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Publisher", null,
                                         null, false,"Enter the name of",
                                         "col-sm-8","dc.publisher"))));
     }
@@ -220,20 +221,20 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                         // dc.subject fields with in separate rows all linked to an authority with different
                         // presentation modes (suggestion, name-lookup, lookup)
                         .andExpect(jsonPath("$.rows[0].fields", contains(
-                                SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Author",
+                                SubmissionFormFieldMatcher.matchFormFieldDefinition("onebox", "Author", null,
                                         null, true,
                                 "Author field that can be associated with an authority providing suggestion",
                                 null, "dc.contributor.author", "SolrAuthorAuthority")
                             )))
                         .andExpect(jsonPath("$.rows[1].fields", contains(
-                                SubmissionFormFieldMatcher.matchFormFieldDefinition("lookup-name", "Editor",
+                                SubmissionFormFieldMatcher.matchFormFieldDefinition("lookup-name", "Editor", null,
                                         null, false,
                                 "Editor field that can be associated with an authority "
                                 + "providing the special name lookup",
                                 null, "dc.contributor.editor", "SolrEditorAuthority")
                             )))
                         .andExpect(jsonPath("$.rows[2].fields", contains(
-                                SubmissionFormFieldMatcher.matchFormFieldDefinition("lookup", "Subject",
+                                SubmissionFormFieldMatcher.matchFormFieldDefinition("lookup", "Subject", null,
                                         null, true,
                                 "Subject field that can be associated with an authority providing lookup",
                                 null, "dc.subject", "SolrSubjectAuthority")
@@ -266,7 +267,7 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                             .startsWith(REST_SERVER_URL + "config/submissionforms/traditionalpageone")))
                         // our test configuration include the dc.type field with a value pair in the 8th row
                         .andExpect(jsonPath("$.rows[7].fields", contains(
-                                SubmissionFormFieldMatcher.matchFormFieldDefinition("dropdown", "Type",
+                                SubmissionFormFieldMatcher.matchFormFieldDefinition("dropdown", "Type", null,
                                         null, true,
                                 "Select the type(s) of content of the item. To select more than one value in the " +
                                 "list, you may have to hold down the \"CTRL\" or \"Shift\" key.",
@@ -275,6 +276,35 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
         ;
     }
 
+    @Test
+    public void findFieldWithTypeBindConfig() throws Exception {
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(get("/api/config/submissionforms/traditionalpageone"))
+                // The status has to be 200 OK
+                .andExpect(status().isOk())
+                // We expect the content type to be "application/hal+json;charset=UTF-8"
+                .andExpect(content().contentType(contentType))
+                // Check that the JSON root matches the expected "traditionalpageone" input forms
+                .andExpect(jsonPath("$.id", is("traditionalpageone")))
+                .andExpect(jsonPath("$.name", is("traditionalpageone")))
+                .andExpect(jsonPath("$.type", is("submissionform")))
+                .andExpect(jsonPath("$._links.self.href", Matchers
+                        .startsWith(REST_SERVER_URL + "config/submissionforms/traditionalpageone")))
+                // check a row with type-bind 'Technical Report'
+                .andExpect(jsonPath("$.rows[5].fields", contains(
+                SubmissionFormFieldMatcher.matchFormFieldDefinition("series", "Series/Report No.",
+                        "Technical Report", null, true,
+                        "Enter the series and number assigned to this item by your community.",
+                        "dc.relation.ispartofseries"))))
+                // check the same row with a NON-matching type-bind 'Article' (expect false)
+                .andExpect(((jsonPath("$.rows[5].fields", not(contains(
+                SubmissionFormFieldMatcher.matchFormFieldDefinition("series", "Series/Report No.",
+                        "Article", null, true,
+                        "Enter the series and number assigned to this item by your community.",
+                        "dc.relation.ispartofseries")))))));
+    }
+
     @Test
     public void findOpenRelationshipConfig() throws Exception {
         String token = getAuthToken(admin.getEmail(), password);
@@ -352,14 +382,15 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                  .andExpect(jsonPath("$._links.self.href", Matchers
                             .startsWith(REST_SERVER_URL + "config/submissionforms/languagetest")))
                  .andExpect(jsonPath("$.rows[0].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("name", "Autore", "\u00C8" + " richiesto almeno un autore", true,
+                            .matchFormFieldDefinition("name", "Autore", null,
+                                    "\u00C8" + " richiesto almeno un autore", true,
                                                       "Aggiungi un autore", "dc.contributor.author"))))
                  .andExpect(jsonPath("$.rows[1].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("onebox", "Titolo",
+                            .matchFormFieldDefinition("onebox", "Titolo", null,
                             "\u00C8" + " necessario inserire un titolo principale per questo item", false,
                             "Inserisci titolo principale di questo item", "dc.title"))))
                  .andExpect(jsonPath("$.rows[2].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("dropdown", "Lingua", null, false,
+                            .matchFormFieldDefinition("dropdown", "Lingua", null, null, false,
                             "Selezionare la lingua del contenuto principale dell'item."
                           + " Se la lingua non compare nell'elenco, selezionare (Altro)."
                           + " Se il contenuto non ha davvero una lingua"
@@ -376,14 +407,14 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                  .andExpect(jsonPath("$._links.self.href", Matchers
                            .startsWith(REST_SERVER_URL + "config/submissionforms/languagetest")))
                  .andExpect(jsonPath("$.rows[0].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("name", "Автор", "Потрібно ввести хочаб одного автора!",
+                           .matchFormFieldDefinition("name", "Автор", null, "Потрібно ввести хочаб одного автора!",
                                                true, "Додати автора", "dc.contributor.author"))))
                  .andExpect(jsonPath("$.rows[1].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("onebox", "Заголовок",
+                           .matchFormFieldDefinition("onebox", "Заголовок", null,
                            "Заговолок файла обов'язковий !", false,
                            "Ввести основний заголовок файла", "dc.title"))))
                  .andExpect(jsonPath("$.rows[2].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("dropdown", "Мова", null, false,
+                           .matchFormFieldDefinition("dropdown", "Мова", null, null, false,
                            "Виберiть мову головного змiсту файлу, як що мови немає у списку, вибрати (Iнша)."
                          + " Як що вмiст вайлу не є текстовим, наприклад є фотографiєю, тодi вибрати (N/A)",
                          null, "dc.language.iso", "common_iso_languages"))));
@@ -431,14 +462,15 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                  .andExpect(jsonPath("$._links.self.href", Matchers
                             .startsWith(REST_SERVER_URL + "config/submissionforms/languagetest")))
                  .andExpect(jsonPath("$.rows[0].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("name", "Autore", "\u00C8" + " richiesto almeno un autore", true,
+                            .matchFormFieldDefinition("name", "Autore", null,
+                                    "\u00C8" + " richiesto almeno un autore", true,
                                                       "Aggiungi un autore", "dc.contributor.author"))))
                  .andExpect(jsonPath("$.rows[1].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("onebox", "Titolo",
+                            .matchFormFieldDefinition("onebox", "Titolo", null,
                             "\u00C8" + " necessario inserire un titolo principale per questo item", false,
                             "Inserisci titolo principale di questo item", "dc.title"))))
                  .andExpect(jsonPath("$.rows[2].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("dropdown", "Lingua", null, false,
+                            .matchFormFieldDefinition("dropdown", "Lingua", null, null, false,
                             "Selezionare la lingua del contenuto principale dell'item."
                           + " Se la lingua non compare nell'elenco, selezionare (Altro)."
                           + " Se il contenuto non ha davvero una lingua"
@@ -455,14 +487,14 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                  .andExpect(jsonPath("$._links.self.href", Matchers
                            .startsWith(REST_SERVER_URL + "config/submissionforms/languagetest")))
                  .andExpect(jsonPath("$.rows[0].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("name", "Автор", "Потрібно ввести хочаб одного автора!",
+                           .matchFormFieldDefinition("name",  "Автор", null, "Потрібно ввести хочаб одного автора!",
                                                true, "Додати автора", "dc.contributor.author"))))
                  .andExpect(jsonPath("$.rows[1].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("onebox", "Заголовок",
+                           .matchFormFieldDefinition("onebox", "Заголовок", null,
                            "Заговолок файла обов'язковий !", false,
                            "Ввести основний заголовок файла", "dc.title"))))
                  .andExpect(jsonPath("$.rows[2].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("dropdown", "Мова", null, false,
+                           .matchFormFieldDefinition("dropdown", "Мова", null, null, false,
                            "Виберiть мову головного змiсту файлу, як що мови немає у списку, вибрати (Iнша)."
                          + " Як що вмiст вайлу не є текстовим, наприклад є фотографiєю, тодi вибрати (N/A)",
                          null, "dc.language.iso", "common_iso_languages"))));
@@ -505,14 +537,15 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                  .andExpect(jsonPath("$._links.self.href", Matchers
                            .startsWith(REST_SERVER_URL + "config/submissionforms/languagetest")))
                  .andExpect(jsonPath("$.rows[0].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("name", "Autore", "\u00C8" + " richiesto almeno un autore", true,
+                           .matchFormFieldDefinition("name", "Autore", null,
+                                   "\u00C8" + " richiesto almeno un autore", true,
                                                      "Aggiungi un autore", "dc.contributor.author"))))
                  .andExpect(jsonPath("$.rows[1].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("onebox", "Titolo",
+                           .matchFormFieldDefinition("onebox", "Titolo", null,
                            "\u00C8" + " necessario inserire un titolo principale per questo item", false,
                            "Inserisci titolo principale di questo item", "dc.title"))))
                  .andExpect(jsonPath("$.rows[2].fields", contains(SubmissionFormFieldMatcher
-                           .matchFormFieldDefinition("dropdown", "Lingua", null, false,
+                           .matchFormFieldDefinition("dropdown", "Lingua", null, null, false,
                            "Selezionare la lingua del contenuto principale dell'item."
                          + " Se la lingua non compare nell'elenco, selezionare (Altro)."
                          + " Se il contenuto non ha davvero una lingua"
@@ -547,10 +580,10 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                  .andExpect(jsonPath("$._links.self.href", Matchers
                             .startsWith(REST_SERVER_URL + "config/submissionforms/languagetest")))
                  .andExpect(jsonPath("$.rows[0].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("name", "Autore", "\u00C8 richiesto almeno un autore", true,
+                            .matchFormFieldDefinition("name", "Autore", null, "\u00C8 richiesto almeno un autore", true,
                                                       "Aggiungi un autore", "dc.contributor.author"))))
                  .andExpect(jsonPath("$.rows[1].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("onebox", "Titolo",
+                            .matchFormFieldDefinition("onebox", "Titolo", null,
                             "\u00C8 necessario inserire un titolo principale per questo item", false,
                             "Inserisci titolo principale di questo item", "dc.title"))));
          resetLocalesConfiguration();
@@ -582,10 +615,10 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                  .andExpect(jsonPath("$._links.self.href", Matchers
                             .startsWith(REST_SERVER_URL + "config/submissionforms/languagetest")))
                  .andExpect(jsonPath("$.rows[0].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("name", "Autore", "\u00C8 richiesto almeno un autore", true,
+                            .matchFormFieldDefinition("name", "Autore", null, "\u00C8 richiesto almeno un autore", true,
                                                       "Aggiungi un autore", "dc.contributor.author"))))
                  .andExpect(jsonPath("$.rows[1].fields", contains(SubmissionFormFieldMatcher
-                            .matchFormFieldDefinition("onebox", "Titolo",
+                            .matchFormFieldDefinition("onebox", "Titolo", null,
                             "\u00C8 necessario inserire un titolo principale per questo item", false,
                             "Inserisci titolo principale di questo item", "dc.title"))));
 
@@ -665,7 +698,7 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                          Matchers.containsString("/api/config/submissionforms?"),
                          Matchers.containsString("page=3"), Matchers.containsString("size=2"))))
                  .andExpect(jsonPath("$.page.size", is(2)))
-                 .andExpect(jsonPath("$.page.totalElements", equalTo(7)))
+                 .andExpect(jsonPath("$.page.totalElements", equalTo(8)))
                  .andExpect(jsonPath("$.page.totalPages", equalTo(4)))
                  .andExpect(jsonPath("$.page.number", is(0)));
 
@@ -692,7 +725,7 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                          Matchers.containsString("/api/config/submissionforms?"),
                          Matchers.containsString("page=3"), Matchers.containsString("size=2"))))
                  .andExpect(jsonPath("$.page.size", is(2)))
-                 .andExpect(jsonPath("$.page.totalElements", equalTo(7)))
+                 .andExpect(jsonPath("$.page.totalElements", equalTo(8)))
                  .andExpect(jsonPath("$.page.totalPages", equalTo(4)))
                  .andExpect(jsonPath("$.page.number", is(1)));
 
@@ -716,7 +749,7 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                         Matchers.containsString("/api/config/submissionforms?"),
                         Matchers.containsString("page=3"), Matchers.containsString("size=2"))))
                 .andExpect(jsonPath("$.page.size", is(2)))
-                .andExpect(jsonPath("$.page.totalElements", equalTo(7)))
+                .andExpect(jsonPath("$.page.totalElements", equalTo(8)))
                 .andExpect(jsonPath("$.page.totalPages", equalTo(4)))
                 .andExpect(jsonPath("$.page.number", is(2)));
 
@@ -739,7 +772,7 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                 Matchers.containsString("/api/config/submissionforms?"),
                 Matchers.containsString("page=3"), Matchers.containsString("size=2"))))
             .andExpect(jsonPath("$.page.size", is(2)))
-            .andExpect(jsonPath("$.page.totalElements", equalTo(7)))
+            .andExpect(jsonPath("$.page.totalElements", equalTo(8)))
             .andExpect(jsonPath("$.page.totalPages", equalTo(4)))
             .andExpect(jsonPath("$.page.number", is(3)));
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java
index 203278f9f8..7a25e74a49 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java
@@ -15,8 +15,8 @@ import static org.junit.Assert.assertTrue;
 import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE;
 import static org.springframework.http.MediaType.parseMediaType;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -1514,7 +1514,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
                 .contentType(MediaType.APPLICATION_FORM_URLENCODED))
             .andExpect(status().isForbidden());
 
-        // nor the administrator can approve a task that he doesn't own
+        // nor the administrator can approve a task that it doesn't own
         getClient(adminToken).perform(post("/api/workflow/claimedtasks/" + claimedTask.getID())
                 .param("submit_approve", "true")
                 .contentType(MediaType.APPLICATION_FORM_URLENCODED))
@@ -1690,7 +1690,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
                 .contentType(MediaType.APPLICATION_FORM_URLENCODED))
             .andExpect(status().isForbidden());
 
-        // nor the administrator can approve a task that he doesn't own
+        // nor the administrator can approve a task that it doesn't own
         getClient(adminToken).perform(post("/api/workflow/claimedtasks/" + claimedTask.getID())
                 .param("submit_reject", "true")
                 .param("reason", "I need to test the reject")
@@ -2653,7 +2653,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         InputStream bibtex = getClass().getResourceAsStream("bibtex-test.bib");
         final MockMultipartFile bibtexFile = new MockMultipartFile("file", "bibtex-test.bib", "application/x-bibtex",
             bibtex);
-        getClient(reviewer1Token).perform(fileUpload("/api/workflow/workflowitems/" + witem.getID())
+        getClient(reviewer1Token).perform(multipart("/api/workflow/workflowitems/" + witem.getID())
             .file(bibtexFile))
             .andExpect(status().isUnprocessableEntity());
 
@@ -2794,7 +2794,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         InputStream bibtex = getClass().getResourceAsStream("bibtex-test.bib");
         final MockMultipartFile bibtexFile = new MockMultipartFile("file", "bibtex-test.bib", "application/x-bibtex",
             bibtex);
-        getClient(authToken).perform(fileUpload("/api/workflow/workflowitems/" + witem.getID())
+        getClient(authToken).perform(multipart("/api/workflow/workflowitems/" + witem.getID())
             .file(bibtexFile))
             .andExpect(status().isUnprocessableEntity());
 
@@ -2947,7 +2947,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         InputStream bibtex = getClass().getResourceAsStream("bibtex-test.bib");
         final MockMultipartFile bibtexFile = new MockMultipartFile("file", "bibtex-test.bib", "application/x-bibtex",
             bibtex);
-        getClient(reviewer1Token).perform(fileUpload("/api/workflow/workflowitems/" + witem.getID())
+        getClient(reviewer1Token).perform(multipart("/api/workflow/workflowitems/" + witem.getID())
             .file(bibtexFile))
             .andExpect(status().isCreated());
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionHistoryRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionHistoryRestRepositoryIT.java
index 3ce5393c93..f5dbda8771 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionHistoryRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionHistoryRestRepositoryIT.java
@@ -467,6 +467,7 @@ public class VersionHistoryRestRepositoryIT extends AbstractControllerIntegratio
                                .withIssueDate("2021-04-27")
                                .withAuthor("Doe, John")
                                .withSubject("ExtraEntry")
+                               .grantLicense()
                                .build();
 
         Version version = VersionBuilder.createVersion(context, item, "test").build();
@@ -600,6 +601,7 @@ public class VersionHistoryRestRepositoryIT extends AbstractControllerIntegratio
                                .withIssueDate("2021-03-20")
                                .withAuthor("Doe, John")
                                .withSubject("ExtraEntry")
+                               .grantLicense()
                                .build();
 
         Version v2 = VersionBuilder.createVersion(context, item, "test").build();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionRestRepositoryIT.java
index 86d66dec32..ed3e811db2 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionRestRepositoryIT.java
@@ -8,6 +8,8 @@
 package org.dspace.app.rest;
 import static com.jayway.jsonpath.JsonPath.read;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.emptyOrNullString;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.is;
@@ -58,6 +60,7 @@ import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.service.InstallItemService;
+import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.eperson.EPerson;
 import org.dspace.services.ConfigurationService;
@@ -65,6 +68,7 @@ import org.dspace.versioning.Version;
 import org.dspace.versioning.service.VersioningService;
 import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.hamcrest.Matchers;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,6 +104,9 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
     @Autowired
     private AuthorizationFeatureService authorizationFeatureService;
 
+    @Autowired
+    private ItemService itemService;
+
     @Before
     public void setup() throws SQLException, AuthorizeException {
         //disable file upload mandatory
@@ -404,6 +411,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
                           .withIssueDate("2021-04-27")
                           .withAuthor("Doe, John")
                           .withSubject("ExtraEntry")
+                          .grantLicense()
                           .build();
 
         Version v2 = VersionBuilder.createVersion(context, item, "test").build();
@@ -471,6 +479,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
                                .withIssueDate("2021-03-20")
                                .withAuthor("Doe, John")
                                .withSubject("ExtraEntry")
+                               .grantLicense()
                                .build();
 
         Version v2 = VersionBuilder.createVersion(context, item, "test").build();
@@ -713,38 +722,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
     }
 
     @Test
-    public void createFirstVersionItemWithentityTypeByAdminAndPropertyBlockEntityEnableTest() throws Exception {
-        configurationService.setProperty("versioning.block.entity", true);
-        context.turnOffAuthorisationSystem();
-        Community rootCommunity = CommunityBuilder.createCommunity(context)
-                                                  .withName("Parent Community")
-                                                  .build();
-
-        Collection col = CollectionBuilder.createCollection(context, rootCommunity)
-                                          .withName("Collection 1")
-                                          .withEntityType("Publication")
-                                          .build();
-
-        Item itemA = ItemBuilder.createItem(context, col)
-                               .withTitle("Public item")
-                               .withIssueDate("2021-04-19")
-                               .withAuthor("Doe, John")
-                               .withSubject("ExtraEntry")
-                               .build();
-
-        context.restoreAuthSystemState();
-
-        String adminToken = getAuthToken(admin.getEmail(), password);
-        getClient(adminToken).perform(post("/api/versioning/versions")
-                             .param("summary", "test summary!")
-                             .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
-                             .content("/api/core/items/" + itemA.getID()))
-                             .andExpect(status().isForbidden());
-    }
-
-    @Test
-    public void createFirstVersionItemWithEntityTypeAndPropertyBlockEntityDisabledTest() throws Exception {
-        configurationService.setProperty("versioning.block.entity", false);
+    public void createFirstVersionItemWithEntityTypeTest() throws Exception {
         context.turnOffAuthorisationSystem();
         parentCommunity = CommunityBuilder.createCommunity(context)
                                           .withName("Parent Community")
@@ -786,9 +764,8 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
     }
 
     @Test
-    public void createFirstVersionItemWithEntityTypeBySubmitterAndPropertyBlockEntityDisabledTest() throws Exception {
+    public void createFirstVersionItemWithEntityTypeBySubmitterTest() throws Exception {
         configurationService.setProperty("versioning.submitterCanCreateNewVersion", true);
-        configurationService.setProperty("versioning.block.entity", false);
         context.turnOffAuthorisationSystem();
         Community rootCommunity = CommunityBuilder.createCommunity(context)
                                                   .withName("Parent Community")
@@ -873,6 +850,55 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
                    .andExpect(status().isUnauthorized());
     }
 
+    @Test
+    public void createNewVersionItemByCollectionAdminTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community rootCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+
+        EPerson colAdmin = EPersonBuilder.createEPerson(context)
+                .withCanLogin(true)
+                .withEmail("coladmin@email.com")
+                .withPassword(password)
+                .withNameInMetadata("Collection", "Admin")
+                .build();
+        Collection col = CollectionBuilder
+                .createCollection(context, rootCommunity)
+                .withName("Collection 1")
+                .withAdminGroup(colAdmin)
+                .build();
+
+        Item item = ItemBuilder.createItem(context, col)
+                .withTitle("Public test item")
+                .withIssueDate("2022-12-19")
+                .withAuthor("Doe, John")
+                .withSubject("ExtraEntry")
+                .build();
+
+        item.setSubmitter(eperson);
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        String token = getAuthToken(colAdmin.getEmail(), password);
+        try {
+            getClient(token).perform(post("/api/versioning/versions")
+                            .param("summary", "test summary!")
+                            .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                            .content("/api/core/items/" + item.getID()))
+                    .andExpect(status().isCreated())
+                    .andExpect(jsonPath("$", Matchers.allOf(
+                            hasJsonPath("$.version", is(2)),
+                            hasJsonPath("$.summary", is("test summary!")),
+                            hasJsonPath("$.type", is("version"))
+                    )))
+                    .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+        } finally {
+            VersionBuilder.delete(idRef.get());
+        }
+    }
+
     @Test
     public void patchReplaceSummaryTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -1418,6 +1444,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
                                .withIssueDate("2021-03-20")
                                .withAuthor("Doe, John")
                                .withSubject("ExtraEntry")
+                               .grantLicense()
                                .build();
 
         Version v2 = VersionBuilder.createVersion(context, item, "test").build();
@@ -1488,6 +1515,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
                                .withIssueDate("2021-03-20")
                                .withAuthor("Doe, John")
                                .withSubject("ExtraEntry")
+                               .grantLicense()
                                .build();
 
         Version v2 = VersionBuilder.createVersion(context, item, "test").build();
@@ -1594,4 +1622,87 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         }
     }
 
-}
\ No newline at end of file
+    @Test
+    public void ignoreCollectionEntityTypeWhenCreatingNewVersionOfItem() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context)
+            .withName("community")
+            .build();
+
+        Collection collection = CollectionBuilder.createCollection(context, community)
+            .withName("Collection")
+            // collection has dspace.entity.type = Person
+            .withEntityType("Person")
+            .build();
+
+        Item v1 = ItemBuilder.createItem(context, collection)
+            .withTitle("item version 1")
+            // NOTE: cannot use withEntityType here, because the collection already adds dspace.entity.type to this item
+            //       => it would result in 2 metadata values
+            .build();
+
+        // modify the entity type (that has been added to the item by the collection)
+        itemService.replaceMetadata(
+            context, v1, "dspace", "entity", "type", Item.ANY, "Publication", null, -1, 0
+        );
+        itemService.update(context, v1);
+        context.commit();
+
+        context.restoreAuthSystemState();
+
+        // test v1
+        getClient().perform(get("/api/core/items/" + v1.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.metadata", allOf(
+                // dc.title should have exactly one value => item version 1
+                hasJsonPath("$.['dc.title']", containsInAnyOrder(
+                    hasJsonPath("$.value", is("item version 1"))
+                )),
+                // dspace.entity.type should have exactly one value => Publication
+                hasJsonPath("$.['dspace.entity.type']", containsInAnyOrder(
+                    hasJsonPath("$.value", is("Publication"))
+                ))
+            )));
+
+        // create a new version, change the title and archive it
+        Item v2 = createNewVersion(v1, "item version 2");
+
+        // test v2
+        getClient().perform(get("/api/core/items/" + v2.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.metadata", allOf(
+                // dc.title should have exactly one value => item version 2
+                hasJsonPath("$.['dc.title']", containsInAnyOrder(
+                    hasJsonPath("$.value", is("item version 2"))
+                )),
+                // dspace.entity.type should have exactly one value => Publication
+                hasJsonPath("$.['dspace.entity.type']", containsInAnyOrder(
+                    hasJsonPath("$.value", is("Publication"))
+                ))
+            )));
+    }
+
+    protected Item createNewVersion(Item oldItem, String newTitle) throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Item newItem = VersionBuilder.createVersion(context, oldItem, "create: " + newTitle).build().getItem();
+        Assert.assertNotEquals(oldItem, newItem);
+
+        // modify the new version
+        itemService.replaceMetadata(
+            context, newItem, "dc", "title", null, Item.ANY, newTitle, null, -1, 0
+        );
+        itemService.update(context, newItem);
+        context.commit();
+
+        // archive the new version, this implies that VersioningConsumer will unarchive the previous version
+        installItemService.installItem(context, workspaceItemService.findByItem(context, newItem));
+        context.commit();
+
+        context.restoreAuthSystemState();
+
+        return newItem;
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VuFindImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VuFindImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..c3063ca234
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VuFindImportMetadataSourceServiceIT.java
@@ -0,0 +1,199 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import javax.el.MethodNotFoundException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.dspace.importer.external.vufind.VuFindImportMetadataSourceServiceImpl;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link VuFindImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class VuFindImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private LiveImportClientImpl liveImportClientImpl;
+
+    @Autowired
+    private VuFindImportMetadataSourceServiceImpl vuFindService;
+
+    @Test
+    public void vuFindImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream vuFindRespIS = getClass().getResourceAsStream("vuFind-generic.json")) {
+
+            String vuFindResp = IOUtils.toString(vuFindRespIS, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(vuFindResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            Collection<ImportRecord> recordsImported = vuFindService.getRecords("test query", 0, 2);
+            assertEquals(2, recordsImported.size());
+            matchRecords(new ArrayList<>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void vuFindImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream vuFindRespIS = getClass().getResourceAsStream("vuFind-generic.json")) {
+            String vuFindResp = IOUtils.toString(vuFindRespIS, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(vuFindResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = vuFindService.getRecordsCount("test query");
+            assertEquals(1994, tot);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void vuFindImportMetadataGetRecordByIdTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream vuFindByIdResp = getClass().getResourceAsStream("vuFind-by-id.json")) {
+
+            String vuFindResp = IOUtils.toString(vuFindByIdResp, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(vuFindResp, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ArrayList<ImportRecord> collection2match = getRecords();
+            collection2match.remove(1);
+            ImportRecord recordImported = vuFindService.getRecord("653510");
+            assertNotNull(recordImported);
+            Collection<ImportRecord> recordsImported = Arrays.asList(recordImported);
+            matchRecords(new ArrayList<>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test(expected = MethodNotFoundException.class)
+    public void vuFindImportMetadataFindMatchingRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        org.dspace.content.Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                                              .withName("Collection 1")
+                                                              .build();
+
+        Item testItem = ItemBuilder.createItem(context, col1)
+                                   .withTitle("test item")
+                                   .withIssueDate("2021")
+                                   .build();
+        context.restoreAuthSystemState();
+        vuFindService.findMatchingRecords(testItem);
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        //define first record
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO identifierOther = createMetadatumDTO("dc", "identifier", "other", "653510");
+        MetadatumDTO language = createMetadatumDTO("dc", "language", "iso", "Italian");
+        MetadatumDTO title = createMetadatumDTO("dc", "title", null,
+                "La pianta marmorea di Roma antica: Forma urbis Romae /");
+        MetadatumDTO subject = createMetadatumDTO("dc", "subject", null, "Rome (Italy)");
+        MetadatumDTO subject2 = createMetadatumDTO("dc", "subject", null, "Maps");
+        MetadatumDTO subject3 = createMetadatumDTO("dc", "subject", null, "Early works to 1800.");
+        MetadatumDTO subject4 = createMetadatumDTO("dc", "subject", null, "Rome (Italy)");
+        MetadatumDTO subject5 = createMetadatumDTO("dc", "subject", null, "Antiquities");
+        MetadatumDTO subject6 = createMetadatumDTO("dc", "subject", null, "Maps.");
+        MetadatumDTO identifier = createMetadatumDTO("dc", "identifier", null,
+                                                     "http://hdl.handle.net/20.500.12390/231");
+        metadatums.add(identifierOther);
+        metadatums.add(language);
+        metadatums.add(title);
+        metadatums.add(identifier);
+        metadatums.add(subject);
+        metadatums.add(subject2);
+        metadatums.add(subject3);
+        metadatums.add(subject4);
+        metadatums.add(subject5);
+        metadatums.add(subject6);
+
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO identifierOther2 = createMetadatumDTO("dc", "identifier", "other", "1665326");
+        MetadatumDTO language2 = createMetadatumDTO("dc", "language", "iso", "English");
+        MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
+                "Expert frames : scientific and policy practices of Roma classification /");
+        MetadatumDTO subject7 = createMetadatumDTO("dc", "subject", null, "Public opinion");
+        MetadatumDTO subject8 = createMetadatumDTO("dc", "subject", null, "Europe.");
+        MetadatumDTO subject9 = createMetadatumDTO("dc", "subject", null, "Stereotypes (Social psychology)");
+        MetadatumDTO subject10 = createMetadatumDTO("dc", "subject", null, "Romanies");
+        MetadatumDTO subject11 = createMetadatumDTO("dc", "subject", null, "Public opinion.");
+        MetadatumDTO identifier2 = createMetadatumDTO("dc", "identifier", null,
+                "http://ezproxy.villanova.edu/login?URL=http://www.jstor.org/stable/10.7829/j.ctt1ggjj08");
+        metadatums2.add(identifierOther2);
+        metadatums2.add(language2);
+        metadatums2.add(title2);
+        metadatums2.add(identifier2);
+        metadatums2.add(subject7);
+        metadatums2.add(subject8);
+        metadatums2.add(subject9);
+        metadatums2.add(subject10);
+        metadatums2.add(subject11);
+
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WOSImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WOSImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..f1d3f5303e
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WOSImportMetadataSourceServiceIT.java
@@ -0,0 +1,249 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.dspace.importer.external.wos.service.WOSImportMetadataSourceServiceImpl;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link WOSImportMetadataSourceServiceImpl}
+ * 
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class WOSImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private WOSImportMetadataSourceServiceImpl wosImportMetadataService;
+
+    @Autowired
+    private LiveImportClientImpl liveImportClientImpl;
+
+    @Test
+    public void wosImportMetadataGetRecordsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        String originApiKey = wosImportMetadataService.getApiKey();
+        if (StringUtils.isBlank(originApiKey)) {
+            wosImportMetadataService.setApiKey("testApiKey");
+        }
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream file = getClass().getResourceAsStream("wos-responce.xml")) {
+            String wosXmlResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+
+            CloseableHttpResponse response = mockResponse(wosXmlResp, 200, "OK");
+
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            Collection<ImportRecord> recordsImported = wosImportMetadataService.getRecords("science", 0, 2);
+            ArrayList<ImportRecord> collection2match = getRecords();
+            assertEquals(2, recordsImported.size());
+            matchRecords(new ArrayList<ImportRecord>(recordsImported), collection2match);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+            wosImportMetadataService.setApiKey(originApiKey);
+        }
+    }
+
+    @Test
+    public void wosImportMetadataGetRecordsCountTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        String originApiKey = wosImportMetadataService.getApiKey();
+        if (StringUtils.isBlank(originApiKey)) {
+            wosImportMetadataService.setApiKey("testApiKey");
+        }
+        CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream file = getClass().getResourceAsStream("wos-responce.xml")) {
+            String wosXmlResp = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClientImpl.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(wosXmlResp, 200, "OK");
+
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = wosImportMetadataService.getRecordsCount("science");
+            assertEquals(1853785, tot);
+        } finally {
+            liveImportClientImpl.setHttpClient(originalHttpClient);
+            wosImportMetadataService.setApiKey(originApiKey);
+        }
+    }
+
+    private ArrayList<ImportRecord> getRecords() {
+        ArrayList<ImportRecord> records = new ArrayList<>();
+        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        //define first record
+        MetadatumDTO edition = createMetadatumDTO("oaire","citation", "edition", "WOS.SSCI");
+        MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2022");
+        MetadatumDTO type = createMetadatumDTO("dc", "type", null, "Journal");
+        MetadatumDTO ispartof = createMetadatumDTO("dc", "relation", "ispartof",
+                                   "ETR&D-EDUCATIONAL TECHNOLOGY RESEARCH AND DEVELOPMENT");
+        MetadatumDTO ispartofseries = createMetadatumDTO("dc", "relation", "ispartofseries",
+                                   "ETR&D-EDUCATIONAL TECHNOLOGY RESEARCH AND DEVELOPMENT");
+        MetadatumDTO title = createMetadatumDTO("dc", "title", null,
+                "Preservice science teachers coding science simulations:"
+                + " epistemological understanding, coding skills, and lesson design");
+        MetadatumDTO issn = createMetadatumDTO("dc", "identifier", "issn", "1042-1629");
+        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", null, "10.1007/s11423-022-10119-7");
+        MetadatumDTO description = createMetadatumDTO("dc", "description", "abstract",
+                "National and state science learning standards urge K-12 educators to offer authentic Science,"
+                + " Technology, Engineering, and Mathematics learning experiences.");
+        MetadatumDTO iso = createMetadatumDTO("dc", "language", "iso", "1");
+        MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "Vasconcelos, Lucas");
+        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "Kim, ChanMin");
+        MetadatumDTO subject = createMetadatumDTO("dc", "subject", null, "MODEL-BASED INQUIRY");
+        MetadatumDTO subject2 = createMetadatumDTO("dc", "subject", null, "COMPUTATIONAL THINKING");
+        MetadatumDTO subject3 = createMetadatumDTO("dc", "subject", null, "ELEMENTARY TEACHERS");
+        MetadatumDTO subject4 = createMetadatumDTO("dc", "subject", null, "STIMULATED-RECALL");
+        MetadatumDTO subject5 = createMetadatumDTO("dc", "subject", null, "STUDENTS");
+        MetadatumDTO subject6 = createMetadatumDTO("dc", "subject", null, "TECHNOLOGY");
+        MetadatumDTO subject7 = createMetadatumDTO("dc", "subject", null, "KNOWLEDGE");
+        MetadatumDTO subject8 = createMetadatumDTO("dc", "subject", null, "K-12");
+        MetadatumDTO subject9 = createMetadatumDTO("dc", "subject", null, "CONCEPTIONS");
+        MetadatumDTO subject10 = createMetadatumDTO("dc", "subject", null, "VIEWS");
+        MetadatumDTO subject11 = createMetadatumDTO("dc", "subject", null, "Scientific models");
+        MetadatumDTO subject12 = createMetadatumDTO("dc", "subject", null, "Scientific modeling");
+        MetadatumDTO subject13 = createMetadatumDTO("dc", "subject", null, "Block-based coding");
+        MetadatumDTO subject14 = createMetadatumDTO("dc", "subject", null, "Epistemological understanding");
+        MetadatumDTO subject15 = createMetadatumDTO("dc", "subject", null, "Coding concepts");
+        MetadatumDTO subject16 = createMetadatumDTO("dc", "subject", null, "Lesson design");
+        MetadatumDTO subject17 = createMetadatumDTO("dc", "subject", null, "Social Sciences");
+        MetadatumDTO other = createMetadatumDTO("dc", "identifier", "other", "WOS:000805105200003");
+        metadatums.add(edition);
+        metadatums.add(date);
+        metadatums.add(type);
+        metadatums.add(ispartof);
+        metadatums.add(ispartofseries);
+        metadatums.add(title);
+        metadatums.add(issn);
+        metadatums.add(doi);
+        metadatums.add(description);
+        metadatums.add(iso);
+        metadatums.add(author);
+        metadatums.add(author2);
+        metadatums.add(subject);
+        metadatums.add(subject2);
+        metadatums.add(subject3);
+        metadatums.add(subject4);
+        metadatums.add(subject5);
+        metadatums.add(subject6);
+        metadatums.add(subject7);
+        metadatums.add(subject8);
+        metadatums.add(subject9);
+        metadatums.add(subject10);
+        metadatums.add(subject11);
+        metadatums.add(subject12);
+        metadatums.add(subject13);
+        metadatums.add(subject14);
+        metadatums.add(subject15);
+        metadatums.add(subject16);
+        metadatums.add(subject17);
+        metadatums.add(other);
+        ImportRecord firstrRecord = new ImportRecord(metadatums);
+
+        //define second record
+        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        MetadatumDTO edition2 = createMetadatumDTO("oaire","citation", "edition", "WOS.SCI");
+        MetadatumDTO edition3 = createMetadatumDTO("oaire","citation", "edition", "WOS.SSCI");
+        MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2022");
+        MetadatumDTO type2 = createMetadatumDTO("dc", "type", null, "Journal");
+        MetadatumDTO ispartof2 = createMetadatumDTO("dc", "relation", "ispartof", "NATURE HUMAN BEHAVIOUR");
+        MetadatumDTO ispartofseries2 = createMetadatumDTO("dc", "relation", "ispartofseries", "NATURE HUMAN BEHAVIOUR");
+
+        MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
+        "The latent structure of global scientific development");
+
+        MetadatumDTO issn2 = createMetadatumDTO("dc", "identifier", "issn", "2397-3374");
+        MetadatumDTO doi2 = createMetadatumDTO("dc", "identifier", null, "10.1038/s41562-022-01367-x");
+        MetadatumDTO description2 = createMetadatumDTO("dc", "description", "abstract",
+                "Science is essential to innovation and economic prosperity."
+                + "By examining the scientific output of each country,"
+                + " Ahn et al. reveal a three-cluster structure of global science.");
+        MetadatumDTO iso2 = createMetadatumDTO("dc", "language", "iso", "1");
+        MetadatumDTO author3 = createMetadatumDTO("dc", "contributor", "author", "Miao, Lili");
+        MetadatumDTO author4 = createMetadatumDTO("dc", "contributor", "author", "Murray, Dakota");
+        MetadatumDTO author5 = createMetadatumDTO("dc", "contributor", "author", "Jung, Woo-Sung");
+        MetadatumDTO author6 = createMetadatumDTO("dc", "contributor", "author", "Lariviere, Vincent");
+        MetadatumDTO author7 = createMetadatumDTO("dc", "contributor", "author", "Sugimoto, Cassidy R.");
+        MetadatumDTO author8 = createMetadatumDTO("dc", "contributor", "author", "Ahn, Yong-Yeol");
+        MetadatumDTO subject18 = createMetadatumDTO("dc", "subject", null, "RESEARCH OUTPUT");
+        MetadatumDTO subject19 = createMetadatumDTO("dc", "subject", null, "ECONOMIC-GROWTH");
+        MetadatumDTO subject20 = createMetadatumDTO("dc", "subject", null, "SCIENCE");
+        MetadatumDTO subject21 = createMetadatumDTO("dc", "subject", null, "KNOWLEDGE");
+        MetadatumDTO subject22 = createMetadatumDTO("dc", "subject", null, "CHINA");
+        MetadatumDTO subject23 = createMetadatumDTO("dc", "subject", null, "CAUSALITY");
+        MetadatumDTO subject24 = createMetadatumDTO("dc", "subject", null, "BACKBONE");
+        MetadatumDTO subject25 = createMetadatumDTO("dc", "subject", null, "SPREAD");
+        MetadatumDTO subject26 = createMetadatumDTO("dc", "subject", null, "Social Sciences");
+        MetadatumDTO subject27 = createMetadatumDTO("dc", "subject", null, "Science & Technology");
+        MetadatumDTO subject28 = createMetadatumDTO("dc", "subject", null, "Life Sciences & Biomedicine");
+        MetadatumDTO other2 = createMetadatumDTO("dc", "identifier", "other", "WOS:000805100600001");
+        MetadatumDTO rid = createMetadatumDTO("person", "identifier", "rid", "C-6334-2011");
+        MetadatumDTO rid2 = createMetadatumDTO("person", "identifier", "rid", "B-1251-2008");
+        metadatums2.add(edition2);
+        metadatums2.add(edition3);
+        metadatums2.add(date2);
+        metadatums2.add(type2);
+        metadatums2.add(ispartof2);
+        metadatums2.add(ispartofseries2);
+        metadatums2.add(title2);
+        metadatums2.add(issn2);
+        metadatums2.add(doi2);
+        metadatums2.add(description2);
+        metadatums2.add(iso2);
+        metadatums2.add(author3);
+        metadatums2.add(author4);
+        metadatums2.add(author5);
+        metadatums2.add(author6);
+        metadatums2.add(author7);
+        metadatums2.add(author8);
+        metadatums2.add(subject18);
+        metadatums2.add(subject19);
+        metadatums2.add(subject20);
+        metadatums2.add(subject21);
+        metadatums2.add(subject22);
+        metadatums2.add(subject23);
+        metadatums2.add(subject24);
+        metadatums2.add(subject25);
+        metadatums2.add(subject26);
+        metadatums2.add(subject27);
+        metadatums2.add(subject28);
+        metadatums2.add(other2);
+        metadatums2.add(rid);
+        metadatums2.add(rid2);
+        ImportRecord secondRecord = new ImportRecord(metadatums2);
+
+        records.add(firstrRecord);
+        records.add(secondRecord);
+        return records;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowDefinitionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowDefinitionRestRepositoryIT.java
index c1b4e0fe65..a222839abf 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowDefinitionRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowDefinitionRestRepositoryIT.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.app.rest;
 
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalToIgnoringCase;
@@ -17,6 +18,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.matcher.WorkflowDefinitionMatcher;
@@ -29,6 +31,7 @@ import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.xmlworkflow.factory.XmlWorkflowFactory;
 import org.dspace.xmlworkflow.factory.XmlWorkflowServiceFactory;
+import org.dspace.xmlworkflow.state.Step;
 import org.dspace.xmlworkflow.state.Workflow;
 import org.hamcrest.Matchers;
 import org.junit.Test;
@@ -436,6 +439,34 @@ public class WorkflowDefinitionRestRepositoryIT extends AbstractControllerIntegr
             .andExpect(jsonPath("$.page.totalElements", is(defaultWorkflow.getSteps().size())));
     }
 
+    @Test
+    public void getStepsOfWorkflowByName_DefaultWorkflow_Ordered() throws Exception {
+        String token = getAuthToken(eperson.getEmail(), password);
+        Workflow defaultWorkflow = xmlWorkflowFactory.getDefaultWorkflow();
+        List<Step> steps = defaultWorkflow.getSteps();
+
+        //When we call this facets endpoint
+        getClient(token).perform(get(WORKFLOW_DEFINITIONS_ENDPOINT + "/" + defaultWorkflow.getID()
+        + "/steps")
+                .param("projection", "full"))
+        //We expect a 200 OK status
+        .andExpect(status().isOk())
+        //Number of total workflows is equals to number of non-mapped collections
+        .andExpect(jsonPath("$.page.totalElements", is(steps.size())))
+        // assert the two list equality using ids (preserves order)
+        .andExpect(
+                jsonPath(
+                        "$._embedded.steps",
+                        contains(
+                                steps
+                                    .stream()
+                                    .map(WorkflowDefinitionMatcher::matchStep)
+                                    .collect(Collectors.toList())
+                        )
+                )
+        );
+    }
+
     @Test
     public void getStepsOfWorkflowByName_DefaultWorkflow_NoValidToken() throws Exception {
         String token = "NonValidToken";
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowItemRestRepositoryIT.java
index 6608812791..025a5f15a9 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowItemRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowItemRestRepositoryIT.java
@@ -768,6 +768,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
             WorkspaceItem wsitem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
                     .withTitle("Submission Item")
                     .withIssueDate("2017-10-17")
+                    .grantLicense()
                     .build();
 
             context.restoreAuthSystemState();
@@ -926,6 +927,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
             .withIssueDate("2017-10-17")
             .withAuthor("Smith, Donald").withAuthor("Doe, John")
             .withSubject("ExtraEntry")
+            .grantLicense()
             .build();
         claimedTask.setStepID("editstep");
         claimedTask.setActionID("editaction");
@@ -1053,6 +1055,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
             .withTitle("Workflow Item 1")
             .withIssueDate("2017-10-17")
             .withSubject("ExtraEntry")
+            .grantLicense()
             .build();
         claimedTask.setStepID("editstep");
         claimedTask.setActionID("editaction");
@@ -1122,6 +1125,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
             .withIssueDate("2017-10-17")
             .withAuthor("Smith, Donald").withAuthor("Doe, John")
             .withSubject("ExtraEntry")
+            .grantLicense()
             .build();
         claimedTask.setStepID("editstep");
         claimedTask.setActionID("editaction");
@@ -1134,6 +1138,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
             .withSubject("Subject2")
             .withSubject("Subject3")
             .withSubject("Subject4")
+            .grantLicense()
             .build();
         claimedTask2.setStepID("editstep");
         claimedTask2.setActionID("editaction");
@@ -1146,6 +1151,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
             .withSubject("Subject2")
             .withSubject("Subject3")
             .withSubject("Subject4")
+            .grantLicense()
             .build();
         claimedTask3.setStepID("editstep");
         claimedTask3.setActionID("editaction");
@@ -1320,6 +1326,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
         ClaimedTask claimedTask = ClaimedTaskBuilder.createClaimedTask(context, col1, eperson)
             .withIssueDate("2017-10-17")
             .withSubject("ExtraEntry")
+            .grantLicense()
             .build();
         claimedTask.setStepID("editstep");
         claimedTask.setActionID("editaction");
@@ -1390,6 +1397,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
             .withIssueDate("2017-10-17")
             .withAuthor("Smith, Donald").withAuthor("Doe, John")
             .withSubject("ExtraEntry")
+            .grantLicense()
             .build();
         claimedTask.setStepID("editstep");
         claimedTask.setActionID("editaction");
@@ -1862,7 +1870,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
     }
 
     @Test
-    public void whenWorkspaceitemBecomeWorkflowitemWithAccessConditionsTheBitstremMustBeDownloableTest()
+    public void whenWorkspaceitemBecomeWorkflowitemWithAccessConditionsTheBitstreamMustBeDownloableTest()
             throws Exception {
         context.turnOffAuthorisationSystem();
 
@@ -1890,14 +1898,13 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
 
         String bitstreamContent = "0123456789";
 
-        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
-
         try (InputStream is = IOUtils.toInputStream(bitstreamContent, Charset.defaultCharset())) {
 
             context.setCurrentUser(submitter);
             witem = WorkspaceItemBuilder.createWorkspaceItem(context, collection1)
                                         .withTitle("Test WorkspaceItem")
                                         .withIssueDate("2019-10-01")
+                                        .grantLicense()
                                         .build();
 
             bitstream = BitstreamBuilder.createBitstream(context, witem.getItem(), is)
@@ -1905,56 +1912,60 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
                                         .withDescription("This is a bitstream to test range requests")
                                         .withMimeType("text/plain")
                                         .build();
+        }
 
-            context.restoreAuthSystemState();
+        context.restoreAuthSystemState();
 
-            String tokenEPerson = getAuthToken(eperson.getEmail(), password);
-            String tokenSubmitter = getAuthToken(submitter.getEmail(), password);
-            String tokenReviewer1 = getAuthToken(reviewer1.getEmail(), password);
+        String tokenEPerson = getAuthToken(eperson.getEmail(), password);
+        String tokenSubmitter = getAuthToken(submitter.getEmail(), password);
+        String tokenReviewer1 = getAuthToken(reviewer1.getEmail(), password);
 
-            // submitter can download the bitstream
-            getClient(tokenSubmitter).perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
-                                     .andExpect(status().isOk())
-                                     .andExpect(header().string("Accept-Ranges", "bytes"))
-                                     .andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
-                                     .andExpect(content().contentType("text/plain"))
-                                     .andExpect(content().bytes(bitstreamContent.getBytes()));
+        // submitter can download the bitstream
+        getClient(tokenSubmitter).perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
+                                 .andExpect(status().isOk())
+                                 .andExpect(header().string("Accept-Ranges", "bytes"))
+                                 .andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
+                                 .andExpect(content().contentType("text/plain;charset=UTF-8"))
+                                 .andExpect(content().bytes(bitstreamContent.getBytes()));
 
-            // reviewer can't still download the bitstream
-            getClient(tokenReviewer1).perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
-                                     .andExpect(status().isForbidden());
+        // reviewer can't still download the bitstream
+        getClient(tokenReviewer1).perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
+                                 .andExpect(status().isForbidden());
 
-            // others can't download the bitstream
-            getClient(tokenEPerson).perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
-                                   .andExpect(status().isForbidden());
+        // others can't download the bitstream
+        getClient(tokenEPerson).perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content"))
+                               .andExpect(status().isForbidden());
 
-            // create a list of values to use in add operation
-            List<Operation> addAccessCondition = new ArrayList<>();
-            List<Map<String, String>> accessConditions = new ArrayList<Map<String,String>>();
+        // create a list of values to use in add operation
+        List<Operation> addAccessCondition = new ArrayList<>();
+        List<Map<String, String>> accessConditions = new ArrayList<Map<String,String>>();
 
-            Map<String, String> value = new HashMap<>();
-            value.put("name", "administrator");
+        Map<String, String> value = new HashMap<>();
+        value.put("name", "administrator");
 
-            accessConditions.add(value);
+        accessConditions.add(value);
 
-            addAccessCondition.add(new AddOperation("/sections/upload/files/0/accessConditions", accessConditions));
+        addAccessCondition.add(new AddOperation("/sections/upload/files/0/accessConditions", accessConditions));
 
-            String patchBody = getPatchContent(addAccessCondition);
-            getClient(tokenSubmitter).perform(patch("/api/submission/workspaceitems/" + witem.getID())
-                     .content(patchBody)
-                     .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
-                     .andExpect(status().isOk())
-                     .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].name",is("administrator")))
-                     .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].startDate",nullValue()))
-                     .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].endDate", nullValue()));
+        String patchBody = getPatchContent(addAccessCondition);
+        getClient(tokenSubmitter).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                 .content(patchBody)
+                 .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                 .andExpect(status().isOk())
+                 .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].name",is("administrator")))
+                 .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].startDate",nullValue()))
+                 .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].endDate", nullValue()));
 
-            // verify that the patch changes have been persisted
-            getClient(tokenSubmitter).perform(get("/api/submission/workspaceitems/" + witem.getID()))
-                     .andExpect(status().isOk())
-                     .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].name",is("administrator")))
-                     .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].startDate",nullValue()))
-                     .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].endDate", nullValue()));
+        // verify that the patch changes have been persisted
+        getClient(tokenSubmitter).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                 .andExpect(status().isOk())
+                 .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].name",is("administrator")))
+                 .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].startDate",nullValue()))
+                 .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].endDate", nullValue()));
 
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+
+        try {
             // submit the workspaceitem to start the workflow
             getClient(tokenSubmitter).perform(post(BASE_REST_SERVER_URL + "/api/workflow/workflowitems")
                      .content("/api/submission/workspaceitems/" + witem.getID())
@@ -1976,7 +1987,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
                      .andExpect(status().isOk())
                      .andExpect(header().string("Accept-Ranges", "bytes"))
                      .andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
-                     .andExpect(content().contentType("text/plain"))
+                     .andExpect(content().contentType("text/plain;charset=UTF-8"))
                      .andExpect(content().bytes(bitstreamContent.getBytes()));
 
             // submitter can download the bitstream
@@ -1984,7 +1995,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
                      .andExpect(status().isOk())
                      .andExpect(header().string("Accept-Ranges", "bytes"))
                      .andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
-                     .andExpect(content().contentType("text/plain"))
+                     .andExpect(content().contentType("text/plain;charset=UTF-8"))
                      .andExpect(content().bytes(bitstreamContent.getBytes()));
 
             // others can't download the bitstream
@@ -2024,6 +2035,7 @@ public class WorkflowItemRestRepositoryIT extends AbstractControllerIntegrationT
         WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, collection1)
                                     .withTitle("Test WorkspaceItem")
                                     .withIssueDate("2019-10-01")
+                                    .grantLicense()
                                     .build();
 
         UUID itemUuid = witem.getItem().getID();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java
index 91847bd50f..4a9f03ffff 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java
@@ -10,17 +10,20 @@ package org.dspace.app.rest;
 import static com.jayway.jsonpath.JsonPath.read;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
+import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
 import static org.dspace.authorize.ResourcePolicy.TYPE_CUSTOM;
 import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertTrue;
 import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE;
 import static org.springframework.http.MediaType.parseMediaType;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -43,6 +46,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.matchers.JsonPathMatchers;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.dspace.app.rest.matcher.CollectionMatcher;
@@ -330,16 +334,16 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                 WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem2, "Workspace Item 2",
                                         "2016-02-13"))))
                 .andExpect(jsonPath("$._embedded.workspaceitems",
-                        Matchers.not(Matchers.contains(WorkspaceItemMatcher
+                        Matchers.not(contains(WorkspaceItemMatcher
                                 .matchItemWithTitleAndDateIssued(workspaceItem3, "Workspace Item 3", "2016-02-13")))));
 
         getClient(token).perform(get("/api/submission/workspaceitems").param("size", "2").param("page", "1"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.workspaceitems",
-                        Matchers.contains(WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem3,
+                        contains(WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem3,
                                 "Workspace Item 3", "2016-02-13"))))
                 .andExpect(jsonPath("$._embedded.workspaceitems",
-                        Matchers.not(Matchers.contains(
+                        Matchers.not(contains(
                                 WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem1, "Workspace Item 1",
                                         "2017-10-17"),
                                 WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem2, "Workspace Item 2",
@@ -370,7 +374,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
                 .withTitle("Workspace Item 1")
                 .withIssueDate("2017-10-17")
-                .withAuthor("Smith, Donald").withAuthor("Doe, John")
+                .withAuthor("Smith, Donald")
+                .withIssn("222731-0582")
+                .withAuthor("Doe, John")
                 .withSubject("ExtraEntry")
                 .build();
 
@@ -724,7 +730,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                             WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem2, "Workspace Item 2",
                                     "2016-02-13"))))
             .andExpect(jsonPath("$._embedded.workspaceitems",
-                    Matchers.not(Matchers.contains(WorkspaceItemMatcher
+                    Matchers.not(contains(WorkspaceItemMatcher
                             .matchItemWithTitleAndDateIssued(workspaceItem3, "Workspace Item 3", "2016-02-13")))))
             .andExpect(jsonPath("$.page.size", is(20)))
             .andExpect(jsonPath("$.page.totalElements", is(2)));
@@ -737,10 +743,10 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .param("uuid", submitter1.getID().toString()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.workspaceitems",
-                    Matchers.contains(WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem2,
+                    contains(WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem2,
                             "Workspace Item 2", "2016-02-13"))))
             .andExpect(jsonPath("$._embedded.workspaceitems",
-                    Matchers.not(Matchers.contains(
+                    Matchers.not(contains(
                             WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem1, "Workspace Item 1",
                                     "2017-10-17"),
                             WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem3, "Workspace Item 3",
@@ -755,7 +761,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .param("uuid", submitter2.getID().toString()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.workspaceitems",
-                    Matchers.contains(
+                    contains(
                             WorkspaceItemMatcher.matchItemWithTitleAndDateIssued(workspaceItem3, "Workspace Item 3",
                                     "2016-02-13"))))
             .andExpect(jsonPath("$.page.size", is(20)))
@@ -933,7 +939,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         String authToken = getAuthToken(eperson.getEmail(), password);
         try {
             // create a workspaceitem from a single bibliographic entry file explicitly in the default collection (col1)
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(bibtexFile))
                 // create should return 200, 201 (created) is better for single resource
                 .andExpect(status().isOk())
@@ -961,7 +967,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create a workspaceitem from a single bibliographic entry file explicitly in the col2
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(bibtexFile)
                     .param("owningCollection", col2.getID().toString()))
                 .andExpect(status().isOk())
@@ -989,6 +995,305 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         bibtex.close();
     }
 
+    @Test
+    /**
+     * Test the creation of workspaceitems POSTing to the resource collection endpoint a bibtex file
+     *
+     * @throws Exception
+     */
+    public void createSingleWorkspaceItemFromBibtexArticleFileWithOneEntryTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and two collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                .withName("Sub Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1)
+                .withName("Collection 1")
+                .withSubmitterGroup(eperson)
+                .build();
+        Collection col2 = CollectionBuilder.createCollection(context, child1)
+                .withName("Collection 2")
+                .withSubmitterGroup(eperson)
+                .build();
+
+        InputStream bibtex = getClass().getResourceAsStream("bibtex-test-article.bib");
+        final MockMultipartFile bibtexFile = new MockMultipartFile("file", "/local/path/bibtex-test-article.bib",
+                "application/x-bibtex", bibtex);
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<List<Integer>> idRef = new AtomicReference<>();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        try {
+            // create a workspaceitem from a single bibliographic entry file explicitly in the default collection (col1)
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
+                            .file(bibtexFile))
+                    // create should return 200, 201 (created) is better for single resource
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.title'][0].value",
+                            is("My Article")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.type'][0].value",
+                            is("article")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[0]._embedded.collection.id",
+                                    is(col1.getID().toString())))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.source'][0].value",
+                            is("/local/path/bibtex-test-article.bib")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.title'][0].value",
+                            is("bibtex-test-article.bib")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[*]._embedded.upload").doesNotExist())
+                    .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                            "$._embedded.workspaceitems[*].id")));
+        } finally {
+            if (idRef != null && idRef.get() != null) {
+                for (int i : idRef.get()) {
+                    WorkspaceItemBuilder.deleteWorkspaceItem(i);
+                }
+            }
+        }
+
+        // create a workspaceitem from a single bibliographic entry file explicitly in the col2
+        try {
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
+                            .file(bibtexFile)
+                            .param("owningCollection", col2.getID().toString()))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.title'][0].value",
+                            is("My Article")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.type'][0].value",
+                            is("article")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[0]._embedded.collection.id",
+                                    is(col2.getID().toString())))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.source'][0].value",
+                            is("/local/path/bibtex-test-article.bib")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload"
+                                    + ".files[0].metadata['dc.title'][0].value",
+                            is("bibtex-test-article.bib")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[*]._embedded.upload").doesNotExist())
+                    .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                            "$._embedded.workspaceitems[*].id")));
+        } finally {
+            if (idRef != null && idRef.get() != null) {
+                for (int i : idRef.get()) {
+                    WorkspaceItemBuilder.deleteWorkspaceItem(i);
+                }
+            }
+        }
+        bibtex.close();
+    }
+
+    @Test
+    public void createSingleWorkspaceItemFromBibtexFileWithDiacriticsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and two collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                .withName("Sub Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1)
+                .withName("Collection 1")
+                .withSubmitterGroup(eperson)
+                .build();
+        Collection col2 = CollectionBuilder.createCollection(context, child1)
+                .withName("Collection 2")
+                .withSubmitterGroup(eperson)
+                .build();
+
+        InputStream bibtex = getClass().getResourceAsStream("bibtex-test-diacritics.bib");
+        final MockMultipartFile bibtexFile = new MockMultipartFile("file", "/local/path/bibtex-test-diacritics.bib",
+                "application/x-bibtex", bibtex);
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<List<Integer>> idRef = new AtomicReference<>();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        try {
+            // create a workspaceitem from a single bibliographic entry file explicitly in the default collection (col1)
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
+                            .file(bibtexFile))
+                    // create should return 200, 201 (created) is better for single resource
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections." +
+                                    "traditionalpageone['dc.title'][0].value",
+                            is("The German umlauts: ÄÖüß")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[0]._embedded.collection.id",
+                                    is(col1.getID().toString())))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.source'][0].value",
+                            is("/local/path/bibtex-test-diacritics.bib")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.title'][0].value",
+                            is("bibtex-test-diacritics.bib")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[*]._embedded.upload").doesNotExist())
+                    .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                            "$._embedded.workspaceitems[*].id")));
+        } finally {
+            if (idRef != null && idRef.get() != null) {
+                for (int i : idRef.get()) {
+                    WorkspaceItemBuilder.deleteWorkspaceItem(i);
+                }
+            }
+        }
+
+        // create a workspaceitem from a single bibliographic entry file explicitly in the col2
+        try {
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
+                            .file(bibtexFile)
+                            .param("owningCollection", col2.getID().toString()))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections." +
+                                    "traditionalpageone['dc.title'][0].value",
+                            is("The German umlauts: ÄÖüß")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[0]._embedded.collection.id",
+                                    is(col2.getID().toString())))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.source'][0].value",
+                            is("/local/path/bibtex-test-diacritics.bib")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload"
+                                    + ".files[0].metadata['dc.title'][0].value",
+                            is("bibtex-test-diacritics.bib")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[*]._embedded.upload").doesNotExist())
+                    .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                            "$._embedded.workspaceitems[*].id")));
+        } finally {
+            if (idRef != null && idRef.get() != null) {
+                for (int i : idRef.get()) {
+                    WorkspaceItemBuilder.deleteWorkspaceItem(i);
+                }
+            }
+        }
+        bibtex.close();
+    }
+
+    @Test
+    /**
+     * Test the creation of workspaceitems POSTing to the resource collection endpoint a bibtex file
+     *
+     * @throws Exception
+     */
+    public void createSingleWorkspaceItemFromBibtexFileWithMultipleAuthorsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and two collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                .withName("Sub Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1)
+                .withName("Collection 1")
+                .withSubmitterGroup(eperson)
+                .build();
+        Collection col2 = CollectionBuilder.createCollection(context, child1)
+                .withName("Collection 2")
+                .withSubmitterGroup(eperson)
+                .build();
+
+        InputStream bibtex = getClass().getResourceAsStream("bibtex-test-multiple-authors.bib");
+        final MockMultipartFile bibtexFile = new MockMultipartFile("file",
+                "/local/path/bibtex-test-multiple-authors.bib",
+                "application/x-bibtex", bibtex);
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<List<Integer>> idRef = new AtomicReference<>();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        try {
+            // create a workspaceitem from a single bibliographic entry file explicitly in the default collection (col1)
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
+                            .file(bibtexFile))
+                    // create should return 200, 201 (created) is better for single resource
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.title'][0].value",
+                            is("My Article")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.contributor.author'][0].value",
+                            is("A. Nauthor")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.contributor.author'][1].value",
+                            is("A. Nother")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.contributor.author'][2].value",
+                            is("A. Third")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[0]._embedded.collection.id",
+                                    is(col1.getID().toString())))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.source'][0].value",
+                            is("/local/path/bibtex-test-multiple-authors.bib")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.title'][0].value",
+                            is("bibtex-test-multiple-authors.bib")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[*]._embedded.upload").doesNotExist())
+                    .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                            "$._embedded.workspaceitems[*].id")));
+        } finally {
+            if (idRef != null && idRef.get() != null) {
+                for (int i : idRef.get()) {
+                    WorkspaceItemBuilder.deleteWorkspaceItem(i);
+                }
+            }
+        }
+
+        // create a workspaceitem from a single bibliographic entry file explicitly in the col2
+        try {
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
+                            .file(bibtexFile)
+                            .param("owningCollection", col2.getID().toString()))
+                    .andExpect(status().isOk())
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0]" +
+                                    ".sections.traditionalpageone['dc.title'][0].value",
+                            is("My Article")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[0]._embedded.collection.id",
+                                    is(col2.getID().toString())))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload.files[0]"
+                                    + ".metadata['dc.source'][0].value",
+                            is("/local/path/bibtex-test-multiple-authors.bib")))
+                    .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.upload"
+                                    + ".files[0].metadata['dc.title'][0].value",
+                            is("bibtex-test-multiple-authors.bib")))
+                    .andExpect(
+                            jsonPath("$._embedded.workspaceitems[*]._embedded.upload").doesNotExist())
+                    .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                            "$._embedded.workspaceitems[*].id")));
+        } finally {
+            if (idRef != null && idRef.get() != null) {
+                for (int i : idRef.get()) {
+                    WorkspaceItemBuilder.deleteWorkspaceItem(i);
+                }
+            }
+        }
+        bibtex.close();
+    }
+
     @Test
     /**
      * Test the creation of workspaceitems POSTing to the resource collection endpoint a csv file
@@ -1025,7 +1330,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         // create workspaceitems in the default collection (col1)
         AtomicReference<List<Integer>> idRef = new AtomicReference<>();
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(csvFile))
                 // create should return 200, 201 (created) is better for single resource
                 .andExpect(status().isOk())
@@ -1064,7 +1369,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create workspaceitems explicitly in the col2
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(csvFile)
                     .param("owningCollection", col2.getID().toString()))
                     .andExpect(status().isOk())
@@ -1142,7 +1447,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         // create workspaceitems in the default collection (col1)
 
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                 .file(csvFile))
             // create should return 200, 201 (created) is better for single resource
             .andExpect(status().isOk())
@@ -1220,7 +1525,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create workspaceitems in the default collection (col1)
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(tsvFile))
                 // create should return 200, 201 (created) is better for single resource
                 .andExpect(status().isOk())
@@ -1296,7 +1601,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create workspaceitems in the default collection (col1)
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(tsvFile))
                 // create should return 200, 201 (created) is better for single resource
                 .andExpect(status().isOk())
@@ -1373,7 +1678,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         AtomicReference<List<Integer>> idRef = new AtomicReference<>();
         // create workspaceitems in the default collection (col1)
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(endnoteFile))
                 // create should return 200, 201 (created) is better for single resource
                 .andExpect(status().isOk())
@@ -1452,7 +1757,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create workspaceitems in the default collection (col1)
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                 .file(csvFile))
             // create should return 200, 201 (created) is better for single resource
             .andExpect(status().isOk())
@@ -1533,7 +1838,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create a workspaceitem from a single bibliographic entry file explicitly in the default collection (col1)
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(bibtexFile).file(pubmedFile))
                 // create should return 200, 201 (created) is better for single resource
                 .andExpect(status().isOk())
@@ -1567,7 +1872,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create a workspaceitem from a single bibliographic entry file explicitly in the col2
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(bibtexFile).file(pubmedFile)
                     .param("owningCollection", col2.getID().toString()))
                 .andExpect(status().isOk())
@@ -1639,7 +1944,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         String authToken = getAuthToken(eperson.getEmail(), password);
 
         // create a workspaceitem from a single bibliographic entry file explicitly in the default collection (col1)
-        getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+        getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(bibtexFile))
                   // create should return return a 422 because we don't allow/support bibliographic files
                  // that have multiple metadata records
@@ -1684,7 +1989,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create a workspaceitem from a single bibliographic entry file explicitly in the default collection (col1)
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(pubmedFile))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.workspaceitems[0].sections.traditionalpageone['dc.title'][0].value",
@@ -1715,7 +2020,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // create a workspaceitem from a single bibliographic entry file explicitly in the col2
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(pubmedFile)
                     .param("owningCollection", col2.getID().toString()))
             .andExpect(status().isOk())
@@ -1775,7 +2080,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         context.restoreAuthSystemState();
 
         // create a workspaceitem
-        getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+        getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                     .file(pdfFile))
                 // create should return 200, 201 (created) is better for single resource
                 .andExpect(status().isOk())
@@ -1823,10 +2128,12 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         WorkspaceItem workspaceItem1 = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
                 .withTitle("Workspace Item 1")
                 .withIssueDate("2017-10-17")
+                .grantLicense()
                 .build();
 
         WorkspaceItem workspaceItem2 = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
                 .withTitle("Workspace Item 2")
+                .grantLicense()
                 .build();
 
         //disable file upload mandatory
@@ -1845,8 +2152,8 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         getClient(authToken).perform(get("/api/submission/workspaceitems/" + workspaceItem2.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.errors[?(@.message=='error.validation.required')]",
-                        Matchers.contains(
-                                hasJsonPath("$.paths", Matchers.contains(
+                        contains(
+                                hasJsonPath("$.paths", contains(
                                         hasJsonPath("$", Matchers.is("/sections/traditionalpageone/dc.date.issued"))
                                 )))))
         ;
@@ -1859,7 +2166,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 // title and dateissued are required in the first panel
                 // the json path with a @ selector always return an array
                 .andExpect(jsonPath("$.errors[?(@.message=='error.validation.required')]",
-                        Matchers.contains(
+                        contains(
                                 hasJsonPath("$.paths", Matchers.containsInAnyOrder(
                                         hasJsonPath("$", Matchers.is("/sections/traditionalpageone/dc.title")),
                                         hasJsonPath("$", Matchers.is("/sections/traditionalpageone/dc.date.issued"))
@@ -1895,6 +2202,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .withTitle("Workspace Item 1")
                 .withIssueDate("2017-10-17")
                 .withSubject("ExtraEntry")
+                .grantLicense()
                 .build();
 
         //disable file upload mandatory
@@ -1930,6 +2238,303 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         ;
     }
 
+    @Test
+    /**
+     * Test the update of metadata for fields configured with type-bind
+     *
+     * @throws Exception
+     */
+    public void patchUpdateMetadataWithBindTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and two collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                .withName("Sub Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                .withSubmitter(eperson)
+                .withTitle("Workspace Item 1")
+                .withIssueDate("2017-10-17")
+                .withSubject("ExtraEntry")
+                .grantLicense()
+                .build();
+
+        //disable file upload mandatory
+        configurationService.setProperty("webui.submit.upload.required", false);
+
+        context.restoreAuthSystemState();
+
+        // Try to add isPartOfSeries (type bound to technical report) - this should not work and instead we'll get
+        // no JSON path for that field
+        List<Operation> updateSeries = new ArrayList<Operation>();
+        List<Map<String, String>> seriesValues = new ArrayList<>();
+        Map<String, String> value = new HashMap<String, String>();
+        value.put("value", "New Series");
+        seriesValues.add(value);
+        updateSeries.add(new AddOperation("/sections/traditionalpageone/dc.relation.ispartofseries", seriesValues));
+
+        String patchBody = getPatchContent(updateSeries);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should match an item with no series or type
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeAndSeries(witem, null, null))));
+
+        // Verify that the metadata isn't in the workspace item
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should match an item with no series or type
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeAndSeries(witem, null, null))));
+
+        // Set the type to Technical Report confirm it worked
+        List<Operation> updateType = new ArrayList<>();
+        List<Map<String, String>> typeValues = new ArrayList<>();
+        value = new HashMap<String, String>();
+        value.put("value", "Technical Report");
+        typeValues.add(value);
+        updateType.add(new AddOperation("/sections/traditionalpageone/dc.type", typeValues));
+        patchBody = getPatchContent(updateType);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should now match an item with the expected type and series
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeAndSeries(witem, "Technical Report",
+                                null))));
+
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeAndSeries(witem, "Technical Report",
+                                null))));
+
+        // Another test, this time adding the series value should be successful and we'll see the value
+        patchBody = getPatchContent(updateSeries);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should match an item with the expected series and type
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeAndSeries(witem,
+                                "Technical Report", "New Series"))));
+
+        // Verify that the metadata isn't in the workspace item
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should match an item with the expected series and type
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeAndSeries(witem,
+                                "Technical Report", "New Series"))));
+
+        // One final update, to a different type, this should lose the series as we're back to a non-matching type
+        updateType = new ArrayList<>();
+        typeValues = new ArrayList<>();
+        value = new HashMap<String, String>();
+        value.put("value", "Article");
+        typeValues.add(value);
+        updateType.add(new AddOperation("/sections/traditionalpageone/dc.type", typeValues));
+        patchBody = getPatchContent(updateType);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should NOT match an item with the series "New Series"
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeAndSeries(witem, "Article",
+                                null))));
+
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeAndSeries(witem, "Article",
+                                null))));
+
+        // Submit the workspace item to complete the deposit (as there is no workflow configured) and ensure a
+        // successful result with no validation errors
+        getClient(authToken)
+                .perform(post(BASE_REST_SERVER_URL + "/api/workflow/workflowitems")
+                        .content("/api/submission/workspaceitems/" + witem.getID())
+                        .contentType(textUriContentType))
+                .andExpect(status().isCreated());
+    }
+
+    @Test
+    /**
+     * Test the update of metadata for fields configured with type-bind in the specific case where
+     * a field is configured more than once and could be bound to one type in a certain case, and another type
+     * later on (perhaps with a different label or validation rules)
+     *
+     * @throws Exception
+     */
+    public void patchUpdateMetadataWithBindForRepeatedFieldConfigurationTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        String testIsbnString = "978-3-16-148410-0";
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and two collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                .withName("Sub Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1, "123456789/typebind-test")
+                .withName("Collection 1").build();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                .withSubmitter(eperson)
+                .withTitle("Workspace Item 1")
+                .withIssueDate("2017-10-17")
+                .withSubject("ExtraEntry")
+                .grantLicense()
+                .build();
+
+        //disable file upload mandatory
+        configurationService.setProperty("webui.submit.upload.required", false);
+
+        context.restoreAuthSystemState();
+
+        // Try to add ISBN (type bound to book and book chapter) - this should not work and instead we'll get
+        // no JSON path for that field, because this item has no type yet
+        List<Operation> updateOperations = new ArrayList<Operation>();
+        List<Map<String, String>> updateValues = new ArrayList<>();
+        Map<String, String> value = new HashMap<String, String>();
+        value.put("value", "978-3-16-148410-0");
+        updateValues.add(value);
+        updateOperations.add(new AddOperation("/sections/typebindtest/dc.identifier.isbn", updateValues));
+
+        String patchBody = getPatchContent(updateOperations);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should match an item with no series or ISBN
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeFieldAndValue
+                                (witem, "typebindtest",null, "dc.identifier.isbn", null))));
+
+        // Verify that the metadata isn't in the workspace item
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeFieldAndValue
+                                (witem, "typebindtest", null, "dc.identifier.isbn", null))));
+
+        // Set the type to Book (which ISBN is bound to, in one of the two configurations)
+        List<Operation> updateType = new ArrayList<>();
+        List<Map<String, String>> typeValues = new ArrayList<>();
+        value = new HashMap<String, String>();
+        value.put("value", "Book");
+        typeValues.add(value);
+        updateType.add(new AddOperation("/sections/typebindtest/dc.type", typeValues));
+        patchBody = getPatchContent(updateType);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+//                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should now match an item with the expected type and no ISBN
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeFieldAndValue(witem,
+                                "typebindtest","Book", "dc.identifier.isbn", null))));
+
+        // Fetch workspace item and confirm type has persisted
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                .andExpect(status().isOk())
+//                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeFieldAndValue(witem,
+                                "typebindtest", "Book", "dc.identifier.isbn", null))));
+
+        // Now we test that the validate process does NOT strip out ISBN metadata while it's analysing the
+        // Book Chapter input config, even though that <type-bind> won't match the current item type (Book)
+        patchBody = getPatchContent(updateOperations);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should now match an item with the expected type and the test ISBN
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeFieldAndValue(witem, "typebindtest",
+                                "Book", "dc.identifier.isbn", testIsbnString))));
+
+        // Verify that the metadata is persisted
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeFieldAndValue(witem, "typebindtest",
+                                "Book","dc.identifier.isbn", testIsbnString))));
+
+        // Switch type to "Book chapter" - this is also bound to ISBN in a second configuration of the field
+        // And should allow us to preserve the ISBN that was set while the type was Book
+        updateType = new ArrayList<>();
+        typeValues = new ArrayList<>();
+        value = new HashMap<String, String>();
+        value.put("value", "Book chapter");
+        typeValues.add(value);
+        updateType.add(new AddOperation("/sections/typebindtest/dc.type", typeValues));
+        patchBody = getPatchContent(updateType);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        // Check this - we should now match an item with the expected type and no ISBN
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeFieldAndValue(witem,"typebindtest",
+                                "Book chapter", "dc.identifier.isbn", testIsbnString))));
+
+        // Fetch workspace item and confirm type has persisted
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist())
+                .andExpect(jsonPath("$",
+                        Matchers.is(WorkspaceItemMatcher.matchItemWithTypeFieldAndValue(witem,
+                                "typebindtest", "Book chapter", "dc.identifier.isbn", testIsbnString))));
+
+        // Submit the workspace item to complete the deposit (as there is no workflow configured) and ensure a
+        // successful result with no validation errors
+        getClient(authToken)
+                .perform(post(BASE_REST_SERVER_URL + "/api/workflow/workflowitems")
+                        .content("/api/submission/workspaceitems/" + witem.getID())
+                        .contentType(textUriContentType))
+                .andExpect(status().isCreated());
+    }
+
     @Test
     public void patchUpdateMetadataForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -2187,6 +2792,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .withTitle("Workspace Item 1")
                 .withIssueDate("2017-10-17")
                 .withSubject("ExtraEntry")
+                .grantLicense()
                 .build();
 
         WorkspaceItem witemMultipleSubjects = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
@@ -2196,6 +2802,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .withSubject("Subject2")
                 .withSubject("Subject3")
                 .withSubject("Subject4")
+                .grantLicense()
                 .build();
 
         WorkspaceItem witemWithTitleDateAndSubjects = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
@@ -2205,6 +2812,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .withSubject("Subject2")
                 .withSubject("Subject3")
                 .withSubject("Subject4")
+                .grantLicense()
                 .build();
 
         context.restoreAuthSystemState();
@@ -2219,8 +2827,8 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
                             .andExpect(status().isOk())
                             .andExpect(jsonPath("$.errors[?(@.message=='error.validation.required')]",
-                                Matchers.contains(hasJsonPath("$.paths",
-                                        Matchers.contains(
+                                contains(hasJsonPath("$.paths",
+                                        contains(
                                                 hasJsonPath("$",
                                                         Matchers.is("/sections/traditionalpageone/dc.title")))))))
                             .andExpect(jsonPath("$",
@@ -2232,8 +2840,8 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.errors[?(@.message=='error.validation.required')]",
-                    Matchers.contains(
-                            hasJsonPath("$.paths", Matchers.contains(
+                    contains(
+                            hasJsonPath("$.paths", contains(
                                     hasJsonPath("$", Matchers.is("/sections/traditionalpageone/dc.title"))
                             )))))
             .andExpect(jsonPath("$",
@@ -2467,6 +3075,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
                 .withIssueDate("2017-10-17")
                 .withSubject("ExtraEntry")
+                .grantLicense()
                 .build();
 
         //disable file upload mandatory
@@ -2515,6 +3124,77 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         ;
     }
 
+    @Test
+    /**
+     * Test the addition of metadata of a null value
+     *
+     * @throws Exception
+     */
+    public void patchAddMetadataNullValueTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and two collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                .withIssueDate("2017-10-17")
+                .withSubject("ExtraEntry")
+                .grantLicense()
+                .build();
+
+        //disable file upload mandatory
+        configurationService.setProperty("webui.submit.upload.required", false);
+
+        context.restoreAuthSystemState();
+
+        // try to add the title
+        List<Operation> operations = new ArrayList<Operation>();
+        // create a list of values to use in add operation
+        List<Map<String, String>> titelValues = new ArrayList<Map<String, String>>();
+        List<Map<String, String>> uriValues = new ArrayList<Map<String, String>>();
+        Map<String, String> value = new HashMap<String, String>();
+        Map<String, String> value2 = new HashMap<String, String>();
+        value.put("value", "New Title");
+        value2.put("value", null);
+        titelValues.add(value);
+        uriValues.add(value2);
+        operations.add(new AddOperation("/sections/traditionalpageone/dc.title", titelValues));
+        operations.add(new AddOperation("/sections/traditionalpageone/dc.identifier.uri", uriValues));
+
+        String patchBody = getPatchContent(operations);
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.errors").doesNotExist())
+                            .andExpect(jsonPath("$",
+                                    // check if the new title if back and the other values untouched
+                                    Matchers.is(WorkspaceItemMatcher.matchItemWithTitleAndDateIssuedAndSubject(witem,
+                                            "New Title", "2017-10-17", "ExtraEntry"))))
+                            .andExpect(jsonPath("$", JsonPathMatchers
+                                    .hasNoJsonPath("$.sections.traditionalpageone['dc.identifier.uri']")));
+
+
+        // verify that the patch changes have been persisted
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.errors").doesNotExist())
+            .andExpect(jsonPath("$",
+                    Matchers.is(WorkspaceItemMatcher.matchItemWithTitleAndDateIssuedAndSubject(witem,
+                            "New Title", "2017-10-17", "ExtraEntry"))))
+            .andExpect(jsonPath("$", JsonPathMatchers
+                    .hasNoJsonPath("$.sections.traditionalpageone['dc.identifier.uri']")))
+        ;
+    }
+
     @Test
     public void patchAddMetadataUpdateExistValueTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -2678,6 +3358,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
                 .withTitle("Test WorkspaceItem")
                 .withIssueDate("2017-10-17")
+                .grantLicense()
                 .build();
 
         //disable file upload mandatory
@@ -3083,7 +3764,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .content(patchBody)
                 .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
                             .andExpect(status().isOk())
-                            .andExpect(jsonPath("$.errors").doesNotExist())
+                            .andExpect(jsonPath("$.errors[?(@.message=='error.validation.license.notgranted')]",
+                                contains( hasJsonPath("$.paths",
+                                    contains(hasJsonPath("$", is("/sections/license")))))))
                             .andExpect(jsonPath("$.sections.license.granted",
                                     is(false)))
                             .andExpect(jsonPath("$.sections.license.acceptanceDate").isEmpty())
@@ -3093,7 +3776,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         // verify that the patch changes have been persisted
         getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
             .andExpect(status().isOk())
-            .andExpect(jsonPath("$.errors").doesNotExist())
+            .andExpect(jsonPath("$.errors[?(@.message=='error.validation.license.notgranted')]",
+                    contains( hasJsonPath("$.paths",
+                        contains(hasJsonPath("$", is("/sections/license")))))))
             .andExpect(jsonPath("$.sections.license.granted",
                     is(false)))
             .andExpect(jsonPath("$.sections.license.acceptanceDate").isEmpty())
@@ -3109,7 +3794,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .content(patchBody)
                 .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
                             .andExpect(status().isOk())
-                            .andExpect(jsonPath("$.errors").doesNotExist())
+                            .andExpect(jsonPath("$.errors[?(@.message=='error.validation.license.notgranted')]",
+                                    contains( hasJsonPath("$.paths",
+                                        contains(hasJsonPath("$", is("/sections/license")))))))
                             .andExpect(jsonPath("$.sections.license.granted",
                                     is(false)))
                             .andExpect(jsonPath("$.sections.license.acceptanceDate").isEmpty())
@@ -3119,7 +3806,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         // verify that the patch changes have been persisted
         getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem2.getID()))
             .andExpect(status().isOk())
-            .andExpect(jsonPath("$.errors").doesNotExist())
+            .andExpect(jsonPath("$.errors[?(@.message=='error.validation.license.notgranted')]",
+                    contains( hasJsonPath("$.paths",
+                        contains(hasJsonPath("$", is("/sections/license")))))))
             .andExpect(jsonPath("$.sections.license.granted",
                     is(false)))
             .andExpect(jsonPath("$.sections.license.acceptanceDate").isEmpty())
@@ -3135,7 +3824,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .content(patchBody)
                 .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
                             .andExpect(status().isOk())
-                            .andExpect(jsonPath("$.errors").doesNotExist())
+                            .andExpect(jsonPath("$.errors[?(@.message=='error.validation.license.notgranted')]",
+                                contains( hasJsonPath("$.paths",
+                                    contains(hasJsonPath("$", is("/sections/license")))))))
                             .andExpect(jsonPath("$.sections.license.granted",
                                     is(false)))
                             .andExpect(jsonPath("$.sections.license.acceptanceDate").isEmpty())
@@ -3145,7 +3836,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         // verify that the patch changes have been persisted
         getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem3.getID()))
             .andExpect(status().isOk())
-            .andExpect(jsonPath("$.errors").doesNotExist())
+            .andExpect(jsonPath("$.errors[?(@.message=='error.validation.license.notgranted')]",
+                    contains( hasJsonPath("$.paths",
+                        contains(hasJsonPath("$", is("/sections/license")))))))
             .andExpect(jsonPath("$.sections.license.granted",
                     is(false)))
             .andExpect(jsonPath("$.sections.license.acceptanceDate").isEmpty())
@@ -3161,7 +3854,10 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                 .content(patchBody)
                 .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
                             .andExpect(status().isOk())
-                            .andExpect(jsonPath("$.errors").doesNotExist())
+                            .andExpect(
+                                jsonPath("$.errors[?(@.message=='error.validation.license.notgranted')]",
+                                    contains( hasJsonPath("$.paths",
+                                        contains(hasJsonPath("$", is("/sections/license")))))))
                             .andExpect(jsonPath("$.sections.license.granted",
                                     is(false)))
                             .andExpect(jsonPath("$.sections.license.acceptanceDate").isEmpty())
@@ -3171,7 +3867,9 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         // verify that the patch changes have been persisted
         getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem4.getID()))
             .andExpect(status().isOk())
-            .andExpect(jsonPath("$.errors").doesNotExist())
+            .andExpect(jsonPath("$.errors[?(@.message=='error.validation.license.notgranted')]",
+                contains( hasJsonPath("$.paths",
+                    contains(hasJsonPath("$", is("/sections/license")))))))
             .andExpect(jsonPath("$.sections.license.granted",
                     is(false)))
             .andExpect(jsonPath("$.sections.license.acceptanceDate").isEmpty())
@@ -3420,7 +4118,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         context.restoreAuthSystemState();
 
         // upload the file in our workspaceitem
-        getClient(authToken).perform(fileUpload("/api/submission/workspaceitems/" + witem.getID())
+        getClient(authToken).perform(multipart("/api/submission/workspaceitems/" + witem.getID())
                 .file(pdfFile))
                     .andExpect(status().isCreated())
                     .andExpect(jsonPath("$.sections.upload.files[0].metadata['dc.title'][0].value",
@@ -3463,7 +4161,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         context.restoreAuthSystemState();
 
         // upload the file in our workspaceitem
-        getClient().perform(fileUpload("/api/submission/workspaceitems/" + witem.getID())
+        getClient().perform(multipart("/api/submission/workspaceitems/" + witem.getID())
                 .file(pdfFile))
                 .andExpect(status().isUnauthorized());
 
@@ -3499,6 +4197,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
                 .withTitle("WorkspaceItem")
                 .withIssueDate("2019-10-27")
+                .grantLicense()
                 .build();
 
         InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
@@ -3509,7 +4208,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // upload the file in our workspaceitem
         String authToken = getAuthToken(eperson2.getEmail(), "qwerty02");
-        getClient(authToken).perform(fileUpload("/api/submission/workspaceitems/" + witem.getID())
+        getClient(authToken).perform(multipart("/api/submission/workspaceitems/" + witem.getID())
                 .file(pdfFile))
                 .andExpect(status().isForbidden());
 
@@ -3538,6 +4237,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
             .withTitle("Test WorkspaceItem")
             .withIssueDate("2017-10-17")
+            .grantLicense()
             .build();
 
         InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
@@ -3546,7 +4246,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         context.restoreAuthSystemState();
         // upload the file in our workspaceitem
-        getClient(authToken).perform(fileUpload("/api/submission/workspaceitems/" + witem.getID())
+        getClient(authToken).perform(multipart("/api/submission/workspaceitems/" + witem.getID())
             .file(pdfFile))
             .andExpect(status().isCreated())
             .andExpect(jsonPath("$.sections.upload.files[0].metadata['dc.title'][0].value",
@@ -3588,8 +4288,8 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.errors").isNotEmpty())
             .andExpect(jsonPath("$.errors[?(@.message=='error.validation.filerequired')]",
-                Matchers.contains(
-                    hasJsonPath("$.paths", Matchers.contains(
+                contains(
+                    hasJsonPath("$.paths", contains(
                         hasJsonPath("$", Matchers.is("/sections/upload"))
                     )))));
     }
@@ -4315,7 +5015,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         try {
             // adding a bibtex file with a single entry should automatically put the metadata in the bibtex file into
             // the item
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems/" + witem.getID())
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems/" + witem.getID())
                         .file(bibtexFile))
                     .andExpect(status().isCreated())
                     .andExpect(jsonPath("$.sections.traditionalpageone['dc.title'][0].value",
@@ -4332,7 +5032,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                             is("bibtex-test.bib")));
 
             // do again over a submission that already has a title, the manual input should be preserved
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems/" + witem2.getID())
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems/" + witem2.getID())
                         .file(bibtexFile))
                     .andExpect(status().isCreated())
                     .andExpect(jsonPath("$.sections.traditionalpageone['dc.title'][0].value",
@@ -4873,7 +5573,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
 
         // upload file and verify response
         getClient(authToken)
-            .perform(fileUpload("/api/submission/workspaceitems/" + wItem.getID()).file(pdfFile))
+            .perform(multipart("/api/submission/workspaceitems/" + wItem.getID()).file(pdfFile))
             .andExpect(status().isCreated())
             .andExpect(jsonPath("$.sections.upload.files[0].accessConditions", empty()));
 
@@ -5344,7 +6044,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         context.restoreAuthSystemState();
 
         try {
-            getClient(authToken).perform(fileUpload("/api/submission/workspaceitems")
+            getClient(authToken).perform(multipart("/api/submission/workspaceitems")
                                 .file(pdfFile))
                                 .andExpect(status().is(500));
         } finally {
@@ -5364,6 +6064,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                                       "Test Item patchUploadAddAdminRPInstallAndVerifyOnlyAdminCanView")
                                                   .withIssueDate("2019-03-06")
                                                   .withFulltext("upload2.pdf", "/local/path/simple-article.pdf", pdf)
+                                                  .grantLicense()
                                                   .build();
         context.restoreAuthSystemState();
 
@@ -5442,6 +6143,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                 .withTitle("Test Item patchUploadAddOpenAccessRPInstallAndVerifyOnlyAdminCanView")
                                 .withIssueDate("2019-03-06")
                                 .withFulltext("upload2.pdf", "/local/path/simple-article.pdf", pdf)
+                                .grantLicense()
                                 .build();
         context.restoreAuthSystemState();
 
@@ -5508,6 +6210,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                 .withTitle("Test Item patchUploadAddOpenAccessRPInstallAndVerifyOnlyAdminCanView")
                                 .withIssueDate("2019-03-06")
                                 .withFulltext("upload2.pdf", "/local/path/simple-article.pdf", pdf)
+                                .grantLicense()
                                 .build();
         context.restoreAuthSystemState();
 
@@ -5601,6 +6304,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                                   .withTitle("Test wsItem")
                                                   .withIssueDate("2019-03-06")
                                                   .withFulltext("upload2.pdf", "/local/path/simple-article.pdf", pdf)
+                                                  .grantLicense()
                                                   .build();
         context.restoreAuthSystemState();
 
@@ -5674,6 +6378,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                                   .withTitle("Test wsItem")
                                                   .withIssueDate("2019-03-06")
                                                   .withFulltext("upload2.pdf", "/local/path/simple-article.pdf", pdf)
+                                                  .grantLicense()
                                                   .build();
         context.restoreAuthSystemState();
 
@@ -5737,6 +6442,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                                   .withTitle("Test wsItem")
                                                   .withIssueDate("2019-03-06")
                                                   .withFulltext("upload2.pdf", "/local/path/simple-article.pdf", pdf)
+                                                  .grantLicense()
                                                   .build();
         context.restoreAuthSystemState();
 
@@ -5819,6 +6525,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                                   .withTitle("Test wsItem")
                                                   .withIssueDate("2019-03-06")
                                                   .withFulltext("upload2.pdf", "/local/path/simple-article.pdf", pdf)
+                                                  .grantLicense()
                                                   .build();
         context.restoreAuthSystemState();
 
@@ -5883,6 +6590,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                                   .withTitle("Test wsItem")
                                                   .withIssueDate("2019-03-06")
                                                   .withFulltext("upload2.pdf", "/local/path/simple-article.pdf", pdf)
+                                                  .grantLicense()
                                                   .build();
         context.restoreAuthSystemState();
 
@@ -5978,8 +6686,8 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         getClient(authToken).perform(get(workspaceItemsUri + workspaceItem3.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.errors[?(@.message=='error.validation.required')]",
-                Matchers.contains(
-                    hasJsonPath("$.paths", Matchers.contains(
+                contains(
+                    hasJsonPath("$.paths", contains(
                         hasJsonPath("$", Matchers.is("/sections/qualdroptest/dc.identifier"))
                     )))));
     }
@@ -6905,7 +7613,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                      .andExpect(status().isOk())
                                      .andExpect(header().string("Accept-Ranges", "bytes"))
                                      .andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
-                                     .andExpect(content().contentType("text/plain"))
+                                     .andExpect(content().contentType("text/plain;charset=UTF-8"))
                                      .andExpect(content().bytes(bitstreamContent.getBytes()));
 
             // others can't download the bitstream
@@ -6943,7 +7651,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                      .andExpect(status().isOk())
                                      .andExpect(header().string("Accept-Ranges", "bytes"))
                                      .andExpect(header().string("ETag", "\"" + bitstream.getChecksum() + "\""))
-                                     .andExpect(content().contentType("text/plain"))
+                                     .andExpect(content().contentType("text/plain;charset=UTF-8"))
                                      .andExpect(content().bytes(bitstreamContent.getBytes()));
 
             // others can't download the bitstream
@@ -7056,6 +7764,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                              .withTitle("My Article")
                              .withIssueDate("2019-03-16")
                              .withFulltext("upload.pdf", "/local/path/simple-article.pdf", pdf)
+                             .grantLicense()
                              .build();
 
         Bundle bundle = wItem.getItem().getBundles().get(0);
@@ -7100,7 +7809,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
                                .andExpect(jsonPath("$.sections.upload.files[1]").doesNotExist());
 
         // upload second file
-        getClient(tokenEPerson).perform(fileUpload("/api/submission/workspaceitems/" + wItem.getID())
+        getClient(tokenEPerson).perform(multipart("/api/submission/workspaceitems/" + wItem.getID())
                                .file(xmlFile))
                                .andExpect(status().isCreated());
 
@@ -7184,11 +7893,402 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         getClient(tokenAdmin).perform(get("/api/authz/resourcepolicies/search/resource")
                              .param("uuid", bitstream2.getID().toString()))
                              .andExpect(status().isOk())
-                             .andExpect(jsonPath("$._embedded.resourcepolicies", Matchers.contains(
+                             .andExpect(jsonPath("$._embedded.resourcepolicies", contains(
                                      ResourcePolicyMatcher.matchResourcePolicyProperties(anonymousGroup, null,
                                              bitstream2, ResourcePolicy.TYPE_CUSTOM, Constants.READ, "embargo")
                               )))
                              .andExpect(jsonPath("$.page.totalElements", is(1)));
     }
 
-}
\ No newline at end of file
+    @Test
+    public void createItemWithoutEntityTypeIfCollectionHasBlankEntityType() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context)
+            .withName("community")
+            .build();
+
+        Collection collection1 = CollectionBuilder.createCollection(context, community)
+            .withName("Collection 1")
+            // NOTE: has non-empty entity type
+            .withEntityType("Person")
+            .build();
+
+        Collection collection2 = CollectionBuilder.createCollection(context, community)
+            .withName("Collection 2")
+            // NOTE: has empty entity type, this is by default the case when a collection is created in the GUI
+            .withEntityType("")
+            .build();
+
+        // expect that this item has dspace.entity.type = Person
+        Item item1 = ItemBuilder.createItem(context, collection1)
+            .withTitle("item 1")
+            .build();
+
+        // expect that this item does not have dspace.entity.type at all
+        Item item2 = ItemBuilder.createItem(context, collection2)
+            .withTitle("item 2")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        // test item 1
+        getClient().perform(get("/api/core/items/" + item1.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.metadata", allOf(
+                matchMetadata("dc.title", "item 1"),
+                matchMetadata("dspace.entity.type", "Person")
+            )));
+
+        // test item 2
+        getClient().perform(get("/api/core/items/" + item2.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.metadata", allOf(
+                matchMetadata("dc.title", "item 2"),
+                matchMetadataDoesNotExist("dspace.entity.type")
+            )));
+    }
+
+    public void verifyBitstreamPolicyNotDuplicatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).withName("Com").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).withName("Col").build();
+
+        // Create item
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                .withTitle("Workspace Item")
+                .withIssueDate("2019-01-01")
+                .grantLicense()
+                .build();
+
+        // Add a bitstream to the item
+        String bitstreamContent = "ThisIsSomeDummyText";
+        Bitstream bitstream = null;
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, StandardCharsets.UTF_8)) {
+            bitstream = BitstreamBuilder.createBitstream(context, witem.getItem(), is)
+                    .withName("Bitstream")
+                    .withMimeType("text/plain").build();
+        }
+
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        Group anonymousGroup = groupService.findByName(context, Group.ANONYMOUS);
+
+        // Create access condition
+        Map<String, String> accessCondition = new HashMap<>();
+        accessCondition.put("name", "openaccess");
+
+        // Add access condition
+        List<Operation> addAccessCondition = new ArrayList<>();
+        addAccessCondition.add(new AddOperation("/sections/upload/files/0/accessConditions/-", accessCondition));
+
+        String patchBody = getPatchContent(addAccessCondition);
+        getClient(adminToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk());
+
+        // Deposit the item
+        getClient(adminToken).perform(post("/api/workflow/workflowitems")
+                .content("/api/submission/workspaceitems/" + witem.getID())
+                .contentType(textUriContentType))
+                .andExpect(status().isCreated());
+
+        // Bistream access policies are as expected and there are no duplicates
+        getClient(adminToken)
+                .perform(get("/api/authz/resourcepolicies/search/resource")
+                .param("uuid", bitstream.getID().toString()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$._embedded.resourcepolicies",
+                        Matchers.hasItems(ResourcePolicyMatcher.matchResourcePolicyProperties(anonymousGroup, null,
+                                bitstream, ResourcePolicy.TYPE_CUSTOM, Constants.READ, "openaccess"))))
+                .andExpect(jsonPath("$.page.totalElements", is(1)));
+    }
+
+    @Test
+    public void verifyUnexistingBitstreamPolicyIsDeniedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).withName("Com").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).withName("Col").build();
+
+        // Create item
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                .withTitle("Workspace Item")
+                .withIssueDate("2019-01-01")
+                .grantLicense()
+                .build();
+
+        // Add a bitstream to the item
+        String bitstreamContent = "ThisIsSomeDummyText";
+        Bitstream bitstream = null;
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, StandardCharsets.UTF_8)) {
+            bitstream = BitstreamBuilder.createBitstream(context, witem.getItem(), is)
+                    .withName("Bitstream")
+                    .withMimeType("text/plain").build();
+        }
+
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        Group anonymousGroup = groupService.findByName(context, Group.ANONYMOUS);
+
+        // Create unexisting access condition
+        Map<String, String> accessCondition = new HashMap<>();
+        accessCondition.put("name", "t3st");
+
+        // Add access condition
+        List<Operation> addAccessCondition = new ArrayList<>();
+        addAccessCondition.add(new AddOperation("/sections/upload/files/0/accessConditions/-", accessCondition));
+
+        // Entity is unprocessable
+        String patchBody = getPatchContent(addAccessCondition);
+        getClient(adminToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void verifyUnconfiguredBitstreamPolicyIsDeniedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context).withName("Com").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).withName("Col").build();
+
+        // Create item
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                .withTitle("Workspace Item")
+                .withIssueDate("2019-01-01")
+                .grantLicense()
+                .build();
+
+        // Add a bitstream to the item
+        String bitstreamContent = "ThisIsSomeDummyText";
+        Bitstream bitstream = null;
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, StandardCharsets.UTF_8)) {
+            bitstream = BitstreamBuilder.createBitstream(context, witem.getItem(), is)
+                    .withName("Bitstream")
+                    .withMimeType("text/plain").build();
+        }
+
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        Group anonymousGroup = groupService.findByName(context, Group.ANONYMOUS);
+
+        // Access condition exists but it is not configured in access-conditions.xml
+        Map<String, String> accessCondition = new HashMap<>();
+        accessCondition.put("name", "networkAdministration");
+
+        // Add access condition
+        List<Operation> addAccessCondition = new ArrayList<>();
+        addAccessCondition.add(new AddOperation("/sections/upload/files/0/accessConditions/-", accessCondition));
+
+        // Entity is unprocessable
+        String patchBody = getPatchContent(addAccessCondition);
+        getClient(adminToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void sherpaPolicySectionCacheTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        String dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Workspace Item 1")
+                                                  .withIssueDate("2021-11-21")
+                                                  .withAuthor("Smith, Donald")
+                                                  .withIssn("2731-0582")
+                                                  .withSubject("ExtraEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> retrievalTime = new AtomicReference<String>();
+        AtomicReference<String> retrievalTime2 = new AtomicReference<String>();
+
+        String token = getAuthToken(eperson.getEmail(), password);
+        getClient(token).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.error", is(false)))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals[0].titles[0]",
+                                         is("Nature Synthesis")))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals[0].issns[0]",
+                                         is("2731-0582")))))
+                        .andDo(result -> retrievalTime.set(read(
+                               result.getResponse().getContentAsString(), "$.sections.sherpaPolicies.retrievalTime")));
+
+        Date date = new SimpleDateFormat(dateFormat).parse(retrievalTime.get());
+
+        // reload page, to verify that the retrievalTime is not changed
+        getClient(token).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.error", is(false)))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals[0].titles[0]",
+                                         is("Nature Synthesis")))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals[0].issns[0]",
+                                         is("2731-0582")))))
+                        .andDo(result -> retrievalTime2.set(read(
+                               result.getResponse().getContentAsString(), "$.sections.sherpaPolicies.retrievalTime")));
+
+        Date date2 = new SimpleDateFormat(dateFormat).parse(retrievalTime2.get());
+
+        assertTrue(date.equals(date2));
+
+        // create a list of values to use in add operation
+        List<Operation> operations = new ArrayList<>();
+        operations.add(new RemoveOperation("/sections/sherpaPolicies/retrievalTime"));
+
+        // empty the cache and verify the retrivatTime
+        String patchBody = getPatchContent(operations);
+        getClient(token).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.error", is(false)))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals[0].titles[0]",
+                                         is("Nature Synthesis")))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals[0].issns[0]",
+                                         is("2731-0582")))))
+                        .andDo(result -> retrievalTime.set(read(
+                               result.getResponse().getContentAsString(), "$.sections.sherpaPolicies.retrievalTime")));
+
+        date = new SimpleDateFormat(dateFormat).parse(retrievalTime.get());
+
+        assertTrue(date.after(date2));
+
+        // reload page, to verify that the retrievalTime is not changed
+        getClient(token).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.error", is(false)))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals[0].titles[0]",
+                                         is("Nature Synthesis")))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals[0].issns[0]",
+                                         is("2731-0582")))))
+                        .andDo(result -> retrievalTime2.set(read(
+                               result.getResponse().getContentAsString(), "$.sections.sherpaPolicies.retrievalTime")));
+
+        date2 = new SimpleDateFormat(dateFormat).parse(retrievalTime2.get());
+        assertTrue(date.equals(date2));
+    }
+
+    @Test
+    public void sherpaPolicySectionWithWrongIssnCacheTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        String dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Workspace Item 1")
+                                                  .withIssueDate("2021-11-21")
+                                                  .withAuthor("Smith, Donald")
+                                                  .withIssn("0000-0000")
+                                                  .withSubject("ExtraEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> retrievalTime = new AtomicReference<String>();
+        AtomicReference<String> retrievalTime2 = new AtomicReference<String>();
+
+        String token = getAuthToken(eperson.getEmail(), password);
+        getClient(token).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.error", is(true)))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                              hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.message", is("No results found")))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals", nullValue()))))
+                        .andDo(result -> retrievalTime.set(read(
+                               result.getResponse().getContentAsString(), "$.sections.sherpaPolicies.retrievalTime")));
+
+        Date date = new SimpleDateFormat(dateFormat).parse(retrievalTime.get());
+
+        // reload page, to verify that the retrievalTime is not changed
+        getClient(token).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.error", is(true)))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                              hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.message", is("No results found")))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals", nullValue()))))
+                        .andDo(result -> retrievalTime2.set(read(
+                               result.getResponse().getContentAsString(), "$.sections.sherpaPolicies.retrievalTime")));
+
+        Date date2 = new SimpleDateFormat(dateFormat).parse(retrievalTime2.get());
+
+        assertTrue(date.equals(date2));
+
+        // create a list of values to use in add operation
+        List<Operation> operations = new ArrayList<>();
+        operations.add(new RemoveOperation("/sections/sherpaPolicies/retrievalTime"));
+
+        // empty the cache and verify the retrivatTime
+        String patchBody = getPatchContent(operations);
+        getClient(token).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.error", is(true)))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                              hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.message", is("No results found")))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals", nullValue()))))
+                        .andDo(result -> retrievalTime.set(read(
+                               result.getResponse().getContentAsString(), "$.sections.sherpaPolicies.retrievalTime")));
+
+        date = new SimpleDateFormat(dateFormat).parse(retrievalTime.get());
+
+        assertTrue(date.after(date2));
+
+        // reload page, to verify that the retrievalTime is not changed
+        getClient(token).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.error", is(true)))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                              hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.message", is("No results found")))))
+                        .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.sections.sherpaPolicies.sherpaResponse.journals", nullValue()))))
+                        .andDo(result -> retrievalTime2.set(read(
+                               result.getResponse().getContentAsString(), "$.sections.sherpaPolicies.retrievalTime")));
+
+        date2 = new SimpleDateFormat(dateFormat).parse(retrievalTime2.get());
+        assertTrue(date.equals(date2));
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanClaimItemFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanClaimItemFeatureIT.java
new file mode 100644
index 0000000000..f3ed67bf98
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanClaimItemFeatureIT.java
@@ -0,0 +1,251 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.authorization;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.authorization.impl.CanClaimItemFeature;
+import org.dspace.app.rest.converter.ItemConverter;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.app.rest.utils.Utils;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Test of Profile Claim Authorization Feature implementation.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+public class CanClaimItemFeatureIT extends AbstractControllerIntegrationTest {
+
+    private Item profile;
+
+    @Autowired
+    private ItemConverter itemConverter;
+
+    @Autowired
+    private Utils utils;
+
+    @Autowired
+    private AuthorizationFeatureService authorizationFeatureService;
+
+    private AuthorizationFeature canClaimProfileFeature;
+
+    private Collection personCollection;
+
+    private String epersonToken;
+
+    private String adminToken;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Community").build();
+
+        personCollection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Person")
+            .withName("claimableA")
+            .build();
+
+        epersonToken = getAuthToken(eperson.getEmail(), password);
+
+        adminToken = getAuthToken(admin.getEmail(), password);
+
+        context.restoreAuthSystemState();
+
+        canClaimProfileFeature = authorizationFeatureService.find(CanClaimItemFeature.NAME);
+
+    }
+
+    @Test
+    public void testCanClaimAProfile() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        profile = ItemBuilder.createItem(context, personCollection)
+            .withPersonEmail(eperson.getEmail())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(epersonToken).perform(get("/api/authz/authorizations/search/object")
+            .param("uri", uri(profile))
+            .param("feature", canClaimProfileFeature.getName()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded").exists())
+            .andExpect(jsonPath("$.page.totalElements", greaterThanOrEqualTo(1)));
+
+    }
+
+    @Test
+    public void testCanClaimAProfileWithAnonymousUser() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        profile = ItemBuilder.createItem(context, personCollection).build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/authz/authorizations/search/object")
+            .param("uri", uri(profile))
+            .param("feature", canClaimProfileFeature.getName()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded").doesNotExist())
+            .andExpect(jsonPath("$.page.totalElements", equalTo(0)));
+    }
+
+    @Test
+    public void testCanClaimWithAdminUser() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        profile = ItemBuilder.createItem(context, personCollection)
+            .withPersonEmail("myemail@test.it")
+            .withPersonEmail(admin.getEmail())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
+            .param("uri", uri(profile))
+            .param("feature", canClaimProfileFeature.getName()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded").exists())
+            .andExpect(jsonPath("$.page.totalElements", greaterThanOrEqualTo(1)));
+
+    }
+
+    @Test
+    public void testNotClaimableEntityForDifferentEmail() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        profile = ItemBuilder.createItem(context, personCollection)
+            .withPersonEmail(eperson.getEmail())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
+            .param("uri", uri(profile))
+            .param("feature", canClaimProfileFeature.getName()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded").doesNotExist())
+            .andExpect(jsonPath("$.page.totalElements", equalTo(0)));
+
+    }
+
+    @Test
+    public void testNotClaimableEntityWithoutEmail() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        profile = ItemBuilder.createItem(context, personCollection)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
+            .param("uri", uri(profile))
+            .param("feature", canClaimProfileFeature.getName()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded").doesNotExist())
+            .andExpect(jsonPath("$.page.totalElements", equalTo(0)));
+
+    }
+
+    @Test
+    public void testNotClaimableEntity() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Collection publicationCollection = CollectionBuilder
+            .createCollection(context, context.reloadEntity(parentCommunity))
+            .withEntityType("Publication")
+            .withName("notClaimable")
+            .build();
+
+        context.turnOffAuthorisationSystem();
+
+        Item publication = ItemBuilder.createItem(context, publicationCollection).build();
+
+        getClient(epersonToken).perform(get("/api/authz/authorizations/search/object")
+            .param("uri", uri(publication))
+            .param("feature", canClaimProfileFeature.getName()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded").doesNotExist())
+            .andExpect(jsonPath("$.page.totalElements", equalTo(0)));
+
+    }
+
+    @Test
+    public void testItemAlreadyInARelation() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item ownedItem = ItemBuilder.createItem(context, personCollection)
+            .withDspaceObjectOwner("owner", "ownerAuthority")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(epersonToken).perform(get("/api/authz/authorizations/search/object")
+            .param("uri", uri(ownedItem))
+            .param("feature", canClaimProfileFeature.getName()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded").doesNotExist())
+            .andExpect(jsonPath("$.page.totalElements", equalTo(0)));
+
+    }
+
+    @Test
+    public void testUserWithProfile() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        profile = ItemBuilder.createItem(context, personCollection)
+            .withPersonEmail(eperson.getEmail())
+            .build();
+
+        ItemBuilder.createItem(context, personCollection)
+            .withTitle("User")
+            .withDspaceObjectOwner("User", eperson.getID().toString())
+            .build();
+
+        context.restoreAuthSystemState();
+
+        getClient(epersonToken).perform(get("/api/authz/authorizations/search/object")
+                .param("uri", uri(profile))
+                .param("feature", canClaimProfileFeature.getName()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded").doesNotExist())
+            .andExpect(jsonPath("$.page.totalElements", equalTo(0)));
+    }
+
+    private String uri(Item item) {
+        ItemRest itemRest = itemConverter.convert(item, Projection.DEFAULT);
+        return utils.linkToSingleResource(itemRest, "self").getHref();
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanCreateVersionFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanCreateVersionFeatureIT.java
index 4cbe9e4252..afee5b5c18 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanCreateVersionFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanCreateVersionFeatureIT.java
@@ -304,57 +304,9 @@ public class CanCreateVersionFeatureIT extends AbstractControllerIntegrationTest
     }
 
     @Test
-    public void checkCanCreateVersionFeatureAndPropertyBlockEntityEnableTest() throws Exception {
+    public void checkCanCreateVersionFeatureTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
-        configurationService.setProperty("versioning.block.entity", true);
-
-        Community rootCommunity = CommunityBuilder.createCommunity(context)
-                                                  .withName("Parent Community")
-                                                  .build();
-
-        Collection col = CollectionBuilder.createCollection(context, rootCommunity)
-                                          .withName("Collection 1")
-                                          .withEntityType("Publication")
-                                          .withAdminGroup(eperson)
-                                          .build();
-
-        Item itemA = ItemBuilder.createItem(context, col)
-                                .withTitle("Public item")
-                                .withIssueDate("2021-04-19")
-                                .withAuthor("Doe, John")
-                                .withSubject("ExtraEntry")
-                                .build();
-
-        context.restoreAuthSystemState();
-
-        ItemRest itemRestA = itemConverter.convert(itemA, DefaultProjection.DEFAULT);
-
-        String tokenEPerson = getAuthToken(eperson.getEmail(), password);
-        String tokenAdmin = getAuthToken(admin.getEmail(), password);
-        String tokenUser = getAuthToken(user.getEmail(), password);
-
-        // define authorization that we know not exists
-        Authorization user2ItemA = new Authorization(user, canCreateVersionFeature, itemRestA);
-        Authorization admin2ItemA = new Authorization(admin, canCreateVersionFeature, itemRestA);
-        Authorization eperson2ItemA = new Authorization(eperson, canCreateVersionFeature, itemRestA);
-
-        getClient(tokenAdmin).perform(get("/api/authz/authorizations/" + admin2ItemA.getID()))
-                             .andExpect(status().isNotFound());
-
-        getClient(tokenUser).perform(get("/api/authz/authorizations/" + user2ItemA.getID()))
-                            .andExpect(status().isNotFound());
-
-        getClient(tokenEPerson).perform(get("/api/authz/authorizations/" + eperson2ItemA.getID()))
-                               .andExpect(status().isNotFound());
-    }
-
-    @Test
-    public void checkCanCreateVersionFeatureAndPropertyBlockEntityDisabledTest() throws Exception {
-        context.turnOffAuthorisationSystem();
-
-        configurationService.setProperty("versioning.block.entity", false);
-
         Community rootCommunity = CommunityBuilder.createCommunity(context)
                                                   .withName("Parent Community")
                                                   .build();
@@ -396,51 +348,4 @@ public class CanCreateVersionFeatureIT extends AbstractControllerIntegrationTest
                                .andExpect(status().isNotFound());
     }
 
-    @Test
-    public void checkCanCreateVersionFeatureAndPropertyBlockEntityUnsetedTest() throws Exception {
-        context.turnOffAuthorisationSystem();
-
-        configurationService.setProperty("versioning.submitterCanCreateNewVersion", true);
-        configurationService.setProperty("versioning.block.entity", null);
-
-        Community rootCommunity = CommunityBuilder.createCommunity(context)
-                                                  .withName("Parent Community")
-                                                  .build();
-
-        Collection col = CollectionBuilder.createCollection(context, rootCommunity)
-                                          .withName("Collection 1")
-                                          .withEntityType("Publication")
-                                          .withSubmitterGroup(eperson)
-                                          .build();
-
-        Item itemA = ItemBuilder.createItem(context, col)
-                                .withTitle("Public item")
-                                .withIssueDate("2021-04-19")
-                                .withAuthor("Doe, John")
-                                .withSubject("ExtraEntry")
-                                .build();
-
-        context.restoreAuthSystemState();
-
-        ItemRest itemRestA = itemConverter.convert(itemA, DefaultProjection.DEFAULT);
-
-        String tokenEPerson = getAuthToken(eperson.getEmail(), password);
-        String tokenAdmin = getAuthToken(admin.getEmail(), password);
-        String tokenUser = getAuthToken(user.getEmail(), password);
-
-        // define authorization that we know not exists
-        Authorization user2ItemA = new Authorization(user, canCreateVersionFeature, itemRestA);
-        Authorization admin2ItemA = new Authorization(admin, canCreateVersionFeature, itemRestA);
-        Authorization eperson2ItemA = new Authorization(eperson, canCreateVersionFeature, itemRestA);
-
-        getClient(tokenAdmin).perform(get("/api/authz/authorizations/" + admin2ItemA.getID()))
-                             .andExpect(status().isNotFound());
-
-        getClient(tokenUser).perform(get("/api/authz/authorizations/" + user2ItemA.getID()))
-                            .andExpect(status().isNotFound());
-
-        getClient(tokenEPerson).perform(get("/api/authz/authorizations/" + eperson2ItemA.getID()))
-                               .andExpect(status().isNotFound());
-    }
-
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanDeleteVersionFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanDeleteVersionFeatureIT.java
index ac59de54eb..df158a949a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanDeleteVersionFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanDeleteVersionFeatureIT.java
@@ -28,7 +28,6 @@ import org.dspace.content.Item;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.eperson.EPerson;
-import org.dspace.services.ConfigurationService;
 import org.dspace.versioning.Version;
 import org.hamcrest.Matchers;
 import org.junit.Before;
@@ -47,8 +46,6 @@ public class CanDeleteVersionFeatureIT extends AbstractControllerIntegrationTest
     @Autowired
     private WorkspaceItemService workspaceItemService;
     @Autowired
-    private ConfigurationService configurationService;
-    @Autowired
     private AuthorizationFeatureService authorizationFeatureService;
     @Autowired
     private org.dspace.content.service.InstallItemService installItemService;
@@ -259,59 +256,9 @@ public class CanDeleteVersionFeatureIT extends AbstractControllerIntegrationTest
     }
 
     @Test
-    public void canDeleteVersionFeatureAndPropertyBlockEntityEnableTest() throws Exception {
+    public void canDeleteVersionFeatureTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
-        configurationService.setProperty("versioning.block.entity", true);
-
-        Community rootCommunity = CommunityBuilder.createCommunity(context)
-                                                  .withName("Parent Community")
-                                                  .build();
-
-        Collection col = CollectionBuilder.createCollection(context, rootCommunity)
-                                          .withName("Collection 1")
-                                          .withEntityType("Publication")
-                                          .build();
-
-        Item itemA = ItemBuilder.createItem(context, col)
-                                .withTitle("Public item")
-                                .withIssueDate("2021-04-19")
-                                .withAuthor("Doe, John")
-                                .withSubject("ExtraEntry")
-                                .build();
-
-        Version version = VersionBuilder.createVersion(context, itemA, "My test summary").build();
-        WorkspaceItem workspaceItem = workspaceItemService.findByItem(context, version.getItem());
-        installItemService.installItem(context, workspaceItem);
-
-        context.restoreAuthSystemState();
-
-        VersionRest versionRest = versionConverter.convert(version, DefaultProjection.DEFAULT);
-
-        String tokenEPerson = getAuthToken(eperson.getEmail(), password);
-        String tokenAdmin = getAuthToken(admin.getEmail(), password);
-
-        // define authorization that we know not exists
-        Authorization admin2ItemA = new Authorization(admin, canDeleteVersionFeature, versionRest);
-        Authorization eperson2ItemA = new Authorization(eperson, canDeleteVersionFeature, versionRest);
-        Authorization anonymous2ItemA = new Authorization(null, canDeleteVersionFeature, versionRest);
-
-        getClient(tokenAdmin).perform(get("/api/authz/authorizations/" + admin2ItemA.getID()))
-                             .andExpect(status().isNotFound());
-
-        getClient(tokenEPerson).perform(get("/api/authz/authorizations/" + eperson2ItemA.getID()))
-                               .andExpect(status().isNotFound());
-
-        getClient().perform(get("/api/authz/authorizations/" + anonymous2ItemA.getID()))
-                   .andExpect(status().isNotFound());
-    }
-
-    @Test
-    public void canDeleteVersionFeatureAndPropertyBlockEntityDisabledTest() throws Exception {
-        context.turnOffAuthorisationSystem();
-
-        configurationService.setProperty("versioning.block.entity", false);
-
         Community rootCommunity = CommunityBuilder.createCommunity(context)
                                                   .withName("Parent Community")
                                                   .build();
@@ -356,4 +303,4 @@ public class CanDeleteVersionFeatureIT extends AbstractControllerIntegrationTest
                    .andExpect(status().isNotFound());
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanEditVersionFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanEditVersionFeatureIT.java
index 5723637f0b..2823fab845 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanEditVersionFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanEditVersionFeatureIT.java
@@ -202,70 +202,7 @@ public class CanEditVersionFeatureIT extends AbstractControllerIntegrationTest {
     }
 
     @Test
-    public void canEditVersionsFeatureByColAndComAdminsAndPropertyBlockEntityEnableTest() throws Exception {
-        configurationService.setProperty("versioning.block.entity", true);
-        context.turnOffAuthorisationSystem();
-        EPerson adminComA = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testComAdminA@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        EPerson adminCol1 = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testCol1Admin@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        Community rootCommunity = CommunityBuilder.createCommunity(context)
-                                                  .withName("Parent Community")
-                                                  .build();
-
-        Community subCommunityA = CommunityBuilder.createSubCommunity(context, rootCommunity)
-                                                  .withName("Sub Community A")
-                                                  .withAdminGroup(adminComA)
-                                                  .build();
-
-        Collection col1 = CollectionBuilder.createCollection(context, subCommunityA)
-                                           .withName("Collection 1")
-                                           .withEntityType("Publication")
-                                           .withSubmitterGroup(eperson)
-                                           .withAdminGroup(adminCol1)
-                                           .build();
-
-        Item item = ItemBuilder.createItem(context, col1)
-                               .withTitle("Public item")
-                               .withIssueDate("2021-04-19")
-                               .withAuthor("Doe, John")
-                               .withSubject("ExtraEntry")
-                               .build();
-
-        Version version = VersionBuilder.createVersion(context, item, "My test summary").build();
-
-        context.restoreAuthSystemState();
-
-        VersionRest versionRest = versionConverter.convert(version, DefaultProjection.DEFAULT);
-
-        String tokenAdmin = getAuthToken(admin.getEmail(), password);
-        String tokenAdminComA = getAuthToken(adminComA.getEmail(), password);
-        String tokenAdminCol1 = getAuthToken(adminCol1.getEmail(), password);
-
-        // define authorization that we know not exists
-        Authorization adminOfComAToVersion = new Authorization(adminComA, canEditVersionFeature, versionRest);
-        Authorization adminOfCol1ToVersion = new Authorization(adminCol1, canEditVersionFeature, versionRest);
-        Authorization adminToVersion = new Authorization(admin, canEditVersionFeature, versionRest);
-
-        getClient(tokenAdminComA).perform(get("/api/authz/authorizations/" + adminOfComAToVersion.getID()))
-                                 .andExpect(status().isNotFound());
-
-        getClient(tokenAdminCol1).perform(get("/api/authz/authorizations/" + adminOfCol1ToVersion.getID()))
-                                 .andExpect(status().isNotFound());
-
-        getClient(tokenAdmin).perform(get("/api/authz/authorizations/" + adminToVersion.getID()))
-                             .andExpect(status().isNotFound());
-    }
-
-    @Test
-    public void canEditVersionsFeatureByColAndComAdminsAndPropertyBlockEntityDisabledTest() throws Exception {
-        configurationService.setProperty("versioning.block.entity", false);
+    public void canEditVersionsFeatureByColAndComAdminsTest2() throws Exception {
         context.turnOffAuthorisationSystem();
         EPerson adminComA = EPersonBuilder.createEPerson(context)
                                           .withEmail("testComAdminA@test.com")
@@ -343,4 +280,4 @@ public class CanEditVersionFeatureIT extends AbstractControllerIntegrationTest {
                    .andExpect(status().isNotFound());
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanManageVersionsFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanManageVersionsFeatureIT.java
index 1a1f8f9e28..9a24a6e7b5 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanManageVersionsFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanManageVersionsFeatureIT.java
@@ -28,7 +28,6 @@ import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.eperson.EPerson;
-import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
@@ -47,9 +46,6 @@ public class CanManageVersionsFeatureIT extends AbstractControllerIntegrationTes
     @Autowired
     private ItemConverter itemConverter;
 
-    @Autowired
-    private ConfigurationService configurationService;
-
     @Autowired
     private AuthorizationFeatureService authorizationFeatureService;
 
@@ -207,180 +203,4 @@ public class CanManageVersionsFeatureIT extends AbstractControllerIntegrationTes
                                  .andExpect(status().isNotFound());
     }
 
-    @Test
-    public void canManageVersionsFeatureAdminsAndPropertyBlockEntityEnableTest() throws Exception {
-        configurationService.setProperty("versioning.block.entity", true);
-        context.turnOffAuthorisationSystem();
-        EPerson adminComA = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testComAdminA@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        EPerson adminComB = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testComBdminA@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        EPerson adminCol1 = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testCol1Admin@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        EPerson adminCol2 = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testCol2Admin@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        Community rootCommunity = CommunityBuilder.createCommunity(context)
-                                                  .withName("Parent Community")
-                                                  .build();
-
-        Community subCommunityA = CommunityBuilder.createSubCommunity(context, rootCommunity)
-                                                  .withName("Sub Community A")
-                                                  .withAdminGroup(adminComA)
-                                                  .build();
-
-        CommunityBuilder.createSubCommunity(context, rootCommunity)
-                        .withName("Sub Community B")
-                        .withAdminGroup(adminComB)
-                        .build();
-
-        Collection col1 = CollectionBuilder.createCollection(context, subCommunityA)
-                                           .withName("Collection 1")
-                                           .withEntityType("Publication")
-                                           .withSubmitterGroup(eperson)
-                                           .withAdminGroup(adminCol1)
-                                           .build();
-
-        CollectionBuilder.createCollection(context, subCommunityA)
-                         .withName("Collection 2")
-                         .withAdminGroup(adminCol2)
-                         .build();
-
-        Item itemA = ItemBuilder.createItem(context, col1)
-                                .withTitle("Public item")
-                                .withIssueDate("2021-04-19")
-                                .withAuthor("Doe, John")
-                                .withSubject("ExtraEntry")
-                                .build();
-
-        context.restoreAuthSystemState();
-
-        ItemRest itemRestA = itemConverter.convert(itemA, DefaultProjection.DEFAULT);
-
-        String tokenAdminComA = getAuthToken(adminComA.getEmail(), password);
-        String tokenAdminComB = getAuthToken(adminComB.getEmail(), password);
-        String tokenAdminCol1 = getAuthToken(adminCol1.getEmail(), password);
-        String tokenAdminCol2 = getAuthToken(adminCol2.getEmail(), password);
-
-        // define authorization that we know not exists
-        Authorization adminOfComAToItemA = new Authorization(adminComA, canManageVersionsFeature, itemRestA);
-        Authorization adminOfCol1ToItemA = new Authorization(adminCol1, canManageVersionsFeature, itemRestA);
-        Authorization adminOfComBToItemA = new Authorization(adminComB, canManageVersionsFeature, itemRestA);
-        Authorization adminOfCol2ToItemA = new Authorization(adminCol2, canManageVersionsFeature, itemRestA);
-
-        getClient(tokenAdminComA).perform(get("/api/authz/authorizations/" + adminOfComAToItemA.getID()))
-                                 .andExpect(status().isNotFound());
-
-        getClient(tokenAdminCol1).perform(get("/api/authz/authorizations/" + adminOfCol1ToItemA.getID()))
-                                 .andExpect(status().isNotFound());
-
-        getClient(tokenAdminComB).perform(get("/api/authz/authorizations/" + adminOfComBToItemA.getID()))
-                                 .andExpect(status().isNotFound());
-
-        getClient(tokenAdminCol2).perform(get("/api/authz/authorizations/" + adminOfCol2ToItemA.getID()))
-                                 .andExpect(status().isNotFound());
-    }
-
-    @Test
-    public void canManageVersionsFeatureAdminsAndPropertyBlockEntityDisabledTest() throws Exception {
-        configurationService.setProperty("versioning.block.entity", false);
-        context.turnOffAuthorisationSystem();
-        EPerson adminComA = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testComAdminA@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        EPerson adminComB = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testComBdminA@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        EPerson adminCol1 = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testCol1Admin@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        EPerson adminCol2 = EPersonBuilder.createEPerson(context)
-                                          .withEmail("testCol2Admin@test.com")
-                                          .withPassword(password)
-                                          .build();
-
-        Community rootCommunity = CommunityBuilder.createCommunity(context)
-                                                  .withName("Parent Community")
-                                                  .build();
-
-        Community subCommunityA = CommunityBuilder.createSubCommunity(context, rootCommunity)
-                                                  .withName("Sub Community A")
-                                                  .withAdminGroup(adminComA)
-                                                  .build();
-
-        CommunityBuilder.createSubCommunity(context, rootCommunity)
-                        .withName("Sub Community B")
-                        .withAdminGroup(adminComB)
-                        .build();
-
-        Collection col1 = CollectionBuilder.createCollection(context, subCommunityA)
-                                           .withName("Collection 1")
-                                           .withEntityType("Publication")
-                                           .withSubmitterGroup(eperson)
-                                           .withAdminGroup(adminCol1)
-                                           .build();
-
-        CollectionBuilder.createCollection(context, subCommunityA)
-                         .withName("Collection 2")
-                         .withAdminGroup(adminCol2)
-                         .build();
-
-        Item itemA = ItemBuilder.createItem(context, col1)
-                                .withTitle("Public item")
-                                .withIssueDate("2021-04-19")
-                                .withAuthor("Doe, John")
-                                .withSubject("ExtraEntry")
-                                .build();
-
-        context.restoreAuthSystemState();
-
-        ItemRest itemRestA = itemConverter.convert(itemA, DefaultProjection.DEFAULT);
-
-        String tokenAdminComA = getAuthToken(adminComA.getEmail(), password);
-        String tokenAdminComB = getAuthToken(adminComB.getEmail(), password);
-        String tokenAdminCol1 = getAuthToken(adminCol1.getEmail(), password);
-        String tokenAdminCol2 = getAuthToken(adminCol2.getEmail(), password);
-
-        // define authorizations that we know must exists
-        Authorization adminOfComAToItemA = new Authorization(adminComA, canManageVersionsFeature, itemRestA);
-        Authorization adminOfCol1ToItemA = new Authorization(adminCol1, canManageVersionsFeature, itemRestA);
-
-        // define authorization that we know not exists
-        Authorization adminOfComBToItemA = new Authorization(adminComB, canManageVersionsFeature, itemRestA);
-        Authorization adminOfCol2ToItemA = new Authorization(adminCol2, canManageVersionsFeature, itemRestA);
-
-        getClient(tokenAdminComA).perform(get("/api/authz/authorizations/" + adminOfComAToItemA.getID()))
-                                 .andExpect(status().isOk())
-                                 .andExpect(jsonPath("$", Matchers.is(
-                                            AuthorizationMatcher.matchAuthorization(adminOfComAToItemA))));
-
-        getClient(tokenAdminCol1).perform(get("/api/authz/authorizations/" + adminOfCol1ToItemA.getID()))
-                                 .andExpect(status().isOk())
-                                 .andExpect(jsonPath("$", Matchers.is(
-                                            AuthorizationMatcher.matchAuthorization(adminOfCol1ToItemA))));
-
-        getClient(tokenAdminComB).perform(get("/api/authz/authorizations/" + adminOfComBToItemA.getID()))
-                                 .andExpect(status().isNotFound());
-
-        getClient(tokenAdminCol2).perform(get("/api/authz/authorizations/" + adminOfCol2ToItemA.getID()))
-                                 .andExpect(status().isNotFound());
-    }
-
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanSynchronizeWithORCIDIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanSynchronizeWithORCIDIT.java
new file mode 100644
index 0000000000..078776135a
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CanSynchronizeWithORCIDIT.java
@@ -0,0 +1,185 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.authorization;
+
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.authorization.impl.CanSynchronizeWithORCID;
+import org.dspace.app.rest.converter.ItemConverter;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.app.rest.utils.Utils;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.eperson.EPerson;
+import org.dspace.services.ConfigurationService;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Test for the canSynchronizeWithORCID authorization feature.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class CanSynchronizeWithORCIDIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private Utils utils;
+
+    @Autowired
+    private ItemConverter itemConverter;
+
+    @Autowired
+    private AuthorizationFeatureService authorizationFeatureService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    final String feature = "canSynchronizeWithORCID";
+    private Item itemA;
+    private ItemRest itemARest;
+    private Community communityA;
+    private Collection collectionA;
+    private AuthorizationFeature canSynchronizeWithORCID;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        context.turnOffAuthorisationSystem();
+
+        canSynchronizeWithORCID = authorizationFeatureService.find(CanSynchronizeWithORCID.NAME);
+
+        communityA = CommunityBuilder.createCommunity(context)
+                                     .withName("communityA").build();
+
+        collectionA = CollectionBuilder.createCollection(context, communityA)
+                                       .withName("collectionA").build();
+
+        itemA = ItemBuilder.createItem(context, collectionA)
+                           .withTitle("itemA")
+                           .withDspaceObjectOwner("user" , context.getCurrentUser().getID().toString())
+                           .build();
+
+        context.restoreAuthSystemState();
+
+        itemARest = itemConverter.convert(itemA, Projection.DEFAULT);
+    }
+
+    @Test
+    public void anonymousHasNotAccessTest() throws Exception {
+        getClient().perform(get("/api/authz/authorizations/search/object")
+                                .param("embed", "feature")
+                                .param("feature", feature)
+                                .param("uri", utils.linkToSingleResource(itemARest, "self").getHref()))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.page.totalElements", is(0)))
+                   .andExpect(jsonPath("$._embedded").doesNotExist());
+    }
+
+    @Test
+    public void testCanSynchronizeWithORCIDIfItemDoesNotHasDspaceObjectOwner() throws Exception {
+
+        EPerson user = context.getCurrentUser();
+
+        context.turnOffAuthorisationSystem();
+
+        Item item = ItemBuilder.createItem(context, collectionA)
+                           .withTitle("item")
+                           .build();
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(user.getEmail(), password);
+
+        getClient(token).perform(get("/api/authz/authorizations/search/object")
+                                     .param("uri", uri(item))
+                                     .param("eperson", user.getID().toString())
+                                     .param("feature", canSynchronizeWithORCID.getName()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.page.totalElements", is(0)))
+                        .andExpect(jsonPath("$._embedded").doesNotExist());
+    }
+
+    @Test
+    public void testCanSynchronizeWithORCIDIfItemHasDspaceObjectOwnerOfAnotherUUID() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson anotherUser = EPersonBuilder.createEPerson(context)
+                                            .withEmail("user@example.com")
+                                            .withPassword(password)
+                                            .build();
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(anotherUser.getEmail(), password);
+
+        getClient(token).perform(get("/api/authz/authorizations/search/object")
+                                     .param("uri", uri(itemA))
+                                     .param("eperson", anotherUser.getID().toString())
+                                     .param("feature", canSynchronizeWithORCID.getName()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.page.totalElements", is(0)))
+                        .andExpect(jsonPath("$._embedded").doesNotExist());
+    }
+
+    @Test
+    public void testCanSynchronizeWithORCIDIfItemHasDspaceObjectOwner() throws Exception {
+
+        EPerson user = context.getCurrentUser();
+
+        String token = getAuthToken(user.getEmail(), password);
+
+        getClient(token).perform(get("/api/authz/authorizations/search/object")
+                                     .param("uri", uri(itemA))
+                                     .param("eperson", user.getID().toString())
+                                     .param("feature", canSynchronizeWithORCID.getName()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$._embedded").exists())
+                        .andExpect(jsonPath("$.page.totalElements", greaterThanOrEqualTo(1)));
+    }
+
+    @Test
+    public void testCanSynchronizeWithORCIDWithSynchronizationDisabled() throws Exception {
+
+        configurationService.setProperty("orcid.synchronization-enabled", false);
+
+        EPerson user = context.getCurrentUser();
+
+        String token = getAuthToken(user.getEmail(), password);
+
+        getClient(token).perform(get("/api/authz/authorizations/search/object")
+                                     .param("uri", uri(itemA))
+                                     .param("eperson", user.getID().toString())
+                                     .param("feature", canSynchronizeWithORCID.getName()))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.page.totalElements", is(0)))
+                        .andExpect(jsonPath("$._embedded").doesNotExist());
+
+    }
+
+    private String uri(Item item) {
+        ItemRest itemRest = itemConverter.convert(item, Projection.DEFAULT);
+        String itemRestURI = utils.linkToSingleResource(itemRest, "self").getHref();
+        return itemRestURI;
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EnrollAdministratorIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EnrollAdministratorIT.java
index c6ea031f7d..08daf06124 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EnrollAdministratorIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EnrollAdministratorIT.java
@@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * test that the enroll process for a new administrator, i.e. create an user and
- * add him to the administrators group, will result in the Administrator Feature(s) to be available to such user.
+ * add user to the administrators group, will result in the Administrator Feature(s) to be available to such user.
  * 
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  *
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvExportIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvExportIT.java
index 7439edb498..bee63d68de 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvExportIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvExportIT.java
@@ -9,7 +9,7 @@ package org.dspace.app.rest.csv;
 
 import static com.jayway.jsonpath.JsonPath.read;
 import static org.hamcrest.Matchers.is;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -18,7 +18,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.dspace.app.rest.converter.DSpaceRunnableParameterConverter;
 import org.dspace.app.rest.matcher.ProcessMatcher;
 import org.dspace.app.rest.model.ParameterValueRest;
@@ -76,9 +76,8 @@ public class CsvExportIT extends AbstractControllerIntegrationTest {
             String token = getAuthToken(admin.getEmail(), password);
 
             getClient(token)
-                .perform(fileUpload("/api/system/scripts/metadata-export/processes")
-                                                                                    .param("properties",
-                                                                                           new Gson().toJson(list)))
+                .perform(multipart("/api/system/scripts/metadata-export/processes")
+                             .param("properties", new ObjectMapper().writeValueAsString(list)))
                 .andExpect(status().isAccepted())
                 .andExpect(jsonPath("$", is(
                     ProcessMatcher.matchProcess("metadata-export",
@@ -128,9 +127,8 @@ public class CsvExportIT extends AbstractControllerIntegrationTest {
             String token = getAuthToken(admin.getEmail(), password);
 
             getClient(token)
-                .perform(fileUpload("/api/system/scripts/metadata-export/processes")
-                             .param("properties",
-                                    new Gson().toJson(list)))
+                .perform(multipart("/api/system/scripts/metadata-export/processes")
+                             .param("properties", new ObjectMapper().writeValueAsString(list)))
                 .andExpect(status().isAccepted())
                 .andExpect(jsonPath("$", is(
                     ProcessMatcher.matchProcess("metadata-export",
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvImportIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvImportIT.java
index b2eb36215a..4883058879 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvImportIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvImportIT.java
@@ -13,8 +13,8 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.dspace.app.rest.converter.DSpaceRunnableParameterConverter;
 import org.dspace.app.rest.matcher.ProcessMatcher;
 import org.dspace.app.rest.matcher.RelationshipMatcher;
@@ -284,9 +284,8 @@ public class CsvImportIT extends AbstractEntityIntegrationTest {
             String token = getAuthToken(admin.getEmail(), password);
 
             getClient(token)
-                .perform(fileUpload("/api/system/scripts/metadata-import/processes").file(bitstreamFile)
-                                                                                    .param("properties",
-                                                                                           new Gson().toJson(list)))
+                .perform(multipart("/api/system/scripts/metadata-import/processes").file(bitstreamFile)
+                                          .param("properties", new ObjectMapper().writeValueAsString(list)))
                 .andExpect(status().isAccepted())
                 .andDo(result -> idRef
                     .set(read(result.getResponse().getContentAsString(), "$.processId")));
@@ -344,9 +343,8 @@ public class CsvImportIT extends AbstractEntityIntegrationTest {
             String token = getAuthToken(admin.getEmail(), password);
 
             getClient(token)
-                .perform(fileUpload("/api/system/scripts/metadata-import/processes").file(bitstreamFile)
-                                                                                    .param("properties",
-                                                                                           new Gson().toJson(list)))
+                .perform(multipart("/api/system/scripts/metadata-import/processes").file(bitstreamFile)
+                                             .param("properties", new ObjectMapper().writeValueAsString(list)))
                 .andExpect(status().isAccepted())
                 .andExpect(jsonPath("$", is(
                     ProcessMatcher.matchProcess("metadata-import",
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvSearchExportIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvSearchExportIT.java
new file mode 100644
index 0000000000..bd52b2ab8e
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/csv/CsvSearchExportIT.java
@@ -0,0 +1,146 @@
+/**
+ * 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/
+ */
+
+package org.dspace.app.rest.csv;
+
+import static com.jayway.jsonpath.JsonPath.read;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.dspace.app.rest.converter.DSpaceRunnableParameterConverter;
+import org.dspace.app.rest.matcher.ProcessMatcher;
+import org.dspace.app.rest.model.ParameterValueRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.ProcessBuilder;
+import org.dspace.content.ProcessStatus;
+import org.dspace.scripts.DSpaceCommandLineParameter;
+import org.dspace.scripts.Process;
+import org.dspace.scripts.ProcessQueryParameterContainer;
+import org.dspace.scripts.Process_;
+import org.dspace.scripts.factory.ScriptServiceFactory;
+import org.dspace.scripts.service.ProcessService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class CsvSearchExportIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private DSpaceRunnableParameterConverter dSpaceRunnableParameterConverter;
+    private ProcessService processService = ScriptServiceFactory.getInstance().getProcessService();
+
+    @Test
+    public void exportSearchQueryTest() throws Exception {
+        AtomicReference<Integer> idRef = new AtomicReference<>();
+        List<DSpaceCommandLineParameter> parameterList = new ArrayList<>();
+        parameterList.add(new DSpaceCommandLineParameter("-q", "subject:subject1" ));
+        List<ParameterValueRest> restparams = parameterList.stream()
+            .map(dSpaceCommandLineParameter -> dSpaceRunnableParameterConverter.convert(dSpaceCommandLineParameter,
+                Projection.DEFAULT)).collect(
+                Collectors.toList());
+
+        try {
+            String token = getAuthToken(admin.getEmail(), password);
+            getClient(token).perform(multipart("/api/system/scripts/metadata-export-search/processes")
+                    .param("properties", new ObjectMapper().writeValueAsString(restparams)))
+                .andExpect(status().isAccepted())
+                .andExpect(jsonPath("$",
+                    ProcessMatcher.matchProcess("metadata-export-search", admin.getID().toString(), parameterList,
+                        ProcessStatus.COMPLETED)))
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.processId")));
+        } finally {
+            ProcessBuilder.deleteProcess(idRef.get());
+        }
+    }
+
+    @Test
+    public void exportSearchUnauthorizedTest() throws Exception {
+        List<DSpaceCommandLineParameter> parameterList = new ArrayList<>();
+        parameterList.add(new DSpaceCommandLineParameter("-q", "subject:subject1"));
+        List<ParameterValueRest> restparams = parameterList.stream()
+            .map(dSpaceCommandLineParameter -> dSpaceRunnableParameterConverter.convert(dSpaceCommandLineParameter,
+                Projection.DEFAULT)).collect(
+                Collectors.toList());
+
+        getClient().perform(multipart("/api/system/scripts/metadata-export-search/processes")
+                .param("properties", new ObjectMapper().writeValueAsString(restparams)))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void exportSearchForbiddenTest() throws Exception {
+        List<DSpaceCommandLineParameter> parameterList = new ArrayList<>();
+        parameterList.add(new DSpaceCommandLineParameter("-q", "subject:subject1"));
+        List<ParameterValueRest> restparams = parameterList.stream()
+            .map(dSpaceCommandLineParameter -> dSpaceRunnableParameterConverter.convert(dSpaceCommandLineParameter,
+                Projection.DEFAULT)).collect(
+                Collectors.toList());
+
+        String token = getAuthToken(eperson.getEmail(), password);
+        getClient(token).perform(multipart("/api/system/scripts/metadata-export-search/processes")
+                .param("properties", new ObjectMapper().writeValueAsString(restparams)))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void exportSearchInvalidQuery() throws Exception {
+        AtomicReference<Integer> idRef = new AtomicReference<>();
+        List<DSpaceCommandLineParameter> parameterList = new ArrayList<>();
+        parameterList.add(new DSpaceCommandLineParameter("-q", "blabla"));
+        List<ParameterValueRest> restparams = parameterList.stream()
+            .map(dSpaceCommandLineParameter -> dSpaceRunnableParameterConverter.convert(dSpaceCommandLineParameter,
+                Projection.DEFAULT)).collect(
+                Collectors.toList());
+
+
+        String token = getAuthToken(admin.getEmail(), password);
+        try {
+            getClient(token).perform(multipart("/api/system/scripts/metadata-export-search/processes")
+                                         .param("properties", new ObjectMapper().writeValueAsString(restparams)))
+                            .andExpect(status().isAccepted())
+                            .andDo(result -> System.out.println(result.getResponse().getContentAsString()))
+                            .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.processId")));
+        } finally {
+            ProcessBuilder.deleteProcess(idRef.get());
+        }
+    }
+
+    @Test
+    public void exportSearchInvalidDiscoveryFacets() throws Exception {
+        List<DSpaceCommandLineParameter> parameterList = new ArrayList<>();
+        parameterList.add(new DSpaceCommandLineParameter("-f", "nonExisting,equals=bla"));
+        List<ParameterValueRest> restparams = parameterList.stream()
+            .map(dSpaceCommandLineParameter -> dSpaceRunnableParameterConverter.convert(dSpaceCommandLineParameter,
+                Projection.DEFAULT)).collect(
+                Collectors.toList());
+
+
+        String token = getAuthToken(admin.getEmail(), password);
+        getClient(token).perform(multipart("/api/system/scripts/metadata-export-search/processes")
+                .param("properties", new ObjectMapper().writeValueAsString(restparams)))
+            .andExpect(status().isInternalServerError());
+
+        // NOTE: While the above call returns 500 (from Discovery), it DOES create a Process.
+        // We must find that process by its name and eperson
+        ProcessQueryParameterContainer processQueryParameterContainer = new ProcessQueryParameterContainer();
+        processQueryParameterContainer.addToQueryParameterMap(Process_.NAME, "metadata-export-search");
+        processQueryParameterContainer.addToQueryParameterMap(Process_.E_PERSON, admin);
+        // Find all processes which match & clean them all up.
+        List<Process> processes = processService.search(context, processQueryParameterContainer, -1, -1);
+        for (Process process : processes) {
+            ProcessBuilder.deleteProcess(process.getID());
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java
index fb8b44fa17..e020c04b1a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java
@@ -142,10 +142,10 @@ public class DeleteEPersonSubmitterIT extends AbstractControllerIntegrationTest
 
 
         Item item = itemService.find(context, installItem.getID());
-        RequestItemAuthor requestItemAuthor = requestItemAuthorExtractor.getRequestItemAuthor(context, item);
+        List<RequestItemAuthor> requestItemAuthor = requestItemAuthorExtractor.getRequestItemAuthor(context, item);
 
-        assertEquals("Help Desk", requestItemAuthor.getFullName());
-        assertEquals("dspace-help@myu.edu", requestItemAuthor.getEmail());
+        assertEquals("Help Desk", requestItemAuthor.get(0).getFullName());
+        assertEquals("dspace-help@myu.edu", requestItemAuthor.get(0).getEmail());
     }
 
     /**
@@ -171,7 +171,7 @@ public class DeleteEPersonSubmitterIT extends AbstractControllerIntegrationTest
 
         Item item = installItemService.installItem(context, wsi);
 
-        List<Operation> opsToWithDraw = new ArrayList<Operation>();
+        List<Operation> opsToWithDraw = new ArrayList<>();
         ReplaceOperation replaceOperationToWithDraw = new ReplaceOperation("/withdrawn", true);
         opsToWithDraw.add(replaceOperationToWithDraw);
         String patchBodyToWithdraw = getPatchContent(opsToWithDraw);
@@ -191,7 +191,7 @@ public class DeleteEPersonSubmitterIT extends AbstractControllerIntegrationTest
 
         assertNull(retrieveItemSubmitter(item.getID()));
 
-        List<Operation> opsToReinstate = new ArrayList<Operation>();
+        List<Operation> opsToReinstate = new ArrayList<>();
         ReplaceOperation replaceOperationToReinstate = new ReplaceOperation("/withdrawn", false);
         opsToReinstate.add(replaceOperationToReinstate);
         String patchBodyToReinstate = getPatchContent(opsToReinstate);
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/hdlresolver/HdlResolverRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/hdlresolver/HdlResolverRestControllerIT.java
new file mode 100644
index 0000000000..8227caffe6
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/hdlresolver/HdlResolverRestControllerIT.java
@@ -0,0 +1,327 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.hdlresolver;
+
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.not;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.handle.hdlresolver.HdlResolverServiceImpl;
+import org.dspace.services.ConfigurationService;
+import org.hamcrest.core.StringContains;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.servlet.ResultMatcher;
+
+/**
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca@4science.com)
+ *
+ */
+public class HdlResolverRestControllerIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    /**
+     * Verifies that any mapped <code>hdlIdentifier</code> returns the
+     * corresponding <code>handle URL</code>
+     * 
+     * @throws Exception
+     * 
+     */
+    @Test
+    public void givenMappedIdentifierWhenCallHdlresolverThenReturnsMappedURL() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // ** START GIVEN **
+
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
+                .withLogo("TestingContentForLogo").build();
+
+        Item publicItem1 = ItemBuilder.createItem(context, col1).withTitle("Public item 1").withIssueDate("2017-10-17")
+                .withAuthor("Smith, Donald").withAuthor("Doe, John").withSubject("ExtraEntry")
+                .withHandle("123456789/testHdlResolver").build();
+
+        context.restoreAuthSystemState();
+
+        // ** END GIVEN **
+
+        ResultMatcher matchHandleResponse = jsonPath("$[0]",
+                StringContains.containsString("123456789/testHdlResolver"));
+        getClient()
+            .perform(get(HdlResolverRestController.LISTHANDLES + publicItem1.getHandle()))
+            .andExpect(status().isOk())
+            .andExpect(matchHandleResponse);
+        getClient()
+            .perform(get(HdlResolverRestController.RESOLVE  + publicItem1.getHandle()))
+            .andExpect(status().isOk())
+            .andExpect(matchHandleResponse);
+        getClient()
+            .perform(get(HdlResolverRestController.HDL_RESOLVER + publicItem1.getHandle()))
+            .andExpect(status().isOk())
+            .andExpect(matchHandleResponse);
+        getClient()
+            .perform(get("/wrongController/" + publicItem1.getHandle()))
+            .andExpect(status().isNotFound());
+
+    }
+
+    @Test
+    public void givenAnyHandlesWhenDisabledListhandleThenReturnsNotFoundResp()
+            throws Exception {
+        this.configurationService.setProperty(HdlResolverServiceImpl.LISTHANDLES_HIDE_PROP, true);
+        try {
+            context.turnOffAuthorisationSystem();
+            parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+
+            Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
+                    .withLogo("TestingContentForLogo").build();
+
+            String handlePrefix = "123456789/PREFIX";
+            ItemBuilder.createItem(context, col1)
+                .withTitle("Public item 1")
+                .withIssueDate("2017-10-17")
+                .withAuthor("Smith, Donald")
+                .withAuthor("Doe, John")
+                .withSubject("ExtraEntry")
+                .withHandle(handlePrefix)
+                .build();
+            context.restoreAuthSystemState();
+
+            getClient()
+                .perform(get(HdlResolverRestController.LISTHANDLES))
+                .andExpect(status().isNotFound());
+
+            getClient()
+                .perform(get(HdlResolverRestController.LISTHANDLES + handlePrefix))
+                .andExpect(status().isNotFound());
+
+            getClient()
+                .perform(get(HdlResolverRestController.LISTHANDLES + "anyHandlePrefixHere"))
+                .andExpect(status().isNotFound());
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            this.configurationService.setProperty(HdlResolverServiceImpl.LISTHANDLES_HIDE_PROP, false);
+        }
+
+    }
+
+    @Test
+    public void givenMappedHandlesWhenCalledListHandlesWithoutPrefixThenReturnsBadRequestResp()
+        throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
+                .withLogo("TestingContentForLogo").build();
+
+        String handlePrefix = "123456789/PREFIX";
+        ItemBuilder.createItem(context, col1)
+            .withTitle("Public item 1")
+            .withIssueDate("2017-10-17")
+            .withAuthor("Smith, Donald")
+            .withAuthor("Doe, John")
+            .withSubject("ExtraEntry")
+            .withHandle(handlePrefix)
+            .build();
+        context.restoreAuthSystemState();
+
+        getClient()
+            .perform(get(HdlResolverRestController.LISTHANDLES))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void givenMappedHandlesWhenCalledListHandlesWithPrefixThenReturnsAllHandlesWithThatPrefix()
+            throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // ** START GIVEN **
+
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
+                .withLogo("TestingContentForLogo").build();
+
+        String handlePrefix = "123456789/PREFIX";
+        ItemBuilder.createItem(context, col1)
+            .withTitle("Public item 1")
+            .withIssueDate("2017-10-17")
+            .withAuthor("Smith, Donald")
+            .withAuthor("Doe, John")
+            .withSubject("ExtraEntry")
+            .withHandle(handlePrefix)
+            .build();
+
+        String handlePrefix1 = "123456789/PREFIX1";
+        ItemBuilder.createItem(context, col1)
+            .withTitle("Public item 1")
+            .withIssueDate("2017-10-17")
+            .withAuthor("Smith, Donald")
+            .withAuthor("Doe, John")
+            .withSubject("ExtraEntry")
+            .withHandle(handlePrefix1)
+            .build();
+
+        String noHandle = "123456789/NOPREFIX";
+        ItemBuilder.createItem(context, col1)
+            .withTitle("Public item 1")
+            .withIssueDate("2017-10-17")
+            .withAuthor("Smith, Donald")
+            .withAuthor("Doe, John")
+            .withSubject("ExtraEntry")
+            .withHandle(noHandle)
+            .build();
+
+        String testHandle = "123456789/TEST";
+        ItemBuilder.createItem(context, col1)
+            .withTitle("Public item 1")
+            .withIssueDate("2017-10-17")
+            .withAuthor("Smith, Donald")
+            .withAuthor("Doe, John")
+            .withSubject("ExtraEntry")
+            .withHandle(testHandle)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        // ** END GIVEN **
+
+        ResultMatcher matchHandleResponse =
+                jsonPath("$[*]",
+                        allOf(
+                            containsInAnyOrder(handlePrefix, handlePrefix1),
+                            not(containsInAnyOrder(noHandle, testHandle))
+                        )
+                );
+
+        getClient()
+            .perform(get(HdlResolverRestController.LISTHANDLES + handlePrefix))
+            .andExpect(status().isOk())
+            .andExpect(matchHandleResponse);
+
+    }
+
+    /**
+     * Verifies that a null hdlIdentifier returns a
+     * 
+     * <code>HttpStatus.BAD_REQUEST</code>
+     * 
+     * @throws Exception
+     * @throws SQLException
+     * 
+     */
+    @Test
+    public void givenNullHdlIdentifierWhenCallHdlresolverThenReturnsBadRequest() throws Exception {
+
+        getClient().perform(
+                get(HdlResolverRestController.HDL_RESOLVER + "null"))
+                .andExpect(status().isBadRequest());
+        getClient().perform(
+                get(HdlResolverRestController.RESOLVE + "null"))
+                .andExpect(status().isBadRequest());
+
+    }
+
+    /**
+     * Verifies that an empty hdlIdentifier returns a
+     * <code>HttpStatus.BAD_REQUEST</code>
+     * 
+     * @throws Exception
+     * @throws SQLException
+     * 
+     */
+    @Test
+    public void givenEmptyHdlIdentifierWhenCallHdlresolverThenReturnsNull() throws Exception {
+
+        getClient()
+            .perform(get(HdlResolverRestController.HDL_RESOLVER + " "))
+            .andExpect(status().isBadRequest());
+        getClient()
+            .perform(get(HdlResolverRestController.RESOLVE + " "))
+            .andExpect(status().isBadRequest());
+    }
+
+    /**
+     * Verifies that any unmapped hdlIdentifier returns a null response
+     * 
+     * @throws Exception
+     * 
+     */
+    @Test
+    public void givenIdentifierNotMappedWhenCallHdlresolverThenReturnsNull() throws Exception {
+        getClient()
+            .perform(get(HdlResolverRestController.HDL_RESOLVER + "testHdlResolver/2"))
+            .andExpect(status().isOk()).andExpect(content().string("null"));
+        getClient()
+            .perform(get(HdlResolverRestController.RESOLVE + "testHdlResolver/2"))
+            .andExpect(status().isOk()).andExpect(content().string("null"));
+    }
+
+    @Test
+    public void givenMappedPrefixWhenNoAdditionalPrefixesConfThenReturnsHandlePrefix() throws Exception {
+        String handlePrefix = this.configurationService.getProperty("handle.prefix");
+        ResultMatcher matchHandleResponse =
+            jsonPath("$[*]",
+                    allOf(
+                            containsInAnyOrder(handlePrefix)
+                    )
+            );
+
+        getClient()
+            .perform(get(HdlResolverRestController.LISTPREFIXES))
+            .andExpect(status().isOk())
+            .andExpect(matchHandleResponse);
+    }
+
+    @Test
+    public void givenMappedPrefixWhenAdditionalPrefixesConfThenReturnsAllOfThem() throws Exception {
+        String handlePrefix = this.configurationService.getProperty("handle.prefix");
+        String[] defaultValue = this.configurationService.getArrayProperty("handle.additional.prefixes");
+        try {
+            String additionalPrefixes = "additional1,additional2";
+            this.configurationService.setProperty("handle.additional.prefixes", additionalPrefixes);
+
+            List<String> validPrefixes = Arrays.asList(additionalPrefixes.split(","));
+            validPrefixes.add(handlePrefix);
+            ResultMatcher matchHandleResponse =
+                    jsonPath("$[*]",
+                            allOf(
+                                containsInAnyOrder(validPrefixes)
+                            )
+                    );
+
+            getClient()
+                .perform(get(HdlResolverRestController.LISTPREFIXES))
+                .andExpect(status().isOk())
+                .andExpect(matchHandleResponse);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            this.configurationService.setProperty("handle.additional.prefixse", defaultValue);
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/health/GeoIpHealthIndicatorTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/health/GeoIpHealthIndicatorTest.java
new file mode 100644
index 0000000000..d47493f23c
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/health/GeoIpHealthIndicatorTest.java
@@ -0,0 +1,74 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.health;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anEmptyMap;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.when;
+
+import java.util.Map;
+
+import com.maxmind.geoip2.DatabaseReader;
+import org.dspace.app.rest.configuration.ActuatorConfiguration;
+import org.dspace.statistics.GeoIpService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.Status;
+
+/**
+ * Unit tests for {@link GeoIpHealthIndicator}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class GeoIpHealthIndicatorTest {
+
+    @Mock
+    private GeoIpService geoIpService;
+
+    @InjectMocks
+    private GeoIpHealthIndicator geoIpHealthIndicator;
+
+    @Mock
+    private DatabaseReader databaseReader;
+
+    @Test
+    public void testWithGeoIpConfiguredCorrectly() {
+        when(geoIpService.getDatabaseReader()).thenReturn(databaseReader);
+
+        Health health = geoIpHealthIndicator.health();
+
+        assertThat(health.getStatus(), is(Status.UP));
+        assertThat(health.getDetails(), anEmptyMap());
+    }
+
+    @Test
+    public void testWithGeoIpWrongConfiguration() {
+        when(geoIpService.getDatabaseReader()).thenThrow(new IllegalStateException("Missing db file"));
+
+        Health health = geoIpHealthIndicator.health();
+
+        assertThat(health.getStatus(), is(ActuatorConfiguration.UP_WITH_ISSUES_STATUS));
+        assertThat(health.getDetails(), is(Map.of("reason", "Missing db file")));
+    }
+
+    @Test
+    public void testWithUnexpectedError() {
+        when(geoIpService.getDatabaseReader()).thenThrow(new RuntimeException("Generic error"));
+
+        Health health = geoIpHealthIndicator.health();
+
+        assertThat(health.getStatus(), is(Status.DOWN));
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFControllerIT.java
index 71090cd70f..b4d1f785d4 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFControllerIT.java
@@ -22,28 +22,34 @@ import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.IOUtils;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.builder.BitstreamBuilder;
+import org.dspace.builder.BundleBuilder;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.EPersonBuilder;
 import org.dspace.builder.GroupBuilder;
 import org.dspace.builder.ItemBuilder;
 import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
+import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class IIIFControllerIT extends AbstractControllerIntegrationTest {
 
-    public static final String IIIFBundle = "IIIF";
+    public static final String IIIFBundle = "RANGETEST";
 
     @Autowired
     ItemService itemService;
 
+    @Autowired
+    private ConfigurationService configurationService;
+
     @Test
     public void disabledTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -81,7 +87,7 @@ public class IIIFControllerIT extends AbstractControllerIntegrationTest {
     }
 
     @Test
-    public void findOneIIIFSearchableEntityTypeWithGlobalConfigIT() throws Exception {
+    public void findOneIIIFSearchableItemWithDefaultDimensionsIT() throws Exception {
         context.turnOffAuthorisationSystem();
         parentCommunity = CommunityBuilder.createCommunity(context)
                 .withName("Parent Community")
@@ -134,7 +140,8 @@ public class IIIFControllerIT extends AbstractControllerIntegrationTest {
                 .andExpect(jsonPath("$.sequences[0].canvases[0].@id",
                         Matchers.containsString("/iiif/" + publicItem1.getID() + "/canvas/c0")))
                 .andExpect(jsonPath("$.sequences[0].canvases[0].label", is("Page 1")))
-                .andExpect(jsonPath("$.sequences[0].canvases[0].width", is(2200)))
+                .andExpect(jsonPath("$.sequences[0].canvases[0].width", is(64)))
+                .andExpect(jsonPath("$.sequences[0].canvases[0].height", is(64)))
                 .andExpect(jsonPath("$.sequences[0].canvases[0].images[0].resource.service.@id",
                         Matchers.endsWith(bitstream1.getID().toString())))
                 .andExpect(jsonPath("$.sequences[0].canvases[0].metadata[0].label", is("File name")))
@@ -469,40 +476,39 @@ public class IIIFControllerIT extends AbstractControllerIntegrationTest {
                     .withMimeType("image/tiff")
                     .build();
         }
-
         context.restoreAuthSystemState();
-        // expect structures elements with label and canvas id.
+
+        // Expected structures elements based on the above test content
+        // NOTE: we cannot guarantee the order of Bundles in the Manifest, therefore this test has to simply check
+        // that each Bundle exists in the manifest with Canvases corresponding to each bitstream.
         getClient().perform(get("/iiif/" + publicItem1.getID() + "/manifest"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.@context", is("http://iiif.io/api/presentation/2/context.json")))
-                .andExpect(jsonPath("$.sequences[0].canvases[0].@id",
-                        Matchers.containsString("/iiif/" + publicItem1.getID() + "/canvas/c0")))
-                .andExpect(jsonPath("$.sequences[0].canvases[0].label", is("Global 1")))
-                .andExpect(jsonPath("$.sequences[0].canvases[0].width", is(2000)))
-                .andExpect(jsonPath("$.sequences[0].canvases[0].height", is(3000)))
-                .andExpect(jsonPath("$.sequences[0].canvases[1].label", is("Global 2")))
-                .andExpect(jsonPath("$.sequences[0].canvases[2].label", is("Global 3")))
-                .andExpect(jsonPath("$.structures[0].@id",
-                        Matchers.endsWith("/iiif/" + publicItem1.getID() + "/manifest/range/r0")))
-                .andExpect(jsonPath("$.structures[0].label", is("Table of Contents")))
-                .andExpect(jsonPath("$.structures[0].viewingHint", is("top")))
-                .andExpect(jsonPath("$.structures[0].ranges[0]",
-                        Matchers.endsWith("/iiif/" + publicItem1.getID() + "/manifest/range/r0-0")))
-                .andExpect(jsonPath("$.structures[0].ranges[1]",
-                        Matchers.endsWith("/iiif/" + publicItem1.getID() + "/manifest/range/r0-1")))
-                .andExpect(jsonPath("$.structures[1].@id",
-                        Matchers.endsWith("/iiif/" + publicItem1.getID() + "/manifest/range/r0-0")))
-                .andExpect(jsonPath("$.structures[1].label", is("ORIGINAL")))
-                .andExpect(jsonPath("$.structures[1].canvases[0]",
-                        Matchers.containsString("/iiif/" + publicItem1.getID() + "/canvas/c0")))
-                .andExpect(jsonPath("$.structures[2].@id",
-                        Matchers.endsWith("/iiif/" + publicItem1.getID() + "/manifest/range/r0-1")))
-                .andExpect(jsonPath("$.structures[2].label", is("IIIF")))
-                .andExpect(jsonPath("$.structures[2].canvases[0]",
-                        Matchers.containsString("/iiif/" + publicItem1.getID() + "/canvas/c1")))
-                .andExpect(jsonPath("$.structures[2].canvases[1]",
-                        Matchers.containsString("/iiif/" + publicItem1.getID() + "/canvas/c2")))
-                .andExpect(jsonPath("$.service").exists());
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.@context", is("http://iiif.io/api/presentation/2/context.json")))
+                   // should contain 3 canvases, corresponding to each bitstream
+                   .andExpect(jsonPath("$.sequences[0].canvases[*].label",
+                                       Matchers.contains("Global 1", "Global 2", "Global 3")))
+
+                   // First structure should be a Table of Contents
+                   .andExpect(jsonPath("$.structures[0].@id",
+                                       Matchers.endsWith("/iiif/" + publicItem1.getID() + "/manifest/range/r0")))
+                   .andExpect(jsonPath("$.structures[0].label", is("Table of Contents")))
+                   .andExpect(jsonPath("$.structures[0].viewingHint", is("top")))
+                   .andExpect(jsonPath("$.structures[0].ranges[0]",
+                                       Matchers.endsWith("/iiif/" + publicItem1.getID() + "/manifest/range/r0-0")))
+                   .andExpect(jsonPath("$.structures[0].ranges[1]",
+                                       Matchers.endsWith("/iiif/" + publicItem1.getID() + "/manifest/range/r0-1")))
+
+                   // Should contain a structure with label=RANGETEST, corresponding to IIIF bundle
+                   // It should have exactly 2 canvases (corresponding to 2 bitstreams)
+                   .andExpect(jsonPath("$.structures[?(@.label=='RANGETEST')].canvases[0]").exists())
+                   .andExpect(jsonPath("$.structures[?(@.label=='RANGETEST')].canvases[1]").exists())
+                   .andExpect(jsonPath("$.structures[?(@.label=='RANGETEST')].canvases[2]").doesNotExist())
+
+                   // Should contain a structure with label=ORIGINAL, corresponding to ORIGINAL bundle
+                   // It should have exactly 1 canvas (corresponding to 1 bitstream)
+                   .andExpect(jsonPath("$.structures[?(@.label=='ORIGINAL')].canvases[0]").exists())
+                   .andExpect(jsonPath("$.structures[?(@.label=='ORIGINAL')].canvases[1]").doesNotExist())
+                   .andExpect(jsonPath("$.service").exists());
     }
 
     @Test
@@ -696,6 +702,79 @@ public class IIIFControllerIT extends AbstractControllerIntegrationTest {
                 .andExpect(jsonPath("$.service").exists());
     }
 
+    @Test
+    public void findOneWithAlternateIIIFBundleAndNoStructures() throws Exception {
+
+        String altBundle = "IIIFAlternate";
+
+        context.turnOffAuthorisationSystem();
+
+        configurationService.setProperty("iiif.exclude.toc.bundle", altBundle);
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
+                                           .build();
+        Item publicItem1 = ItemBuilder.createItem(context, col1)
+                                      .withTitle("Public item 1")
+                                      .withIssueDate("2017-10-17")
+                                      .withAuthor("Smith, Donald").withAuthor("Doe, John")
+                                      .withIIIFCanvasHeight(3000)
+                                      .withIIIFCanvasWidth(2000)
+                                      .withIIIFCanvasNaming("Global")
+                                      .enableIIIF()
+                                      .enableIIIFSearch()
+                                      .build();
+
+        String bitstreamContent = "ThisIsSomeText";
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            // add PDF to ORIGINAL
+            BitstreamBuilder
+                .createBitstream(context, publicItem1, is)
+                .withName("Bitstream1.pdf")
+                .withMimeType("application/pdf")
+                .build();
+        }
+        // Add images to the alternate IIIF bundle
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            BitstreamBuilder
+                .createBitstream(context, publicItem1, is, altBundle)
+                .withName("Bitstream2.png")
+                .withMimeType("image/png")
+                .build();
+        }
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            BitstreamBuilder
+                .createBitstream(context, publicItem1, is, altBundle)
+                .withName("Bitstream3.tiff")
+                .withMimeType("image/tiff")
+                .build();
+        }
+        context.restoreAuthSystemState();
+
+        // Expected a rendering element and no structures (because all images are inside the toc excluded bundle)
+        getClient().perform(get("/iiif/" + publicItem1.getID() + "/manifest"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.@context", is("http://iiif.io/api/presentation/2/context.json")))
+                   // should contain 3 canvases, corresponding to each bitstream
+                   .andExpect(jsonPath("$.sequences[0].canvases[*].label",
+                       Matchers.contains("Global 1", "Global 2")))
+
+                   // structures should not be present
+                   .andExpect(jsonPath("$.structures").doesNotExist())
+
+                   // Should sequence with exactly 2 canvases (corresponding to 2 bitstreams)
+                   .andExpect(jsonPath("$.sequences[0].canvases[0]").exists())
+                   .andExpect(jsonPath("$.sequences[0].canvases[1]").exists())
+                   .andExpect(jsonPath("$.sequences[1].canvases[2]").doesNotExist())
+
+                   // Should include the pdf file in rendering
+                   .andExpect(jsonPath("$.rendering[?(@.format=='application/pdf')]").exists());
+
+    }
+
+
     @Test
     public void findOneIIIFNotSearcheableIT() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -1214,4 +1293,45 @@ public class IIIFControllerIT extends AbstractControllerIntegrationTest {
                    .andExpect(jsonPath("$.metadata[0].value", is("Public item (revised)")));
     }
 
+    @Test
+    public void setDefaultCanvasDimensionCustomBundle() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
+                                           .build();
+
+        Item publicItem1 = ItemBuilder.createItem(context, col1)
+                                      .withTitle("Public item 1")
+                                      .withIssueDate("2017-10-17")
+                                      .withAuthor("Smith, Donald").withAuthor("Doe, John")
+                                      .enableIIIF()
+                                      .build();
+
+
+        Bundle targetBundle = BundleBuilder.createBundle(context, publicItem1)
+                                           .withName(IIIFBundle)
+                                           .build();
+
+        String bitstreamContent = "ThisIsSomeDummyText";
+        try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
+            Bitstream bitstream1 = BitstreamBuilder
+                    .createBitstream(context, targetBundle, is)
+                    .withName("Bitstream1.jpg")
+                    .withMimeType("image/jpeg")
+                    .build();
+        }
+        context.restoreAuthSystemState();
+
+        // canvas dimensions using bitstream in the custom bundle (no bitstreams in ORIGINAL)
+        getClient().perform(get("/iiif/" + publicItem1.getID() + "/manifest"))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.sequences[0].canvases[0].width", is(64)))
+                   .andExpect(jsonPath("$.sequences[0].canvases[0].height", is(64)));
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/link/search/HealthIndicatorMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/link/search/HealthIndicatorMatcher.java
new file mode 100644
index 0000000000..4e681c95cb
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/link/search/HealthIndicatorMatcher.java
@@ -0,0 +1,46 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.link.search;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+
+import java.util.Map;
+
+import org.hamcrest.Matcher;
+import org.springframework.boot.actuate.health.Status;
+
+/**
+ * Matcher for the health indicators.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public final class HealthIndicatorMatcher {
+
+    private HealthIndicatorMatcher() {
+
+    }
+
+    public static Matcher<? super Object> matchDatabase(Status status) {
+        return allOf(
+            hasJsonPath("$.db"),
+            hasJsonPath("$.db.status", is(status.getCode())),
+            hasJsonPath("$.db.components", allOf(
+                match("dspaceDataSource", status, Map.of("database", "H2", "validationQuery", "isValid()")),
+                match("dataSource", status, Map.of("database", "H2", "validationQuery", "isValid()")))));
+    }
+
+    public static Matcher<? super Object> match(String name, Status status, Map<String, Object> details) {
+        return allOf(
+            hasJsonPath("$." + name),
+            hasJsonPath("$." + name + ".status", is(status.getCode())),
+            hasJsonPath("$." + name + ".details", is(details)));
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/AuthenticationStatusMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/AuthenticationStatusMatcher.java
index 66d4ca19d4..1e986c2181 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/AuthenticationStatusMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/AuthenticationStatusMatcher.java
@@ -27,7 +27,8 @@ public class AuthenticationStatusMatcher {
      */
     public static Matcher<? super Object> matchFullEmbeds() {
         return matchEmbeds(
-                "eperson"
+                "eperson",
+                "specialGroups"
         );
     }
 
@@ -36,7 +37,9 @@ public class AuthenticationStatusMatcher {
      */
     public static Matcher<? super Object> matchLinks() {
         return allOf(
+                //FIXME https://github.com/DSpace/DSpace/issues/8274
                 hasJsonPath("$._links.eperson.href", containsString("api/eperson/epersons")),
-                hasJsonPath("$._links.self.href", containsString("api/authn/status")));
+                hasJsonPath("$._links.self.href", containsString("api/authn/status")),
+                hasJsonPath("$._links.specialGroups.href", containsString("api/authn/status/specialGroups")));
     }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ClaimedTaskMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ClaimedTaskMatcher.java
index 0d2ba67f16..4ab812f82c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ClaimedTaskMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ClaimedTaskMatcher.java
@@ -28,8 +28,8 @@ public class ClaimedTaskMatcher {
     /**
      * Check if the returned json expose all the required links and properties
      * 
-     * @param ptask
-     *            the pool task
+     * @param cTask
+     *            the claimed task
      * @param step
      *            the step name
      * @return
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ExternalSourceMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ExternalSourceMatcher.java
index ce0cda0b58..f304540eff 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ExternalSourceMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ExternalSourceMatcher.java
@@ -10,8 +10,12 @@ package org.dspace.app.rest.matcher;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.dspace.app.rest.test.AbstractControllerIntegrationTest.REST_SERVER_URL;
 import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.dspace.external.provider.ExternalDataProvider;
 import org.hamcrest.Matcher;
 
@@ -20,6 +24,28 @@ public class ExternalSourceMatcher {
     private ExternalSourceMatcher() {
     }
 
+    /**
+     * Matcher which checks if all external source providers are listed (in exact order), up to the maximum number
+     * @param providers List of providers to check against
+     * @param max maximum number to check
+     * @return Matcher for this list of providers
+     */
+    public static Matcher<Iterable<? extends List<Matcher>>> matchAllExternalSources(
+        List<ExternalDataProvider> providers, int max) {
+        List<Matcher> matchers = new ArrayList<>();
+        int count = 0;
+        for (ExternalDataProvider provider: providers) {
+            count++;
+            if (count > max) {
+                break;
+            }
+            matchers.add(matchExternalSource(provider));
+        }
+
+        // Make sure all providers exist in this exact order
+        return contains(matchers.toArray(new Matcher[0]));
+    }
+
     public static Matcher<? super Object> matchExternalSource(ExternalDataProvider provider) {
         return matchExternalSource(provider.getSourceIdentifier(), provider.getSourceIdentifier(), false);
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/FacetValueMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/FacetValueMatcher.java
index a68356da53..2c7cebdbe9 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/FacetValueMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/FacetValueMatcher.java
@@ -31,6 +31,13 @@ public class FacetValueMatcher {
         );
     }
 
+    public static Matcher<? super Object> entryFacetWithoutSelfLink(String label) {
+        return allOf(
+            hasJsonPath("$.label", is(label)),
+            hasJsonPath("$.type", is("discover"))
+        );
+    }
+
     public static Matcher<? super Object> entryAuthorWithAuthority(String label, String authority, int count) {
         return allOf(
             hasJsonPath("$.authorityKey", is(authority)),
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java
index 389b8bf492..371ad6b4b4 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java
@@ -50,6 +50,7 @@ public class ItemMatcher {
      */
     public static Matcher<? super Object> matchFullEmbeds() {
         return matchEmbeds(
+                "accessStatus",
                 "bundles[]",
                 "mappedCollections[]",
                 "owningCollection",
@@ -65,6 +66,7 @@ public class ItemMatcher {
      */
     public static Matcher<? super Object> matchLinks(UUID uuid) {
         return HalMatcher.matchLinks(REST_SERVER_URL + "core/items/" + uuid,
+                "accessStatus",
                 "bundles",
                 "mappedCollections",
                 "owningCollection",
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/MetadataMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/MetadataMatcher.java
index 0b6c8c972a..4a6ca96dfe 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/MetadataMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/MetadataMatcher.java
@@ -15,6 +15,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
 import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
 import org.hamcrest.core.StringEndsWith;
 
 /**
@@ -67,6 +68,22 @@ public class MetadataMatcher {
         return hasJsonPath("$.['" + key + "'][" + position + "].value", is(value));
     }
 
+    /**
+     * Gets a matcher to ensure a given value is present at a specific position in
+     * the list of values for a given key.
+     *
+     * @param key       the metadata key.
+     * @param value     the value that must be present.
+     * @param authority the authority that must be present.
+     * @param position  the position it must be present at.
+     * @return the matcher.
+     */
+    public static Matcher<? super Object> matchMetadata(String key, String value, String authority, int position) {
+        Matcher<Object> hasValue = hasJsonPath("$.['" + key + "'][" + position + "].value", is(value));
+        Matcher<Object> hasAuthority = hasJsonPath("$.['" + key + "'][" + position + "].authority", is(authority));
+        return Matchers.allOf(hasValue, hasAuthority);
+    }
+
     /**
      * Gets a matcher to ensure a given key is not present.
      *
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidHistoryMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidHistoryMatcher.java
new file mode 100644
index 0000000000..746e41673a
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidHistoryMatcher.java
@@ -0,0 +1,39 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.orcid.OrcidHistory;
+import org.hamcrest.Matcher;
+
+/**
+ * Utility class to construct a Matcher for an OrcidHistory
+ *
+ * @author Mykhaylo Boychuk (4science.it)
+ *
+ */
+public class OrcidHistoryMatcher {
+
+    private OrcidHistoryMatcher() {}
+
+    public static Matcher<? super Object> matchOrcidHistory(OrcidHistory orcidHistory, int status, String putCode,
+        String responseMessage) {
+        return allOf(
+                hasJsonPath("$.id", is(orcidHistory.getID())),
+                hasJsonPath("$.profileItemId", is(orcidHistory.getProfileItem().getID().toString())),
+                hasJsonPath("$.entityId", is(orcidHistory.getEntity().getID().toString())),
+                hasJsonPath("$.status", is(status)),
+                hasJsonPath("$.putCode", is(putCode)),
+                hasJsonPath("$.responseMessage", is(responseMessage)),
+                hasJsonPath("$.type", is("orcidhistory"))
+        );
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidQueueMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidQueueMatcher.java
new file mode 100644
index 0000000000..677de5e1b4
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/OrcidQueueMatcher.java
@@ -0,0 +1,41 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import org.dspace.content.Item;
+import org.dspace.orcid.OrcidQueue;
+import org.hamcrest.Matcher;
+
+/**
+ * Utility class to construct a Matcher for an OrcidQueue
+ *
+ * @author Mykhaylo Boychuk (4science.it)
+ *
+ */
+public class OrcidQueueMatcher {
+
+    private OrcidQueueMatcher() {}
+
+    public static Matcher<? super Object> matchOrcidQueue(OrcidQueue orcidQueue) {
+        Item entity = orcidQueue.getEntity();
+        return allOf(
+                hasJsonPath("$.id", is(orcidQueue.getID())),
+            hasJsonPath("$.profileItemId", is(orcidQueue.getProfileItem().getID().toString())),
+                hasJsonPath("$.entityId", entity != null ? is(entity.getID().toString()) : nullValue()),
+                hasJsonPath("$.description", is(orcidQueue.getDescription())),
+                hasJsonPath("$.recordType", is(orcidQueue.getRecordType())),
+                hasJsonPath("$.operation", is(orcidQueue.getOperation().name())),
+                hasJsonPath("$.type", is("orcidqueue"))
+        );
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/PoolTaskMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/PoolTaskMatcher.java
index aeed70e527..8d43acbb0f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/PoolTaskMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/PoolTaskMatcher.java
@@ -28,7 +28,7 @@ public class PoolTaskMatcher {
     /**
      * Check if the returned json expose all the required links and properties
      * 
-     * @param ptask
+     * @param pTask
      *            the pool task
      * @param step
      *            the step name
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ScriptMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ScriptMatcher.java
index c919aadd86..5fe3635c2b 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ScriptMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ScriptMatcher.java
@@ -11,6 +11,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
@@ -28,11 +29,15 @@ public class ScriptMatcher {
     }
 
     public static Matcher<? super Object> matchMockScript(Options options) {
+        // Set the to be compared option to the expected boolean type
+        Option i = options.getOption("i");
+        i.setType(boolean.class);
+
         return allOf(
             matchScript("mock-script", "Mocking a script for testing purposes"),
             hasJsonPath("$.parameters", Matchers.containsInAnyOrder(
                 ParameterMatcher.matchParameter(options.getOption("r")),
-                ParameterMatcher.matchParameter(options.getOption("i")),
+                ParameterMatcher.matchParameter(i),
                 ParameterMatcher.matchParameter(options.getOption("f"))
             ))
         );
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionFormFieldMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionFormFieldMatcher.java
index 773a751b9f..47f96fd136 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionFormFieldMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionFormFieldMatcher.java
@@ -10,6 +10,7 @@ package org.dspace.app.rest.matcher;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasNoJsonPath;
 import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 
@@ -28,13 +29,15 @@ public class SubmissionFormFieldMatcher {
 
     /**
      * Shortcut for the
-     * {@link SubmissionFormFieldMatcher#matchFormFieldDefinition(String, String, String, boolean, String, String, String, String)}
+     * {@link SubmissionFormFieldMatcher#matchFormFieldDefinition(String, String, String, String, boolean, String, String, String, String)}
      * with a null style and vocabulary name
      *
      * @param type
      *            the expected input type
      * @param label
      *            the expected label
+     * @param typeBind
+     *            the expected type-bind field(s)
      * @param mandatoryMessage
      *            the expected mandatoryMessage, can be null. If not empty the fiedl is expected to be flagged as
      *            mandatory
@@ -46,21 +49,23 @@ public class SubmissionFormFieldMatcher {
      *            the expected metadata
      * @return a Matcher for all the condition above
      */
-    public static Matcher<? super Object> matchFormFieldDefinition(String type, String label, String mandatoryMessage,
-                                                                   boolean repeatable,
+    public static Matcher<? super Object> matchFormFieldDefinition(String type, String label, String typeBind,
+                                                                   String mandatoryMessage, boolean repeatable,
                                                                    String hints, String metadata) {
-        return matchFormFieldDefinition(type, label, mandatoryMessage, repeatable, hints, null, metadata);
+        return matchFormFieldDefinition(type, label, typeBind, mandatoryMessage, repeatable, hints, null, metadata);
     }
 
     /**
      * Shortcut for the
-     * {@link SubmissionFormFieldMatcher#matchFormFieldDefinition(String, String, String, boolean, String, String, String, String)}
+     * {@link SubmissionFormFieldMatcher#matchFormFieldDefinition(String, String, String, String, boolean, String, String, String, String)}
      * with a null controlled vocabulary
      *
      * @param type
      *            the expected input type
      * @param label
      *            the expected label
+     * @param typeBind
+     *            the expected type-bind field(s)
      * @param mandatoryMessage
      *            the expected mandatoryMessage, can be null. If not empty the field is expected to be flagged as
      *            mandatory
@@ -75,10 +80,10 @@ public class SubmissionFormFieldMatcher {
      *            the expected metadata
      * @return a Matcher for all the condition above
      */
-    public static Matcher<? super Object> matchFormFieldDefinition(String type, String label, String mandatoryMessage,
-            boolean repeatable,
-            String hints, String style, String metadata) {
-        return matchFormFieldDefinition(type, label, mandatoryMessage, repeatable, hints, style, metadata, null);
+    public static Matcher<? super Object> matchFormFieldDefinition(String type, String label, String typeBind,
+            String mandatoryMessage, boolean repeatable, String hints, String style, String metadata) {
+        return matchFormFieldDefinition(type, label, typeBind, mandatoryMessage, repeatable, hints, style, metadata,
+                null);
     }
 
     /**
@@ -88,6 +93,8 @@ public class SubmissionFormFieldMatcher {
      *            the expected input type
      * @param label
      *            the expected label
+     * @param typeBind
+     *            the expected type-bind field(s)
      * @param mandatoryMessage
      *            the expected mandatoryMessage, can be null. If not empty the field is expected to be flagged as
      *            mandatory
@@ -100,18 +107,20 @@ public class SubmissionFormFieldMatcher {
      *            missing
      * @param metadata
      *            the expected metadata
-     * @param controlled vocabulary
+     * @param controlledVocabulary
      *            the expected controlled vocabulary, can be null. If null the corresponding json path is expected to be
      *            missing
      * @return a Matcher for all the condition above
      */
-    public static Matcher<? super Object> matchFormFieldDefinition(String type, String label, String mandatoryMessage,
-                                                                   boolean repeatable, String hints, String style,
-                                                                   String metadata, String controlledVocabulary) {
+    public static Matcher<? super Object> matchFormFieldDefinition(String type, String label, String typeBind,
+                                                                   String mandatoryMessage, boolean repeatable,
+                                                                   String hints, String style, String metadata,
+                                                                   String controlledVocabulary) {
         return allOf(
             // check each field definition
             hasJsonPath("$.input.type", is(type)),
             hasJsonPath("$.label", containsString(label)),
+            typeBind != null ? hasJsonPath("$.typeBind", contains(typeBind)) : hasNoJsonPath("$.typeBind[0]"),
             hasJsonPath("$.selectableMetadata[0].metadata", is(metadata)),
             controlledVocabulary != null ? hasJsonPath("$.selectableMetadata[0].controlledVocabulary",
                     is(controlledVocabulary)) : hasNoJsonPath("$.selectableMetadata[0].controlledVocabulary"),
@@ -166,7 +175,7 @@ public class SubmissionFormFieldMatcher {
             hasJsonPath("$.selectableRelationship.filter", is(filter)),
             hasJsonPath("$.selectableRelationship.searchConfiguration", is(searchConfiguration)),
             hasJsonPath("$.selectableRelationship.nameVariants", is(String.valueOf(nameVariants))),
-            matchFormFieldDefinition(type, label, mandatoryMessage, repeatable, hints, metadata));
+            matchFormFieldDefinition(type, label, null, mandatoryMessage, repeatable, hints, metadata));
     }
 
     /**
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/UsageReportMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/UsageReportMatcher.java
index ba82d69b40..9ad1dce28a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/UsageReportMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/UsageReportMatcher.java
@@ -49,13 +49,18 @@ public class UsageReportMatcher {
      * @param points     List of points to match to the json of UsageReport's list of points
      * @return The matcher
      */
-    public static Matcher<? super Object> matchUsageReport(String id, String reportType,
-                                                           List<UsageReportPointRest> points) {
+    public static Matcher<? super Object> matchUsageReport(
+        String id, String reportType, List<UsageReportPointRest> points
+    ) {
         return allOf(
             matchUsageReport(id, reportType),
             hasJsonPath("$.points", Matchers.containsInAnyOrder(
-                points.stream().map(point -> UsageReportPointMatcher
-                    .matchUsageReportPoint(point.getId(), point.getType(), point.getValues().get("views")))
-                      .collect(Collectors.toList()))));
+                points.stream()
+                      .map(point -> UsageReportPointMatcher.matchUsageReportPoint(
+                          point.getId(), point.getLabel(), point.getType(), point.getValues().get("views")
+                      ))
+                      .collect(Collectors.toList()))
+            )
+        );
     }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/UsageReportPointMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/UsageReportPointMatcher.java
index e7f22066e5..f1c641b18a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/UsageReportPointMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/UsageReportPointMatcher.java
@@ -28,15 +28,17 @@ public class UsageReportPointMatcher {
      * Matcher for the usage report points (see {@link UsageReportPointRest})
      *
      * @param id    Id to match if of json of UsageReportPoint
+     * @param label    Label to match if of json of UsageReportPoint
      * @param type  Type to match if of json of UsageReportPoint
      * @param views Nr of views, is in the values key-value pair of values of UsageReportPoint with key "views"
      * @return The matcher
      */
-    public static Matcher<? super Object> matchUsageReportPoint(String id, String type, int views) {
+    public static Matcher<? super Object> matchUsageReportPoint(String id, String label, String type, int views) {
         return allOf(
             hasJsonPath("$.id", is(id)),
+            hasJsonPath("$.label", is(label)),
             hasJsonPath("$.type", is(type)),
             hasJsonPath("$.values.views", is(views))
-                    );
+        );
     }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/VocabularyMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/VocabularyMatcher.java
index 6e23560911..b27b97d4c7 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/VocabularyMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/VocabularyMatcher.java
@@ -41,4 +41,14 @@ public class VocabularyMatcher {
                 hasJsonPath("$.type", is(type))
         );
     }
+
+    public static Matcher<? super Object> matchVocabularyEntry(String display, String value, String type,
+        String authority) {
+        return allOf(
+                hasJsonPath("$.display", is(display)),
+                hasJsonPath("$.value", is(value)),
+                hasJsonPath("$.type", is(type)),
+                hasJsonPath("$.authority", is(authority))
+        );
+    }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowDefinitionMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowDefinitionMatcher.java
index 02712ee3a2..f3d6890bbd 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowDefinitionMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowDefinitionMatcher.java
@@ -17,6 +17,7 @@ import java.util.UUID;
 import org.dspace.app.rest.model.WorkflowDefinitionRest;
 import org.dspace.xmlworkflow.factory.XmlWorkflowFactory;
 import org.dspace.xmlworkflow.factory.XmlWorkflowServiceFactory;
+import org.dspace.xmlworkflow.state.Step;
 import org.dspace.xmlworkflow.state.Workflow;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
@@ -61,4 +62,18 @@ public class WorkflowDefinitionMatcher {
                 ))
         );
     }
+
+    /**
+     * Verifies that the content of the `json` matches
+     * the detail of the steps
+     * Actually we can checks only the identifier to assure they are the same.
+     * 
+     * @param step target step of the workflow
+     * @return Matcher
+     */
+    public static Matcher<? super Object> matchStep(Step step) {
+        return allOf(
+                hasJsonPath("$.id", is(step.getId()))
+        );
+    }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkspaceItemMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkspaceItemMatcher.java
index d2d2491171..070518f7ed 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkspaceItemMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkspaceItemMatcher.java
@@ -82,6 +82,59 @@ public class WorkspaceItemMatcher {
                 matchLinks(witem));
     }
 
+    /**
+     * Check that the workspace item has the expected type and series values
+     * (used in type bind evaluation)
+     * @param witem the workspace item
+     * @param type  the dc.type value eg. Technical Report
+     * @param series the series value eg. 11-23
+     * @return  Matcher result
+     */
+    public static Matcher matchItemWithTypeAndSeries(WorkspaceItem witem, String type, String series) {
+        return allOf(
+                // Check workspaceitem properties
+                matchProperties(witem),
+                // Check type appears or is null
+                type != null ?
+                        hasJsonPath("$.sections.traditionalpageone['dc.type'][0].value", is(type)) :
+                        hasNoJsonPath("$.sections.traditionalpageone['dc.type'][0].value"),
+                // Check series as it appears (for type bind testing)
+                series != null ?
+                hasJsonPath("$.sections.traditionalpageone['dc.relation.ispartofseries'][0].value", is(series)) :
+                        hasNoJsonPath("$.sections.traditionalpageone['dc.relation.ispartofseries'][0].value"),
+                matchLinks(witem)
+        );
+    }
+
+    /**
+     * Check that the workspace item has the expected type and a specific field value
+     * (used in type bind evaluation)
+     * @param witem the workspace item
+     * @param section form section name
+     * @param type  the dc.type value eg. Technical Report
+     * @param field  the field to check eg. dc.identifier.isbn
+     * @param value the value to check
+     * @return  Matcher result
+     */
+    public static Matcher matchItemWithTypeFieldAndValue(WorkspaceItem witem,
+                                                         String section, String type, String field, String value) {
+        String fieldJsonPath = "$.sections." + section + "['" + field + "'][0].value";
+        String dcTypeJsonPath = "$.sections." + section + "['dc.type'][0].value";
+        return allOf(
+                // Check workspaceitem properties
+                matchProperties(witem),
+                // Check type appears or is null
+                type != null ?
+                        hasJsonPath(dcTypeJsonPath, is(type)) :
+                        hasNoJsonPath(dcTypeJsonPath),
+                // Check ISBN as it appears (for type bind testing)
+                value != null ?
+                        hasJsonPath(fieldJsonPath, is(value)) :
+                        hasNoJsonPath(fieldJsonPath),
+                matchLinks(witem)
+        );
+    }
+
     /**
      * Check that the id and type are exposed
      * 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/model/AccessStatusRestTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/model/AccessStatusRestTest.java
new file mode 100644
index 0000000000..7dfe3e69e0
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/model/AccessStatusRestTest.java
@@ -0,0 +1,39 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.model;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.dspace.access.status.DefaultAccessStatusHelper;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test the AccessStatusRestTest class
+ */
+public class AccessStatusRestTest {
+
+    AccessStatusRest accessStatusRest;
+
+    @Before
+    public void setUp() throws Exception {
+        accessStatusRest = new AccessStatusRest();
+    }
+
+    @Test
+    public void testAccessStatusIsNullBeforeStatusSet() throws Exception {
+        assertNull(accessStatusRest.getStatus());
+    }
+
+    @Test
+    public void testAccessStatusIsNotNullAfterStatusSet() throws Exception {
+        accessStatusRest.setStatus(DefaultAccessStatusHelper.UNKNOWN);
+        assertNotNull(accessStatusRest.getStatus());
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidHistoryRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidHistoryRestRepositoryIT.java
new file mode 100644
index 0000000000..7ad57b8cc0
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidHistoryRestRepositoryIT.java
@@ -0,0 +1,1165 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.orcid;
+
+import static com.jayway.jsonpath.JsonPath.read;
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.dspace.app.matcher.LambdaMatcher.matches;
+import static org.dspace.builder.OrcidQueueBuilder.createOrcidQueue;
+import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.sql.SQLException;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
+
+import org.dspace.app.rest.matcher.OrcidHistoryMatcher;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.OrcidHistoryBuilder;
+import org.dspace.builder.OrcidQueueBuilder;
+import org.dspace.builder.OrcidTokenBuilder;
+import org.dspace.builder.RelationshipBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.RelationshipType;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidHistory;
+import org.dspace.orcid.OrcidOperation;
+import org.dspace.orcid.OrcidQueue;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidResponse;
+import org.dspace.orcid.exception.OrcidClientException;
+import org.dspace.orcid.service.impl.OrcidHistoryServiceImpl;
+import org.hamcrest.Matchers;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.orcid.jaxb.model.common.Iso3166Country;
+import org.orcid.jaxb.model.v3.release.common.FuzzyDate;
+import org.orcid.jaxb.model.v3.release.record.Address;
+import org.orcid.jaxb.model.v3.release.record.Funding;
+import org.orcid.jaxb.model.v3.release.record.Work;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.rest.webmvc.RestMediaTypes;
+import org.springframework.http.MediaType;
+
+/**
+ * Integration test class for the orcid history endpoint.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ */
+public class OrcidHistoryRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    private final static String ACCESS_TOKEN = "f5af9f51-07e6-4332-8f1a-c0c11c1e3728";
+    private final static String ORCID = "0000-0002-1825-0097";
+
+    private EPerson researcher;
+
+    private Collection persons;
+
+    private Collection publications;
+
+    private Item profile;
+
+    private Item publication;
+
+    @Autowired
+    private OrcidHistoryServiceImpl orcidHistoryService;
+
+    private OrcidClient orcidClient;
+
+    private OrcidClient orcidClientMock;
+
+    @Before
+    public void setup() throws SQLException, AuthorizeException {
+        context.turnOffAuthorisationSystem();
+
+        researcher = EPersonBuilder.createEPerson(context)
+            .withNameInMetadata("Josiah", "Carberry")
+            .withEmail("josiah.Carberry@example.com")
+            .withPassword(password)
+            .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        persons = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Person")
+            .withName("Collection 1")
+            .build();
+
+        publications = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Publication")
+            .withName("Collection 2")
+            .build();
+
+        profile = ItemBuilder.createItem(context, persons)
+            .withPersonIdentifierFirstName("Josiah")
+            .withPersonIdentifierLastName("Carberry")
+            .withPersonCountry("IT")
+            .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+            .withOrcidIdentifier(ORCID)
+            .build();
+
+        OrcidTokenBuilder.create(context, researcher, ACCESS_TOKEN)
+            .withProfileItem(profile)
+            .build();
+
+        publication = ItemBuilder.createItem(context, publications)
+            .withAuthor("Josiah, Carberry")
+            .withTitle("A Methodology for the Emulation of Architecture")
+            .withIssueDate("2013-08-03")
+            .withType("Controlled Vocabulary for Resource Type Genres::text::book")
+            .withDoiIdentifier("10.1000/182")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        orcidClientMock = mock(OrcidClient.class);
+        orcidClient = orcidHistoryService.getOrcidClient();
+        orcidHistoryService.setOrcidClient(orcidClientMock);
+
+    }
+
+    @After
+    public void after() {
+        orcidHistoryService.setOrcidClient(orcidClient);
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/eperson/orcidhistories"))
+            .andExpect(status().isMethodNotAllowed());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        OrcidHistory orcidHistory = OrcidHistoryBuilder.createOrcidHistory(context, profile, publication)
+            .withResponseMessage("<xml><work>...</work>")
+            .withPutCode("123456")
+            .withStatus(201).build();
+
+        context.restoreAuthSystemState();
+
+        String tokenResearcher = getAuthToken(researcher.getEmail(), password);
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+
+        getClient(tokenResearcher).perform(get("/api/eperson/orcidhistories/" + orcidHistory.getID().toString()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", is(OrcidHistoryMatcher.matchOrcidHistory(
+                orcidHistory, 201, "123456", "<xml><work>...</work>"))))
+            .andExpect(jsonPath("$._links.self.href", Matchers
+                .containsString("/api/eperson/orcidhistories/" + orcidHistory.getID())));
+
+        getClient(tokenAdmin).perform(get("/api/eperson/orcidhistories/" + orcidHistory.getID().toString()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", is(OrcidHistoryMatcher.matchOrcidHistory(
+                orcidHistory, 201, "123456", "<xml><work>...</work>"))))
+            .andExpect(jsonPath("$._links.self.href", Matchers
+                .containsString("/api/eperson/orcidhistories/" + orcidHistory.getID())));
+    }
+
+    @Test
+    public void findOneForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        OrcidHistory orcidHistory = OrcidHistoryBuilder.createOrcidHistory(context, profile, publication)
+            .withResponseMessage("<xml><work>...</work>")
+            .withPutCode("123456")
+            .withStatus(201)
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+
+        getClient(tokenEperson).perform(get("/api/eperson/orcidhistories/" + orcidHistory.getID().toString()))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findOneisUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        OrcidHistory orcidHistory = OrcidHistoryBuilder.createOrcidHistory(context, profile, publication)
+            .withResponseMessage("<xml><work>...</work>")
+            .withPutCode("123456")
+            .withStatus(201).build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/eperson/orcidhistories/" + orcidHistory.getID().toString()))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneNotFoundTest() throws Exception {
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/eperson/orcidhistories/" + Integer.MAX_VALUE))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void createForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, publication).build();
+
+        context.restoreAuthSystemState();
+
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+        getClient(tokenEperson).perform(post("/api/eperson/orcidhistories")
+            .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+            .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void createUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, publication).build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(post("/api/eperson/orcidhistories")
+            .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+            .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+            .andExpect(status().isUnauthorized());
+
+    }
+
+    @Test
+    public void testCreationForPublicationInsert() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, publication)
+            .withDescription("A Methodology for the Emulation of Architecture")
+            .withOperation(OrcidOperation.INSERT)
+            .withRecordType("Publication")
+            .build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any())).thenReturn(createdResponse("12345"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(publication.getID().toString())),
+                    hasJsonPath("$.status", is(201)),
+                    hasJsonPath("$.putCode", is("12345")),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
+        verify(orcidClientMock).push(eq(ACCESS_TOKEN), eq(ORCID), captor.capture());
+
+        Object sentObject = captor.getValue();
+        assertThat(sentObject, instanceOf(Work.class));
+
+        Work work = (Work) sentObject;
+        assertThat(work.getPutCode(), nullValue());
+        assertThat(work.getWorkTitle().getTitle().getContent(), is("A Methodology for the Emulation of Architecture"));
+        assertThat(work.getPublicationDate(), matches(date("2013", "08", "03")));
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForPublicationInsertWithOrcidClientException() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, publication)
+            .withDescription("A Methodology for the Emulation of Architecture")
+            .withOperation(OrcidOperation.INSERT)
+            .withRecordType("Publication")
+            .build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any()))
+            .thenThrow(new OrcidClientException(400, "Invalid resource"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(publication.getID().toString())),
+                    hasJsonPath("$.responseMessage", is("Invalid resource")),
+                    hasJsonPath("$.status", is(400)),
+                    hasJsonPath("$.putCode", nullValue()),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), notNullValue());
+
+        verify(orcidClientMock).push(eq(ACCESS_TOKEN), eq(ORCID), any(Work.class));
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForPublicationInsertWithGenericException() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, publication)
+            .withDescription("A Methodology for the Emulation of Architecture")
+            .withOperation(OrcidOperation.INSERT)
+            .withRecordType("Publication")
+            .build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any()))
+            .thenThrow(new RuntimeException("GENERIC ERROR"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(publication.getID().toString())),
+                    hasJsonPath("$.responseMessage", is("GENERIC ERROR")),
+                    hasJsonPath("$.status", is(500)),
+                    hasJsonPath("$.putCode", nullValue()),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), notNullValue());
+
+        verify(orcidClientMock).push(eq(ACCESS_TOKEN), eq(ORCID), any(Work.class));
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForPublicationUpdate() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, publication)
+            .withDescription("A Methodology for the Emulation of Architecture")
+            .withOperation(OrcidOperation.UPDATE)
+            .withRecordType("Publication")
+            .withPutCode("12345")
+            .build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.update(eq(ACCESS_TOKEN), eq(ORCID), any(), eq("12345")))
+            .thenReturn(updatedResponse("12345"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(publication.getID().toString())),
+                    hasJsonPath("$.status", is(200)),
+                    hasJsonPath("$.putCode", is("12345")),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
+        verify(orcidClientMock).update(eq(ACCESS_TOKEN), eq(ORCID), captor.capture(), eq("12345"));
+
+        Object sentObject = captor.getValue();
+        assertThat(sentObject, instanceOf(Work.class));
+
+        Work work = (Work) sentObject;
+        assertThat(work.getPutCode(), is(12345L));
+        assertThat(work.getWorkTitle().getTitle().getContent(), is("A Methodology for the Emulation of Architecture"));
+        assertThat(work.getPublicationDate(), matches(date("2013", "08", "03")));
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForPublicationUpdateWithForceAddition() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, publication)
+            .withDescription("A Methodology for the Emulation of Architecture")
+            .withOperation(OrcidOperation.UPDATE)
+            .withRecordType("Publication")
+            .withPutCode("12345")
+            .build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any())).thenReturn(createdResponse("12345"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID())
+                    .param("forceAddition", "true"))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(publication.getID().toString())),
+                    hasJsonPath("$.status", is(201)),
+                    hasJsonPath("$.putCode", is("12345")),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
+        verify(orcidClientMock).push(eq(ACCESS_TOKEN), eq(ORCID), captor.capture());
+
+        Object sentObject = captor.getValue();
+        assertThat(sentObject, instanceOf(Work.class));
+
+        Work work = (Work) sentObject;
+        assertThat(work.getPutCode(), nullValue());
+        assertThat(work.getWorkTitle().getTitle().getContent(), is("A Methodology for the Emulation of Architecture"));
+        assertThat(work.getPublicationDate(), matches(date("2013", "08", "03")));
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForPublicationDeletion() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = createOrcidQueue(context, profile, "Description", "Publication", "12345").build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.deleteByPutCode(ACCESS_TOKEN, ORCID, "12345", "/work")).thenReturn(deletedResponse());
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", nullValue()),
+                    hasJsonPath("$.status", is(204)),
+                    hasJsonPath("$.putCode", nullValue()),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        verify(orcidClientMock).deleteByPutCode(ACCESS_TOKEN, ORCID, "12345", "/work");
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForPublicationDeletionWithNotFound() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = createOrcidQueue(context, profile, "Description", "Publication", "12345").build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.deleteByPutCode(ACCESS_TOKEN, ORCID, "12345", "/work")).thenReturn(notFoundResponse());
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", nullValue()),
+                    hasJsonPath("$.status", is(204)),
+                    hasJsonPath("$.putCode", nullValue()),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        verify(orcidClientMock).deleteByPutCode(ACCESS_TOKEN, ORCID, "12345", "/work");
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForProfileDataInsert() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, profile)
+            .withDescription("IT")
+            .withOperation(OrcidOperation.INSERT)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any())).thenReturn(createdResponse("12345"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(profile.getID().toString())),
+                    hasJsonPath("$.status", is(201)),
+                    hasJsonPath("$.putCode", is("12345")),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
+        verify(orcidClientMock).push(eq(ACCESS_TOKEN), eq(ORCID), captor.capture());
+
+        Object sentObject = captor.getValue();
+        assertThat(sentObject, instanceOf(Address.class));
+
+        Address address = (Address) sentObject;
+        assertThat(address.getPutCode(), nullValue());
+        assertThat(address.getCountry().getValue(), is(Iso3166Country.IT));
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForProfileDataDeletion() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, profile)
+            .withDescription("IT")
+            .withOperation(OrcidOperation.DELETE)
+            .withRecordType("COUNTRY")
+            .withMetadata("person.country::IT")
+            .withPutCode("12345")
+            .build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.deleteByPutCode(ACCESS_TOKEN, ORCID, "12345", "/address"))
+            .thenReturn(deletedResponse());
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(profile.getID().toString())),
+                    hasJsonPath("$.status", is(204)),
+                    hasJsonPath("$.putCode", nullValue()),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        verify(orcidClientMock).deleteByPutCode(ACCESS_TOKEN, ORCID, "12345", "/address");
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForFundingInsert() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Collection fundings = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Project")
+            .withName("Collection 3")
+            .build();
+
+        Collection orgUnits = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("OrgUnit")
+            .withName("Collection 4")
+            .build();
+
+        Item orgUnit = ItemBuilder.createItem(context, orgUnits)
+            .withOrgUnitLegalName("4Science")
+            .withOrgUnitCountry("IT")
+            .withOrgUnitLocality("Milan")
+            .withOrgUnitCrossrefIdentifier("12345")
+            .build();
+
+        Item funding = ItemBuilder.createItem(context, fundings)
+            .withTitle("Test funding")
+            .withProjectStartDate("2013-08-03")
+            .withIdentifier("888-666-444")
+            .build();
+
+        EntityType fundingType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        EntityType orgUnitType = EntityTypeBuilder.createEntityTypeBuilder(context, "OrgUnit").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, orgUnitType, fundingType,
+            "isOrgUnitOfProject", "isProjectOfOrgUnit", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, orgUnit, funding, isAuthorOfPublication).build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, funding)
+            .withDescription("Test funding")
+            .withOperation(OrcidOperation.INSERT)
+            .withRecordType("Project")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any())).thenReturn(createdResponse("12345"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(funding.getID().toString())),
+                    hasJsonPath("$.status", is(201)),
+                    hasJsonPath("$.putCode", is("12345")),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
+        verify(orcidClientMock).push(eq(ACCESS_TOKEN), eq(ORCID), captor.capture());
+
+        Object sentObject = captor.getValue();
+        assertThat(sentObject, instanceOf(Funding.class));
+
+        Funding sentFunding = (Funding) sentObject;
+        assertThat(sentFunding.getPutCode(), nullValue());
+        assertThat(sentFunding.getTitle().getTitle().getContent(), is("Test funding"));
+        assertThat(sentFunding.getStartDate(), matches(date("2013", "08", "03")));
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForFundingInsertWithOrcidClientException() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Collection fundings = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Project")
+            .withName("Collection 3")
+            .build();
+
+        Collection orgUnits = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("OrgUnit")
+            .withName("Collection 4")
+            .build();
+
+        Item orgUnit = ItemBuilder.createItem(context, orgUnits)
+            .withOrgUnitLegalName("4Science")
+            .withOrgUnitCountry("IT")
+            .withOrgUnitLocality("Milan")
+            .withOrgUnitCrossrefIdentifier("12345")
+            .build();
+
+        Item funding = ItemBuilder.createItem(context, fundings)
+            .withTitle("Test funding")
+            .withProjectStartDate("2013-08-03")
+            .withIdentifier("888-666-444")
+            .build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, funding)
+            .withDescription("Test funding")
+            .withOperation(OrcidOperation.INSERT)
+            .withRecordType("Project")
+            .build();
+
+        EntityType fundingType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        EntityType orgUnitType = EntityTypeBuilder.createEntityTypeBuilder(context, "OrgUnit").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, orgUnitType, fundingType,
+            "isOrgUnitOfProject", "isProjectOfOrgUnit", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, orgUnit, funding, isAuthorOfPublication).build();
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any()))
+            .thenThrow(new OrcidClientException(400, "Invalid resource"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(funding.getID().toString())),
+                    hasJsonPath("$.responseMessage", is("Invalid resource")),
+                    hasJsonPath("$.status", is(400)),
+                    hasJsonPath("$.putCode", nullValue()),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), notNullValue());
+
+        verify(orcidClientMock).push(eq(ACCESS_TOKEN), eq(ORCID), any(Funding.class));
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForFundingInsertWithGenericException() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Collection fundings = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Project")
+            .withName("Collection 3")
+            .build();
+
+        Collection orgUnits = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("OrgUnit")
+            .withName("Collection 4")
+            .build();
+
+        Item orgUnit = ItemBuilder.createItem(context, orgUnits)
+            .withOrgUnitLegalName("4Science")
+            .withOrgUnitCountry("IT")
+            .withOrgUnitLocality("Milan")
+            .withOrgUnitCrossrefIdentifier("12345")
+            .build();
+
+        Item funding = ItemBuilder.createItem(context, fundings)
+            .withTitle("Test funding")
+            .withProjectStartDate("2013-08-03")
+            .withIdentifier("888-666-444")
+            .build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, funding)
+            .withDescription("Test funding")
+            .withOperation(OrcidOperation.INSERT)
+            .withRecordType("Project")
+            .build();
+
+        EntityType fundingType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        EntityType orgUnitType = EntityTypeBuilder.createEntityTypeBuilder(context, "OrgUnit").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, orgUnitType, fundingType,
+            "isOrgUnitOfProject", "isProjectOfOrgUnit", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, orgUnit, funding, isAuthorOfPublication).build();
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any()))
+            .thenThrow(new RuntimeException("GENERIC ERROR"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(funding.getID().toString())),
+                    hasJsonPath("$.responseMessage", is("GENERIC ERROR")),
+                    hasJsonPath("$.status", is(500)),
+                    hasJsonPath("$.putCode", nullValue()),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), notNullValue());
+
+        verify(orcidClientMock).push(eq(ACCESS_TOKEN), eq(ORCID), any(Funding.class));
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForFundingUpdate() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Collection fundings = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Project")
+            .withName("Collection 3")
+            .build();
+
+        Collection orgUnits = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("OrgUnit")
+            .withName("Collection 4")
+            .build();
+
+        Item orgUnit = ItemBuilder.createItem(context, orgUnits)
+            .withOrgUnitLegalName("4Science")
+            .withOrgUnitCountry("IT")
+            .withOrgUnitLocality("Milan")
+            .withOrgUnitCrossrefIdentifier("12345")
+            .build();
+
+        Item funding = ItemBuilder.createItem(context, fundings)
+            .withTitle("Test funding")
+            .withProjectStartDate("2013-08-03")
+            .withIdentifier("888-666-444")
+            .build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, funding)
+            .withDescription("Test funding")
+            .withOperation(OrcidOperation.UPDATE)
+            .withRecordType("Project")
+            .withPutCode("12345")
+            .build();
+
+        EntityType fundingType = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        EntityType orgUnitType = EntityTypeBuilder.createEntityTypeBuilder(context, "OrgUnit").build();
+
+        RelationshipType isAuthorOfPublication = createRelationshipTypeBuilder(context, orgUnitType, fundingType,
+            "isOrgUnitOfProject", "isProjectOfOrgUnit", 0, null, 0, null).build();
+
+        RelationshipBuilder.createRelationshipBuilder(context, orgUnit, funding, isAuthorOfPublication).build();
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.update(eq(ACCESS_TOKEN), eq(ORCID), any(), eq("12345")))
+            .thenReturn(updatedResponse("12345"));
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", is(funding.getID().toString())),
+                    hasJsonPath("$.status", is(200)),
+                    hasJsonPath("$.putCode", is("12345")),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
+        verify(orcidClientMock).update(eq(ACCESS_TOKEN), eq(ORCID), captor.capture(), eq("12345"));
+
+        Object sentObject = captor.getValue();
+        assertThat(sentObject, instanceOf(Funding.class));
+
+        Funding sentFunding = (Funding) sentObject;
+        assertThat(sentFunding.getPutCode(), is(12345L));
+        assertThat(sentFunding.getTitle().getTitle().getContent(), is("Test funding"));
+        assertThat(sentFunding.getStartDate(), matches(date("2013", "08", "03")));
+
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testCreationForFundingDeletion() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        OrcidQueue orcidQueue = createOrcidQueue(context, profile, "Description", "Project", "12345").build();
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.deleteByPutCode(ACCESS_TOKEN, ORCID, "12345", "/funding")).thenReturn(deletedResponse());
+
+        String authToken = getAuthToken(researcher.getEmail(), password);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        try {
+
+            getClient(getAuthToken(researcher.getEmail(), password))
+                .perform(post("/api/eperson/orcidhistories")
+                    .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                    .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                .andExpect(status().isCreated())
+                .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+            getClient(authToken).perform(get("/api/eperson/orcidhistories/" + idRef.get()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", Matchers.allOf(
+                    hasJsonPath("$.id", is(idRef.get())),
+                    hasJsonPath("$.profileItemId", is(profile.getID().toString())),
+                    hasJsonPath("$.entityId", nullValue()),
+                    hasJsonPath("$.status", is(204)),
+                    hasJsonPath("$.putCode", nullValue()),
+                    hasJsonPath("$.type", is("orcidhistory")))));
+
+        } finally {
+            OrcidHistoryBuilder.deleteOrcidHistory(idRef.get());
+        }
+
+        assertThat(context.reloadEntity(orcidQueue), nullValue());
+
+        verify(orcidClientMock).deleteByPutCode(ACCESS_TOKEN, ORCID, "12345", "/funding");
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    @Test
+    public void testWithInvalidFunding() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Collection fundings = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Project")
+            .withName("Collection 3")
+            .build();
+
+        Item funding = ItemBuilder.createItem(context, fundings)
+            .withTitle("Test funding")
+            .withProjectStartDate("2013-08-03")
+            .build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, profile, funding)
+            .withDescription("Test funding")
+            .withOperation(OrcidOperation.INSERT)
+            .withRecordType("Project")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        when(orcidClientMock.push(eq(ACCESS_TOKEN), eq(ORCID), any())).thenReturn(createdResponse("12345"));
+
+        getClient(getAuthToken(researcher.getEmail(), password))
+            .perform(post("/api/eperson/orcidhistories")
+                .contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
+                .content("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+            .andExpect(status().isUnprocessableEntity());
+
+        assertThat(context.reloadEntity(orcidQueue), notNullValue());
+        verifyNoMoreInteractions(orcidClientMock);
+
+    }
+
+    private Predicate<? super FuzzyDate> date(String year, String month, String days) {
+        return date -> date != null
+            && year.equals(date.getYear().getValue())
+            && month.equals(date.getMonth().getValue())
+            && days.equals(date.getDay().getValue());
+    }
+
+    private OrcidResponse createdResponse(String putCode) {
+        return new OrcidResponse(201, putCode, null);
+    }
+
+    private OrcidResponse notFoundResponse() {
+        return new OrcidResponse(404, null, null);
+    }
+
+    private OrcidResponse updatedResponse(String putCode) {
+        return new OrcidResponse(200, putCode, null);
+    }
+
+    private OrcidResponse deletedResponse() {
+        return new OrcidResponse(204, null, null);
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java
new file mode 100644
index 0000000000..14dc4e95dc
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java
@@ -0,0 +1,623 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.orcid;
+
+import static org.dspace.app.rest.matcher.OrcidQueueMatcher.matchOrcidQueue;
+import static org.dspace.builder.OrcidQueueBuilder.createOrcidQueue;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.matcher.OrcidQueueMatcher;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.OrcidQueueBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.eperson.EPerson;
+import org.dspace.orcid.OrcidQueue;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration test class for the orcid queue endpoint
+ *
+ * @author Mykhaylo Boychuk - 4Science
+ */
+public class OrcidQueueRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ItemService itemService;
+
+    @Test
+    public void findAllTest() throws Exception {
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/eperson/orcidqueues"))
+                            .andExpect(status().isMethodNotAllowed());
+    }
+
+    @Test
+    public void findByProfileItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        EPerson researcher2 = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Laura", "Shulz")
+                                           .withEmail("laura.shulz@example.com")
+                                           .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Collection col3 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Project")
+                                           .withName("Collection 3").build();
+
+        Item itemPerson = ItemBuilder.createItem(context, col1)
+                                     .withPersonIdentifierFirstName("Josiah")
+                                     .withPersonIdentifierLastName("Carberry")
+                                     .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                     .build();
+
+        Item itemPerson2 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Laura")
+                                      .withPersonIdentifierLastName("Shulz")
+                                      .withDspaceObjectOwner(researcher2.getFullName(), researcher2.getID().toString())
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+        itemService.addMetadata(context, itemPerson2, "person", "identifier", "orcid", "en", "0000-0002-1826-4497");
+
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03")
+                                          .build();
+
+        Item itemPublication2 = ItemBuilder.createItem(context, col2)
+                                           .withAuthor("Laura, Shulz")
+                                           .withTitle("The Impact of Interactive Epistemologies on Cryptography")
+                                           .withIssueDate("2013-02-17")
+                                           .build();
+
+        Item itemProject = ItemBuilder.createItem(context, col3)
+                                      .withTitle("Title Project")
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson, "dc", "identifier", "scopus", null, "7004769520");
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, itemPerson, itemPublication).build();
+        OrcidQueue orcidQueue2 = OrcidQueueBuilder.createOrcidQueue(context, itemPerson2, itemPublication2).build();
+        OrcidQueue orcidQueue3 = OrcidQueueBuilder.createOrcidQueue(context, itemPerson, itemProject).build();
+
+        context.restoreAuthSystemState();
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        String tokenResearcher = getAuthToken(researcher.getEmail(), password);
+        String tokenResearcher2 = getAuthToken(researcher2.getEmail(), password);
+
+        getClient(tokenResearcher).perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+            .param("profileItemId", itemPerson.getID().toString()))
+                                  .andExpect(status().isOk())
+                                  .andExpect(jsonPath("$._embedded.orcidqueues", Matchers.containsInAnyOrder(
+                                             OrcidQueueMatcher.matchOrcidQueue(orcidQueue),
+                                             OrcidQueueMatcher.matchOrcidQueue(orcidQueue3)
+                                             )))
+                                  .andExpect(jsonPath("$.page.totalElements", is(2)));
+
+        getClient(tokenResearcher2).perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+            .param("profileItemId", itemPerson2.getID().toString()))
+                                   .andExpect(status().isOk())
+                                   .andExpect(jsonPath("$._embedded.orcidqueues", Matchers.contains(
+                                              matchOrcidQueue(orcidQueue2)
+                                              )))
+                                   .andExpect(jsonPath("$.page.totalElements", is(1)))
+                                   .andExpect(jsonPath("$._links.self.href", Matchers
+                .containsString("/api/eperson/orcidqueue/search/findByProfileItem")));
+
+        getClient(tokenAdmin).perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+            .param("profileItemId", itemPerson.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$._embedded.orcidqueues", Matchers.containsInAnyOrder(
+                                        OrcidQueueMatcher.matchOrcidQueue(orcidQueue),
+                                        OrcidQueueMatcher.matchOrcidQueue(orcidQueue3)
+                                        )))
+                             .andExpect(jsonPath("$.page.totalElements", is(2)));
+    }
+
+    @Test
+    public void findByProfileItemForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        EPerson researcher2 = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Laura", "Shulz")
+                                           .withEmail("laura.shulz@example.com")
+                                           .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Item itemPerson = ItemBuilder.createItem(context, col1)
+                                     .withPersonIdentifierFirstName("Josiah")
+                                     .withPersonIdentifierLastName("Carberry")
+                                     .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                     .build();
+
+        Item itemPerson2 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Laura")
+                                      .withPersonIdentifierLastName("Shulz")
+                                      .withDspaceObjectOwner(researcher2.getFullName(), researcher2.getID().toString())
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+        itemService.addMetadata(context, itemPerson2, "person", "identifier", "orcid", "en", "0000-0002-1826-4497");
+
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03")
+                                          .build();
+
+        Item itemPublication2 = ItemBuilder.createItem(context, col2)
+                                           .withAuthor("Laura, Shulz")
+                                           .withTitle("The Impact of Interactive Epistemologies on Cryptography")
+                                           .withIssueDate("2013-02-17")
+                                           .build();
+
+        itemService.addMetadata(context, itemPerson, "dc", "identifier", "scopus", null, "7004769520");
+
+        OrcidQueueBuilder.createOrcidQueue(context, itemPerson, itemPublication).build();
+        OrcidQueueBuilder.createOrcidQueue(context, itemPerson2, itemPublication2).build();
+
+        context.restoreAuthSystemState();
+        String tokenResearcher2 = getAuthToken(researcher2.getEmail(), password);
+
+        getClient(tokenResearcher2).perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+            .param("profileItemId", itemPerson.getID().toString()))
+                                   .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findByProfileItemUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Item itemPerson = ItemBuilder.createItem(context, col1)
+                                     .withPersonIdentifierFirstName("Josiah")
+                                     .withPersonIdentifierLastName("Carberry")
+                                     .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                     .build();
+
+        itemService.addMetadata(context, itemPerson, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03")
+                                          .build();
+
+        itemService.addMetadata(context, itemPerson, "dc", "identifier", "scopus", null, "7004769520");
+
+        OrcidQueueBuilder.createOrcidQueue(context, itemPerson, itemPublication).build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+            .param("profileItemId", itemPerson.getID().toString()))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        EPerson researcher2 = EPersonBuilder.createEPerson(context)
+                                            .withNameInMetadata("Laura", "Shulz")
+                                            .withEmail("Laura.Shulz@example.com")
+                                            .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Item itemPerson1 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Josiah")
+                                      .withPersonIdentifierLastName("Carberry")
+                                      .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                      .build();
+
+        Item itemPerson2 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Laura")
+                                      .withPersonIdentifierLastName("Shulz")
+                                      .withDspaceObjectOwner(researcher2.getFullName(), researcher2.getID().toString())
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson1, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+        itemService.addMetadata(context, itemPerson2, "person", "identifier", "orcid", "en", "0000-0002-1825-0033");
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03").build();
+
+        Item itemPublication2 = ItemBuilder.createItem(context, col2)
+                                           .withAuthor("Laura, Shulz")
+                                           .withTitle("Bulk and surface plasmons in artificially structured materials")
+                                           .withIssueDate("2015-05-21").build();
+
+        OrcidQueue orcidQueue = createOrcidQueue(context, itemPerson1, itemPublication).withPutCode("12345").build();
+        OrcidQueue orcidQueue2 = createOrcidQueue(context, itemPerson2, itemPublication2).build();
+
+        context.restoreAuthSystemState();
+        String tokenResearcher = getAuthToken(researcher.getEmail(), password);
+        String tokenResearcher2 = getAuthToken(researcher2.getEmail(), password);
+
+        getClient(tokenResearcher).perform(get("/api/eperson/orcidqueues/" + orcidQueue.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$", is(matchOrcidQueue(orcidQueue))))
+                             .andExpect(jsonPath("$._links.self.href", Matchers
+                .containsString("/api/eperson/orcidqueues/" + orcidQueue.getID())))
+            .andExpect(jsonPath("$._links.profileItem.href", Matchers
+                                       .containsString("/api/core/items/" + itemPerson1.getID())))
+                             .andExpect(jsonPath("$._links.entity.href", Matchers
+                                       .containsString("/api/core/items/" + itemPublication.getID())));
+
+        getClient(tokenResearcher2).perform(get("/api/eperson/orcidqueues/" + orcidQueue2.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$", is(matchOrcidQueue(orcidQueue2))))
+                             .andExpect(jsonPath("$._links.self.href", Matchers
+                .containsString("/api/eperson/orcidqueues/" + orcidQueue2.getID())))
+            .andExpect(jsonPath("$._links.profileItem.href", Matchers
+                                       .containsString("/api/core/items/" + itemPerson2.getID())))
+                             .andExpect(jsonPath("$._links.entity.href", Matchers
+                                       .containsString("/api/core/items/" + itemPublication2.getID())));
+    }
+
+    @Test
+    public void findOneWithDeleteRecordTypeTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+            .withNameInMetadata("Josiah", "Carberry")
+            .withEmail("josiah.Carberry@example.com")
+            .withPassword(password)
+            .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Person")
+            .withName("Collection 1").build();
+
+        Item itemPerson = ItemBuilder.createItem(context, collection)
+            .withPersonIdentifierFirstName("Josiah")
+            .withPersonIdentifierLastName("Carberry")
+            .withOrcidIdentifier("0000-0002-1825-0097")
+            .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+            .build();
+
+        OrcidQueue orcidQueue = createOrcidQueue(context, itemPerson, "Description", "Publication", "12345").build();
+
+        context.restoreAuthSystemState();
+        String tokenResearcher = getAuthToken(researcher.getEmail(), password);
+
+        getClient(tokenResearcher).perform(get("/api/eperson/orcidqueues/" + orcidQueue.getID().toString()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", is(matchOrcidQueue(orcidQueue))))
+            .andExpect(jsonPath("$._links.self.href", containsString("/api/eperson/orcidqueues/" + orcidQueue.getID())))
+            .andExpect(jsonPath("$._links.profileItem.href", containsString("/api/core/items/" + itemPerson.getID())));
+    }
+
+    @Test
+    public void findOneForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Item itemPerson1 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Josiah")
+                                      .withPersonIdentifierLastName("Carberry")
+                                      .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson1, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03").build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, itemPerson1, itemPublication).build();
+
+        context.restoreAuthSystemState();
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+
+        getClient(tokenEperson).perform(get("/api/eperson/orcidqueues/" + orcidQueue.getID().toString()))
+                               .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findOneUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Item itemPerson1 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Josiah")
+                                      .withPersonIdentifierLastName("Carberry")
+                                      .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson1, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03").build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, itemPerson1, itemPublication).build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/eperson/orcidqueue/" + orcidQueue.getID().toString()))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneNotFoundTest() throws Exception {
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/eperson/orcidQueues/" + Integer.MAX_VALUE))
+                             .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void deleteOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Item itemPerson1 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Josiah")
+                                      .withPersonIdentifierLastName("Carberry")
+                                      .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson1, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03").build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, itemPerson1, itemPublication).build();
+
+        context.restoreAuthSystemState();
+        String tokenResearcher = getAuthToken(researcher.getEmail(), password);
+
+        getClient(tokenResearcher).perform(delete("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                                  .andExpect(status().isNoContent());
+
+        getClient(tokenResearcher).perform(get("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                                  .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void deleteOneForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Item itemPerson1 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Josiah")
+                                      .withPersonIdentifierLastName("Carberry")
+                                      .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson1, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03").build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, itemPerson1, itemPublication).build();
+
+        context.restoreAuthSystemState();
+
+        String tokenEPerson = getAuthToken(eperson.getEmail(), password);
+        String tokenResearcher = getAuthToken(researcher.getEmail(), password);
+
+        getClient(tokenEPerson).perform(delete("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                               .andExpect(status().isForbidden());
+
+        getClient(tokenResearcher).perform(get("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                                  .andExpect(status().isOk())
+                                  .andExpect(jsonPath("$", is(matchOrcidQueue(orcidQueue))));
+    }
+
+    @Test
+    public void deleteOneUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson researcher = EPersonBuilder.createEPerson(context)
+                                           .withNameInMetadata("Josiah", "Carberry")
+                                           .withEmail("josiah.Carberry@example.com")
+                                           .withPassword(password).build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Person")
+                                           .withName("Collection 1").build();
+
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 2").build();
+
+        Item itemPerson1 = ItemBuilder.createItem(context, col1)
+                                      .withPersonIdentifierFirstName("Josiah")
+                                      .withPersonIdentifierLastName("Carberry")
+            .withDspaceObjectOwner(researcher.getFullName(), researcher.getID().toString())
+                                      .build();
+
+        itemService.addMetadata(context, itemPerson1, "person", "identifier", "orcid", "en", "0000-0002-1825-0097");
+
+        Item itemPublication = ItemBuilder.createItem(context, col2)
+                                          .withAuthor("Josiah, Carberry")
+                                          .withTitle("A Methodology for the Emulation of Architecture")
+                                          .withIssueDate("2013-08-03").build();
+
+        OrcidQueue orcidQueue = OrcidQueueBuilder.createOrcidQueue(context, itemPerson1, itemPublication).build();
+
+        context.restoreAuthSystemState();
+        String tokenResearcher = getAuthToken(researcher.getEmail(), password);
+
+        getClient().perform(delete("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                   .andExpect(status().isUnauthorized());
+
+        getClient(tokenResearcher).perform(get("/api/eperson/orcidqueues/" + orcidQueue.getID()))
+                                  .andExpect(status().isOk())
+                                  .andExpect(jsonPath("$", is(matchOrcidQueue(orcidQueue))));
+    }
+
+    @Test
+    public void deleteOneNotFoundTest() throws Exception {
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(delete("/api/eperson/orcidqueues/" + Integer.MAX_VALUE))
+                             .andExpect(status().isNotFound());
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
index a08fd625c4..00339ba2e4 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
@@ -13,6 +13,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
 
+import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
@@ -89,8 +90,9 @@ public class AbstractControllerIntegrationTest extends AbstractIntegrationTestWi
     public static final String REST_SERVER_URL = "http://localhost/api/";
     public static final String BASE_REST_SERVER_URL = "http://localhost";
 
+    // Our standard/expected content type
     protected MediaType contentType = new MediaType(MediaTypes.HAL_JSON.getType(),
-                                                    MediaTypes.HAL_JSON.getSubtype());
+                                                    MediaTypes.HAL_JSON.getSubtype(), StandardCharsets.UTF_8);
 
     protected MediaType textUriContentType = RestMediaTypes.TEXT_URI_LIST;
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/utils/RestDiscoverQueryBuilderTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/utils/RestDiscoverQueryBuilderTest.java
new file mode 100644
index 0000000000..6c9544d2f9
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/utils/RestDiscoverQueryBuilderTest.java
@@ -0,0 +1,198 @@
+/**
+ * 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/
+ */
+package org.dspace.app.rest.utils;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.dspace.discovery.configuration.DiscoveryConfigurationParameters.SORT.VALUE;
+import static org.dspace.discovery.configuration.DiscoveryConfigurationParameters.TYPE_HIERARCHICAL;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.InvalidSearchRequestException;
+import org.dspace.app.rest.parameter.SearchFilter;
+import org.dspace.core.Context;
+import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.discovery.configuration.DiscoveryConfiguration;
+import org.dspace.discovery.configuration.DiscoveryConfigurationParameters;
+import org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration;
+import org.dspace.discovery.configuration.DiscoveryHitHighlightingConfiguration;
+import org.dspace.discovery.configuration.DiscoverySearchFilterFacet;
+import org.dspace.discovery.configuration.DiscoverySortConfiguration;
+import org.dspace.discovery.configuration.DiscoverySortFieldConfiguration;
+import org.dspace.discovery.configuration.HierarchicalSidebarFacetConfiguration;
+import org.dspace.discovery.utils.DiscoverQueryBuilder;
+import org.dspace.discovery.utils.parameter.QueryBuilderSearchFilter;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+
+/**
+ * Unit tests for {@link RestDiscoverQueryBuilder}
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class RestDiscoverQueryBuilderTest {
+
+    @InjectMocks
+    private RestDiscoverQueryBuilder restQueryBuilder;
+
+    @Mock
+    private DiscoverQueryBuilder discoverQueryBuilder;
+
+    @Mock
+    private Context context;
+
+    @Mock
+    private IndexableObject scope;
+
+    private DiscoveryConfiguration discoveryConfiguration;
+    private String query;
+    private SearchFilter searchFilter;
+    private QueryBuilderSearchFilter tranformedFilter;
+
+    private PageRequest page;
+
+    @Before
+    public void setUp() throws Exception {
+        discoveryConfiguration = new DiscoveryConfiguration();
+        discoveryConfiguration.setDefaultFilterQueries(Arrays.asList("archived:true"));
+
+
+        DiscoveryHitHighlightingConfiguration discoveryHitHighlightingConfiguration =
+                new DiscoveryHitHighlightingConfiguration();
+        List<DiscoveryHitHighlightFieldConfiguration> discoveryHitHighlightFieldConfigurations = new LinkedList<>();
+
+        DiscoveryHitHighlightFieldConfiguration discoveryHitHighlightFieldConfiguration =
+                new DiscoveryHitHighlightFieldConfiguration();
+        discoveryHitHighlightFieldConfiguration.setField("dc.title");
+
+        DiscoveryHitHighlightFieldConfiguration discoveryHitHighlightFieldConfiguration1 =
+                new DiscoveryHitHighlightFieldConfiguration();
+        discoveryHitHighlightFieldConfiguration1.setField("fulltext");
+
+        discoveryHitHighlightFieldConfigurations.add(discoveryHitHighlightFieldConfiguration1);
+        discoveryHitHighlightFieldConfigurations.add(discoveryHitHighlightFieldConfiguration);
+
+        discoveryHitHighlightingConfiguration.setMetadataFields(discoveryHitHighlightFieldConfigurations);
+        discoveryConfiguration.setHitHighlightingConfiguration(discoveryHitHighlightingConfiguration);
+
+
+        DiscoverySortFieldConfiguration defaultSort = new DiscoverySortFieldConfiguration();
+        defaultSort.setMetadataField("dc.date.accessioned");
+        defaultSort.setType(DiscoveryConfigurationParameters.TYPE_DATE);
+        defaultSort.setDefaultSortOrder(DiscoverySortFieldConfiguration.SORT_ORDER.desc);
+
+
+        List<DiscoverySortFieldConfiguration> listSortField = new ArrayList<DiscoverySortFieldConfiguration>();
+        listSortField.add(defaultSort);
+
+        DiscoverySortConfiguration sortConfiguration = new DiscoverySortConfiguration();
+
+        DiscoverySortFieldConfiguration titleSort = new DiscoverySortFieldConfiguration();
+        titleSort.setMetadataField("dc.title");
+        titleSort.setDefaultSortOrder(DiscoverySortFieldConfiguration.SORT_ORDER.asc);
+        listSortField.add(titleSort);
+
+        sortConfiguration.setSortFields(listSortField);
+
+        discoveryConfiguration.setSearchSortConfiguration(sortConfiguration);
+
+        DiscoverySearchFilterFacet subjectFacet = new DiscoverySearchFilterFacet();
+        subjectFacet.setIndexFieldName("subject");
+        subjectFacet.setFacetLimit(5);
+        DiscoverySearchFilterFacet dateFacet = new DiscoverySearchFilterFacet();
+        dateFacet.setIndexFieldName("dateIssued");
+        dateFacet.setType(DiscoveryConfigurationParameters.TYPE_DATE);
+        dateFacet.setFacetLimit(6);
+        HierarchicalSidebarFacetConfiguration hierarchyFacet = new HierarchicalSidebarFacetConfiguration();
+        hierarchyFacet.setIndexFieldName("hierarchy");
+        hierarchyFacet.setType(TYPE_HIERARCHICAL);
+        hierarchyFacet.setFacetLimit(7);
+        hierarchyFacet.setSortOrderSidebar(VALUE);
+        discoveryConfiguration.setSidebarFacets(Arrays.asList(subjectFacet, dateFacet, hierarchyFacet));
+        discoveryConfiguration.setSearchFilters(Arrays.asList(subjectFacet, dateFacet, hierarchyFacet));
+
+        query = "my test case";
+        searchFilter = new SearchFilter("subject", "equals", "Java");
+        tranformedFilter = new QueryBuilderSearchFilter("subject", "equals", "Java");
+        page = PageRequest.of(1, 10, Sort.Direction.ASC, "dc.title");
+    }
+
+    @Test
+    public void testBuildQuery() throws Exception {
+        restQueryBuilder.buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "item",
+                                    page);
+
+        verify(discoverQueryBuilder, times(1)).buildQuery(context, scope, discoveryConfiguration, query,
+                                                          Arrays.asList(tranformedFilter), singletonList("item"),
+                                                          page.getPageSize(), page.getOffset(), "dc.title",
+                                                          "ASC");
+    }
+
+    @Test
+    public void testBuildQueryDefaults() throws Exception {
+        restQueryBuilder.buildQuery(context, null, discoveryConfiguration, null, null, emptyList(), null);
+
+        verify(discoverQueryBuilder, times(1)).buildQuery(context, null, discoveryConfiguration, null,
+                                                          emptyList(), emptyList(), null, null, null, null);
+    }
+
+    @Test
+    public void testSortByScore() throws Exception {
+        page = PageRequest.of(2, 10, Sort.Direction.ASC, "SCORE");
+        restQueryBuilder.buildQuery(context, null, discoveryConfiguration, null, null, emptyList(), page);
+
+        verify(discoverQueryBuilder, times(1)).buildQuery(context, null, discoveryConfiguration, null,
+                                                          emptyList(), emptyList(), page.getPageSize(),
+                                                          page.getOffset(), "SCORE", "ASC");
+    }
+
+    @Test(expected = DSpaceBadRequestException.class)
+    public void testCatchIllegalArgumentException() throws Exception {
+        when(discoverQueryBuilder.buildQuery(any(), any(), any(), any(), any(), anyList(), any(), any(), any(),
+                                             any())).thenThrow(IllegalArgumentException.class);
+        restQueryBuilder
+                .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "TEST", page);
+    }
+
+    @Test(expected = InvalidSearchRequestException.class)
+    public void testCatchSearchServiceException() throws Exception {
+        when(discoverQueryBuilder.buildQuery(any(), any(), any(), any(), any(), anyList(), any(), any(), any(),
+                                             any())).thenThrow(SearchServiceException.class);
+        restQueryBuilder
+                .buildQuery(context, scope, discoveryConfiguration, query, Arrays.asList(searchFilter), "ITEM", page);
+    }
+
+    @Test
+    public void testBuildFacetQuery() throws Exception {
+        restQueryBuilder.buildFacetQuery(context, scope, discoveryConfiguration,
+                                         "prefix", query,
+                                         singletonList(searchFilter), "item", page,
+                                         "subject");
+
+        verify(discoverQueryBuilder, times(1)).buildFacetQuery(context, scope, discoveryConfiguration, "prefix",
+                                                               query, singletonList(tranformedFilter),
+                                                               singletonList("item"), page.getPageSize(),
+                                                               page.getOffset(), "subject");
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/scripts/TypeConversionTestScript.java b/dspace-server-webapp/src/test/java/org/dspace/app/scripts/TypeConversionTestScript.java
new file mode 100644
index 0000000000..824e5dda9f
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/scripts/TypeConversionTestScript.java
@@ -0,0 +1,33 @@
+/**
+ * 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/
+ */
+package org.dspace.app.scripts;
+
+import org.apache.commons.cli.ParseException;
+import org.dspace.app.rest.converter.ScriptConverter;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.utils.DSpace;
+
+/**
+ * Script used to test the type conversion in the {@link ScriptConverter}
+ */
+public class TypeConversionTestScript extends DSpaceRunnable<TypeConversionTestScriptConfiguration> {
+
+
+    public TypeConversionTestScriptConfiguration getScriptConfiguration() {
+        return new DSpace().getServiceManager()
+                           .getServiceByName("type-conversion-test", TypeConversionTestScriptConfiguration.class);
+    }
+
+    public void setup() throws ParseException {
+        // This script is only used to test rest exposure, no setup is required.
+    }
+
+    public void internalRun() throws Exception {
+        // This script is only used to test rest exposure, no internal run is required.
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/scripts/TypeConversionTestScriptConfiguration.java b/dspace-server-webapp/src/test/java/org/dspace/app/scripts/TypeConversionTestScriptConfiguration.java
new file mode 100644
index 0000000000..27c37f1487
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/scripts/TypeConversionTestScriptConfiguration.java
@@ -0,0 +1,47 @@
+/**
+ * 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/
+ */
+package org.dspace.app.scripts;
+
+import java.io.InputStream;
+
+import org.apache.commons.cli.Options;
+import org.dspace.app.rest.converter.ScriptConverter;
+import org.dspace.core.Context;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+
+/**
+ * Script configuration used to test the type conversion in the {@link ScriptConverter}
+ */
+public class TypeConversionTestScriptConfiguration<T extends TypeConversionTestScript> extends ScriptConfiguration<T> {
+
+
+    public Class<T> getDspaceRunnableClass() {
+        return null;
+    }
+
+    public void setDspaceRunnableClass(final Class<T> dspaceRunnableClass) {
+
+    }
+
+    public boolean isAllowedToExecute(final Context context) {
+        return true;
+    }
+
+    public Options getOptions() {
+
+        Options options = new Options();
+
+        options.addOption("b", "boolean", false, "option set to the boolean class");
+        options.addOption("s", "string", true, "string option with an argument");
+        options.addOption("n", "noargument", false, "string option without an argument");
+        options.addOption("f", "file", true, "file option with an argument");
+        options.getOption("f").setType(InputStream.class);
+
+        return options;
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java b/dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java
index 66c0319857..a528f43513 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java
@@ -9,7 +9,7 @@ package org.dspace.curate;
 
 import static com.jayway.jsonpath.JsonPath.read;
 import static org.hamcrest.Matchers.is;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.dspace.app.rest.converter.DSpaceRunnableParameterConverter;
 import org.dspace.app.rest.matcher.ProcessMatcher;
 import org.dspace.app.rest.model.ParameterValueRest;
@@ -87,9 +87,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
 
         // Request with -t <invalidTaskOption>
         getClient(token)
-            .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                 .param("properties",
-                                                     new Gson().toJson(list)))
+            .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                         .param("properties", new ObjectMapper().writeValueAsString(list)))
             // Illegal Argument Exception
             .andExpect(status().isBadRequest());
     }
@@ -109,9 +108,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
 
         // Request with missing required -i <handle>
         getClient(token)
-            .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                 .param("properties",
-                                                     new Gson().toJson(list)))
+            .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                         .param("properties", new ObjectMapper().writeValueAsString(list)))
             // Illegal Argument Exception
             .andExpect(status().isBadRequest());
     }
@@ -132,9 +130,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
 
         // Request with missing required -i <handle>
         getClient(token)
-            .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                 .param("properties",
-                                                     new Gson().toJson(list)))
+            .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                         .param("properties", new ObjectMapper().writeValueAsString(list)))
             // Illegal Argument Exception
             .andExpect(status().isBadRequest());
     }
@@ -173,9 +170,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
 
         // Request without -t <task> or -T <taskFile> (and no -q <queue>)
         getClient(token)
-            .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                 .param("properties",
-                                                     new Gson().toJson(list)))
+            .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                         .param("properties", new ObjectMapper().writeValueAsString(list)))
             // Illegal Argument Exception
             .andExpect(status().isBadRequest());
     }
@@ -196,9 +192,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
 
         // Request with invalid -s <scope>; must be object, curation or open
         getClient(token)
-            .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                 .param("properties",
-                                                     new Gson().toJson(list)))
+            .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                         .param("properties", new ObjectMapper().writeValueAsString(list)))
             // Illegal Argument Exception
             .andExpect(status().isBadRequest());
     }
@@ -219,9 +214,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
 
         // Request with invalid -s <scope>; must be object, curation or open
         getClient(token)
-            .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                 .param("properties",
-                                                     new Gson().toJson(list)))
+            .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                         .param("properties", new ObjectMapper().writeValueAsString(list)))
             // Illegal Argument Exception
             .andExpect(status().isBadRequest());
     }
@@ -262,9 +256,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
 
         try {
             getClient(token)
-                .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                     .param("properties",
-                                                         new Gson().toJson(list)))
+                .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                             .param("properties", new ObjectMapper().writeValueAsString(list)))
                 .andExpect(status().isAccepted())
                 .andExpect(jsonPath("$", is(
                     ProcessMatcher.matchProcess("curate",
@@ -314,9 +307,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
 
         try {
             getClient(token)
-                .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                     .param("properties",
-                                                         new Gson().toJson(list)))
+                .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                             .param("properties", new ObjectMapper().writeValueAsString(list)))
                 .andExpect(status().isAccepted())
                 .andExpect(jsonPath("$", is(
                     ProcessMatcher.matchProcess("curate",
@@ -366,9 +358,8 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
         try {
 
             getClient(token)
-                .perform(post(CURATE_SCRIPT_ENDPOINT).contentType("multipart/form-data")
-                                                     .param("properties",
-                                                            new Gson().toJson(list)))
+                .perform(multipart(CURATE_SCRIPT_ENDPOINT)
+                             .param("properties", new ObjectMapper().writeValueAsString(list)))
                 .andExpect(jsonPath("$", is(
                     ProcessMatcher.matchProcess("curate",
                                                 String.valueOf(admin.getID()), parameters,
diff --git a/dspace-server-webapp/src/test/java/org/dspace/google/GoogleAsyncEventListenerIT.java b/dspace-server-webapp/src/test/java/org/dspace/google/GoogleAsyncEventListenerIT.java
new file mode 100644
index 0000000000..866d0fafed
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/google/GoogleAsyncEventListenerIT.java
@@ -0,0 +1,260 @@
+/**
+ * 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/
+ */
+package org.dspace.google;
+
+import static java.nio.charset.Charset.defaultCharset;
+import static org.apache.commons.io.IOUtils.toInputStream;
+import static org.dspace.app.matcher.GoogleAnalyticsEventMatcher.event;
+import static org.dspace.builder.BitstreamBuilder.createBitstream;
+import static org.dspace.google.GoogleAsyncEventListener.GA_MAX_EVENTS;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.google.client.GoogleAnalyticsClient;
+import org.dspace.services.ConfigurationService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link GoogleAsyncEventListener}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GoogleAsyncEventListenerIT extends AbstractControllerIntegrationTest {
+
+    private static final String ANALYTICS_KEY = "G-123456";
+
+    @Autowired
+    private GoogleAsyncEventListener googleAsyncEventListener;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    private Bitstream bitstream;
+
+    private List<GoogleAnalyticsClient> originalGoogleAnalyticsClients;
+
+    private GoogleAnalyticsClient firstGaClientMock = mock(GoogleAnalyticsClient.class);
+
+    private GoogleAnalyticsClient secondGaClientMock = mock(GoogleAnalyticsClient.class);
+
+    @Before
+    public void setup() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Test community")
+            .build();
+
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Test collection")
+            .build();
+
+        Item item = ItemBuilder.createItem(context, collection)
+            .withTitle("Test item")
+            .build();
+
+        bitstream = createBitstream(context, item, toInputStream("Test bitstream", defaultCharset()))
+            .withName("bitstream.txt")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        configurationService.setProperty("google.analytics.key", ANALYTICS_KEY);
+
+        originalGoogleAnalyticsClients = googleAsyncEventListener.getGoogleAnalyticsClients();
+        googleAsyncEventListener.setGoogleAnalyticsClients(List.of(firstGaClientMock, secondGaClientMock));
+
+        when(firstGaClientMock.isAnalyticsKeySupported(ANALYTICS_KEY)).thenReturn(false);
+        when(secondGaClientMock.isAnalyticsKeySupported(ANALYTICS_KEY)).thenReturn(true);
+
+    }
+
+    @After
+    public void cleanup() {
+        googleAsyncEventListener.setGoogleAnalyticsClients(originalGoogleAnalyticsClients);
+    }
+
+    @Test
+    public void testOnBitstreamContentDownload() throws Exception {
+
+        assertThat(getStoredEventsAsList(), empty());
+
+        String bitstreamUrl = "/api/core/bitstreams/" + bitstream.getID() + "/content";
+
+        downloadBitstreamContent("Postman", "123456", "REF");
+        downloadBitstreamContent("Chrome", "ABCDEFG", "REF-1");
+        downloadBitstreamContent("Chrome", "987654", "REF-2");
+
+        List<GoogleAnalyticsEvent> storedEvents = getStoredEventsAsList();
+
+        assertThat(storedEvents, contains(
+            event("123456", "127.0.0.1", "Postman", "REF", bitstreamUrl, "Test item"),
+            event("ABCDEFG", "127.0.0.1", "Chrome", "REF-1", bitstreamUrl, "Test item"),
+            event("987654", "127.0.0.1", "Chrome", "REF-2", bitstreamUrl, "Test item")));
+
+        googleAsyncEventListener.sendCollectedEvents();
+
+        assertThat(getStoredEventsAsList(), empty());
+
+        verify(firstGaClientMock).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verify(secondGaClientMock).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verify(secondGaClientMock).sendEvents(ANALYTICS_KEY, storedEvents);
+        verifyNoMoreInteractions(firstGaClientMock, secondGaClientMock);
+
+    }
+
+    @Test
+    public void testOnBitstreamContentDownloadWithoutConfiguredAnalyticsKey() throws Exception {
+
+        configurationService.setProperty("google.analytics.key", null);
+
+        downloadBitstreamContent("Postman", "123456", "REF");
+        downloadBitstreamContent("Chrome", "ABCDEFG", "REF-1");
+        downloadBitstreamContent("Chrome", "987654", "REF-2");
+
+        assertThat(getStoredEventsAsList(), empty());
+
+        googleAsyncEventListener.sendCollectedEvents();
+
+        assertThat(getStoredEventsAsList(), empty());
+
+        verifyNoMoreInteractions(firstGaClientMock, secondGaClientMock);
+
+    }
+
+    @Test
+    public void testOnBitstreamContentDownloadWithNotSupportedAnalyticsKey() throws Exception {
+
+        when(firstGaClientMock.isAnalyticsKeySupported(ANALYTICS_KEY)).thenReturn(false);
+        when(secondGaClientMock.isAnalyticsKeySupported(ANALYTICS_KEY)).thenReturn(false);
+
+        downloadBitstreamContent("Postman", "123456", "REF");
+        downloadBitstreamContent("Chrome", "ABCDEFG", "REF-1");
+        downloadBitstreamContent("Chrome", "987654", "REF-2");
+
+        assertThat(getStoredEventsAsList(), hasSize(3));
+
+        IllegalStateException illegalStateException = Assert.assertThrows(IllegalStateException.class,
+            () -> googleAsyncEventListener.sendCollectedEvents());
+
+        assertThat(illegalStateException.getMessage(), is("No Google Analytics Client supports key G-123456"));
+
+        assertThat(getStoredEventsAsList(), empty());
+
+        verify(firstGaClientMock).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verify(secondGaClientMock).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verifyNoMoreInteractions(firstGaClientMock, secondGaClientMock);
+
+    }
+
+    @Test
+    public void testOnBitstreamContentDownloadWithMoreThanOneSupportedClient() throws Exception {
+
+        when(firstGaClientMock.isAnalyticsKeySupported(ANALYTICS_KEY)).thenReturn(true);
+        when(secondGaClientMock.isAnalyticsKeySupported(ANALYTICS_KEY)).thenReturn(true);
+
+        downloadBitstreamContent("Postman", "123456", "REF");
+        downloadBitstreamContent("Chrome", "ABCDEFG", "REF-1");
+        downloadBitstreamContent("Chrome", "987654", "REF-2");
+
+        assertThat(getStoredEventsAsList(), hasSize(3));
+
+        IllegalStateException exception = Assert.assertThrows(IllegalStateException.class,
+            () -> googleAsyncEventListener.sendCollectedEvents());
+
+        assertThat(exception.getMessage(), is("More than one Google Analytics Client supports key G-123456"));
+
+        assertThat(getStoredEventsAsList(), empty());
+
+        verify(firstGaClientMock).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verify(secondGaClientMock).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verifyNoMoreInteractions(firstGaClientMock, secondGaClientMock);
+
+    }
+
+    @Test
+    public void testOnBitstreamContentDownloadWithTooManyEvents() throws Exception {
+
+        int eventCount = GA_MAX_EVENTS + 6;
+
+        for (int i = 0; i < eventCount; i++) {
+            downloadBitstreamContent("Postman", "123456", "REF");
+        }
+
+        List<GoogleAnalyticsEvent> storedEvents = getStoredEventsAsList();
+        assertThat(storedEvents, hasSize(eventCount));
+
+        googleAsyncEventListener.sendCollectedEvents();
+
+        List<GoogleAnalyticsEvent> firstEventsChunk = storedEvents.subList(0, GA_MAX_EVENTS);
+        List<GoogleAnalyticsEvent> secondEventsChunk = storedEvents.subList(GA_MAX_EVENTS, eventCount);
+
+        assertThat(getStoredEventsAsList(), is(secondEventsChunk));
+
+        verify(firstGaClientMock).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verify(secondGaClientMock).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verify(secondGaClientMock).sendEvents(ANALYTICS_KEY, firstEventsChunk);
+        verifyNoMoreInteractions(firstGaClientMock, secondGaClientMock);
+
+        googleAsyncEventListener.sendCollectedEvents();
+
+        assertThat(getStoredEventsAsList(), empty());
+
+        verify(firstGaClientMock, times(2)).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verify(secondGaClientMock, times(2)).isAnalyticsKeySupported(ANALYTICS_KEY);
+        verify(secondGaClientMock).sendEvents(ANALYTICS_KEY, secondEventsChunk);
+        verifyNoMoreInteractions(firstGaClientMock, secondGaClientMock);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<GoogleAnalyticsEvent> getStoredEventsAsList() {
+        List<GoogleAnalyticsEvent> events = new ArrayList<>();
+
+        googleAsyncEventListener.getEventsBuffer().iterator()
+            .forEachRemaining(obj -> events.add((GoogleAnalyticsEvent) obj));
+
+        return events;
+    }
+
+    private void downloadBitstreamContent(String userAgent, String correlationId, String referrer) throws Exception {
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(get("/api/core/bitstreams/" + bitstream.getID() + "/content")
+                .header("USER-AGENT", userAgent)
+                .header("X-CORRELATION-ID", correlationId)
+                .header("X-REFERRER", referrer))
+            .andExpect(status().isOk());
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/google/client/GoogleAnalyticsClientIT.java b/dspace-server-webapp/src/test/java/org/dspace/google/client/GoogleAnalyticsClientIT.java
new file mode 100644
index 0000000000..280e5a4390
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/google/client/GoogleAnalyticsClientIT.java
@@ -0,0 +1,60 @@
+/**
+ * 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/
+ */
+package org.dspace.google.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.util.List;
+
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.utils.DSpace;
+import org.junit.Test;
+
+/**
+ * Integration tests that verifies the configured beans of
+ * {@link GoogleAnalyticsClient} type.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class GoogleAnalyticsClientIT extends AbstractIntegrationTestWithDatabase {
+
+    @Test
+    public void testConfiguredGoogleAnalyticsClients() {
+
+        List<GoogleAnalyticsClientImpl> clients = new DSpace().getServiceManager()
+            .getServicesByType(GoogleAnalyticsClientImpl.class);
+
+        assertThat(clients, hasSize(2));
+
+        GoogleAnalyticsClientImpl ga4Client = getClientByKeyPrefix(clients, "G-");
+        assertThat(ga4Client, notNullValue());
+        assertThat(ga4Client.getRequestBuilder(), instanceOf(GoogleAnalytics4ClientRequestBuilder.class));
+        assertThat(ga4Client.isAnalyticsKeySupported("G-12345"), is(true));
+        assertThat(ga4Client.isAnalyticsKeySupported("UA-12345"), is(false));
+
+        GoogleAnalyticsClientImpl uaClient = getClientByKeyPrefix(clients, "UA-");
+        assertThat(uaClient, notNullValue());
+        assertThat(uaClient.getRequestBuilder(), instanceOf(UniversalAnalyticsClientRequestBuilder.class));
+        assertThat(uaClient.isAnalyticsKeySupported("G-12345"), is(false));
+        assertThat(uaClient.isAnalyticsKeySupported("UA-12345"), is(true));
+
+    }
+
+    private GoogleAnalyticsClientImpl getClientByKeyPrefix(List<GoogleAnalyticsClientImpl> clients, String keyPrefix) {
+        return clients.stream()
+            .filter(client -> keyPrefix.equals(client.getKeyPrefix()))
+            .findFirst()
+            .orElse(null);
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/iiif/MockIIIFApiQueryServiceImpl.java b/dspace-server-webapp/src/test/java/org/dspace/iiif/MockIIIFApiQueryServiceImpl.java
new file mode 100644
index 0000000000..a240e76f97
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/iiif/MockIIIFApiQueryServiceImpl.java
@@ -0,0 +1,20 @@
+/**
+ * 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/
+ */
+package org.dspace.iiif;
+
+import org.dspace.content.Bitstream;
+
+/**
+ * Mock for the IIIFApiQueryService.
+ * @author Michael Spalti (mspalti at willamette.edu)
+ */
+public class MockIIIFApiQueryServiceImpl extends IIIFApiQueryServiceImpl {
+    public int[] getImageDimensions(Bitstream bitstream) {
+        return new int[]{64, 64};
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java b/dspace-server-webapp/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
index bb443ab4a4..d70499d096 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jdom.Document;
-import org.jdom.JDOMException;
+import org.jdom2.Document;
+import org.jdom2.JDOMException;
 
 /**
  * Mock implementation for the Creative commons license connector service.
diff --git a/dspace-server-webapp/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java b/dspace-server-webapp/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java
index 1197370e32..f69c0e3af7 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java
@@ -54,9 +54,7 @@ public class MockDSpaceRunnableScriptConfiguration<T extends MockDSpaceRunnableS
             Options options = new Options();
 
             options.addOption("r", "remove", true, "description r");
-            options.getOption("r").setType(String.class);
             options.addOption("i", "index", false, "description i");
-            options.getOption("i").setType(boolean.class);
             options.getOption("i").setRequired(true);
             options.addOption("f", "file", true, "source file");
             options.getOption("f").setType(InputStream.class);
diff --git a/dspace-server-webapp/src/test/resources/Messages_pl.properties b/dspace-server-webapp/src/test/resources/Messages_pl.properties
index 9f2db2e0da..3513cdd316 100644
--- a/dspace-server-webapp/src/test/resources/Messages_pl.properties
+++ b/dspace-server-webapp/src/test/resources/Messages_pl.properties
@@ -11,3 +11,4 @@ org.dspace.app.rest.exception.RESTEmptyWorkflowGroupException.message = [PL] Ref
     workflow group {1}. Delete the tasks and group first if you want to remove this user.
 org.dspace.app.rest.exception.EPersonNameNotProvidedException.message = [PL] The eperson.firstname and eperson.lastname values need to be filled in
 org.dspace.app.rest.exception.GroupNameNotProvidedException.message = [PL] Cannot create group, no group name is provided
+org.dspace.app.rest.exception.GroupHasPendingWorkflowTasksException.message = [PL] Cannot delete group, the associated workflow role still has pending tasks
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/dublin_core-person.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/dublin_core-person.xml
new file mode 100644
index 0000000000..4d530630ba
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/dublin_core-person.xml
@@ -0,0 +1,3 @@
+<dublin_core>
+    <dcvalue element="title" qualifier="none">Person Test</dcvalue>
+</dublin_core>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/dublin_core.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/dublin_core.xml
new file mode 100644
index 0000000000..a1afbb417a
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/dublin_core.xml
@@ -0,0 +1,5 @@
+<dublin_core>
+    <dcvalue element="title" qualifier="none">A Tale of Two Cities</dcvalue>
+    <dcvalue element="date" qualifier="issued">1990</dcvalue>
+    <dcvalue element="title" qualifier="alternative" language="fr">J'aime les Printemps</dcvalue>
+</dublin_core>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/metadata_dcterms.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/metadata_dcterms.xml
new file mode 100644
index 0000000000..8d8e3a8d54
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/metadata_dcterms.xml
@@ -0,0 +1,3 @@
+<dublin_core schema="dcterms">
+    <dcvalue element="title" qualifier="none">A Tale of Two Cities</dcvalue>
+</dublin_core>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/relationships b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/relationships
new file mode 100644
index 0000000000..e8ec1985ce
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/relationships
@@ -0,0 +1 @@
+relation.isAuthorOfPublication folderName:item_001
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/saf-bitstreams.zip b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/saf-bitstreams.zip
new file mode 100755
index 0000000000..35be57e897
Binary files /dev/null and b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/saf-bitstreams.zip differ
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/saf-relationships.zip b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/saf-relationships.zip
new file mode 100755
index 0000000000..d41e7c6eb8
Binary files /dev/null and b/dspace-server-webapp/src/test/resources/org/dspace/app/itemimport/saf-relationships.zip differ
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ads-ex.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ads-ex.json
new file mode 100644
index 0000000000..bf602c94fd
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ads-ex.json
@@ -0,0 +1,186 @@
+{
+    "responseHeader": {
+        "status": 0,
+        "QTime": 13,
+        "params": {
+            "q": "roma",
+            "fl": "abstract,aff,alternate_bibcode,alternate_title,arxiv_class,author,bibcode,bibgroup,bibstem,citation_count,copyright,database,doi,doctype,first_author,grant,id,indexstamp,issue,keyword,lang,orcid_pub,orcid_user,orcid_other,page,property,pub,pubdate,read_count,title,vizier,volume,year",
+            "start": "0",
+            "internal_logging_params": "X-Amzn-Trace-Id=Root=1-624bf56a-2c4cc8a73c5ebd7648dd283d",
+            "rows": "2",
+            "wt": "json"
+        }
+    },
+    "response": {
+        "numFound": 9383,
+        "start": 0,
+        "docs": [
+            {
+                "bibcode": "2016PhRvL.116f1102A",
+                "abstract": "On September 14, 2015 at 09:50:45 UTC the two detectors of the Laser Interferometer Gravitational-Wave Observatory simultaneously observed a transient gravitational-wave signal. The signal sweeps upwards in frequency from 35 to 250 Hz with a peak gravitational-wave strain of 1.0 ×10<SUP>-21</SUP>. It matches the waveform predicted by general relativity for the inspiral and merger of a pair of black holes and the ringdown of the resulting single black hole. The signal was observed with a matched-filter signal-to-noise ratio of 24 and a false alarm rate estimated to be less than 1 event per 203 000 years, equivalent to a significance greater than 5.1 σ . The source lies at a luminosity distance of 41 0<SUB>-180</SUB><SUP>+160</SUP> Mpc corresponding to a redshift z =0.0 9<SUB>-0.04</SUB><SUP>+0.03</SUP> . In the source frame, the initial black hole masses are 3 6<SUB>-4</SUB><SUP>+5</SUP>M<SUB>⊙</SUB> and 2 9<SUB>-4</SUB><SUP>+4</SUP>M<SUB>⊙</SUB> , and the final black hole mass is 6 2<SUB>-4</SUB><SUP>+4</SUP>M<SUB>⊙</SUB> , with 3. 0<SUB>-0.5</SUB><SUP>+0.5</SUP>M<SUB>⊙</SUB> c<SUP>2</SUP> radiated in gravitational waves. All uncertainties define 90% credible intervals. These observations demonstrate the existence of binary stellar-mass black hole systems. This is the first direct detection of gravitational waves and the first observation of a binary black hole merger.",
+                "aff": [
+                    "LIGO, California Institute of Technology, Pasadena, California 91125, USA",
+                    "The University of Mississippi, University, Mississippi 38677, USA",
+                    "California State University Fullerton, Fullerton, California 92831, USA",
+                    "LAL, Université Paris-Sud, CNRS/IN2P3, Université Paris-Saclay, Orsay, France"
+                ],
+                "alternate_bibcode": [
+                    "2016arXiv160203837T"
+                ],
+                "arxiv_class": [
+                    "gr-qc",
+                    "astro-ph.HE"
+                ],
+                "author": [
+                    "Abbott, B. P.",
+                    "Babak, S.",
+                    "Di Fiore, L.",
+                    "Virgo Collaboration"
+                ],
+                "bibstem": [
+                    "PhRvL",
+                    "PhRvL.116"
+                ],
+                "copyright": "2016: authors",
+                "database": [
+                    "astronomy",
+                    "physics"
+                ],
+                "doctype": "article",
+                "doi": [
+                    "10.1103/PhysRevLett.116.061102"
+                ],
+                "first_author": "Abbott, B. P.",
+                "id": "1360978",
+                "issue": "6",
+                "keyword": [
+                    "General Relativity and Quantum Cosmology",
+                    "Astrophysics - High Energy Astrophysical Phenomena"
+                ],
+                "orcid_pub": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "page": [
+                    "061102"
+                ],
+                "pub": "Physical Review Letters",
+                "pubdate": "2016-02-00",
+                "title": [
+                    "Observation of Gravitational Waves from a Binary Black Hole Merger"
+                ],
+                "volume": "116",
+                "year": "2016",
+                "orcid_user": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "orcid_other": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "read_count": 639,
+                "property": [
+                    "ARTICLE",
+                    "DATA",
+                    "EPRINT_OPENACCESS",
+                    "ESOURCE",
+                    "OPENACCESS",
+                    "PUB_OPENACCESS",
+                    "REFEREED"
+                ],
+                "citation_count": 7348,
+                "indexstamp": "2022-04-04T22:08:12.481Z"
+            },
+            {
+                "bibcode": "2017PhRvL.119p1101A",
+                "abstract": "On August 17, 2017 at 12∶41:04 UTC the Advanced LIGO and Advanced Virgo gravitational-wave detectors made their first observation of a binary neutron star inspiral. The signal, GW170817, was detected with a combined signal-to-noise ratio of 32.4 and a false-alarm-rate estimate of less than one per 8.0 ×10<SUP>4</SUP> years . We infer the component masses of the binary to be between 0.86 and 2.26 M<SUB>⊙</SUB> , in agreement with masses of known neutron stars. Restricting the component spins to the range inferred in binary neutron stars, we find the component masses to be in the range 1.17 - 1.60 M<SUB>⊙</SUB> , with the total mass of the system 2.7 4<SUB>-0.01</SUB><SUP>+0.04</SUP>M<SUB>⊙</SUB> . The source was localized within a sky region of 28 deg<SUP>2</SUP> (90% probability) and had a luminosity distance of 4 0<SUB>-14</SUB><SUP>+8</SUP> Mpc , the closest and most precisely localized gravitational-wave signal yet. The association with the γ -ray burst GRB 170817A, detected by Fermi-GBM 1.7 s after the coalescence, corroborates the hypothesis of a neutron star merger and provides the first direct evidence of a link between these mergers and short γ -ray bursts. Subsequent identification of transient counterparts across the electromagnetic spectrum in the same location further supports the interpretation of this event as a neutron star merger. This unprecedented joint gravitational and electromagnetic observation provides insight into astrophysics, dense matter, gravitation, and cosmology.",
+                "aff": [
+                    "The University of Mississippi, University, Mississippi 38677, USA",
+                    "The Chinese University of Hong Kong, Shatin, NT, Hong Kong",
+                    "Nikhef, Science Park, 1098 XG Amsterdam, Netherlands",
+                    "INFN, Sezione di Padova, I-35131 Padova, Italy"
+                ],
+                "alternate_bibcode": [
+                    "2017arXiv171005832T"
+                ],
+                "arxiv_class": [
+                    "gr-qc",
+                    "astro-ph.HE"
+                ],
+                "author": [
+                    "Abbott, B. P.",
+                    "Babak, S.",
+                    "Vorvick, C.",
+                    "Wade, M."
+                ],
+                "bibstem": [
+                    "PhRvL",
+                    "PhRvL.119"
+                ],
+                "copyright": "2017: authors",
+                "database": [
+                    "astronomy",
+                    "physics"
+                ],
+                "doctype": "article",
+                "doi": [
+                    "10.1103/PhysRevLett.119.161101"
+                ],
+                "first_author": "Abbott, B. P.",
+                "id": "11492510",
+                "issue": "16",
+                "keyword": [
+                    "General Relativity and Quantum Cosmology",
+                    "Astrophysics - High Energy Astrophysical Phenomena"
+                ],
+                "orcid_pub": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "page": [
+                    "161101"
+                ],
+                "pub": "Physical Review Letters",
+                "pubdate": "2017-10-00",
+                "title": [
+                    "GW170817: Observation of Gravitational Waves from a Binary Neutron Star Inspiral"
+                ],
+                "volume": "119",
+                "year": "2017",
+                "orcid_user": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "orcid_other": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "read_count": 475,
+                "property": [
+                    "ARTICLE",
+                    "DATA",
+                    "EPRINT_OPENACCESS",
+                    "ESOURCE",
+                    "OPENACCESS",
+                    "PUB_OPENACCESS",
+                    "REFEREED"
+                ],
+                "citation_count": 5260,
+                "indexstamp": "2022-04-04T22:08:08.068Z"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ads-single-obj.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ads-single-obj.json
new file mode 100644
index 0000000000..60f8b10fe3
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ads-single-obj.json
@@ -0,0 +1,103 @@
+{
+    "responseHeader": {
+        "status": 0,
+        "QTime": 11,
+        "params": {
+            "q": "bibcode:2017PhRvL.119p1101A",
+            "fl": "abstract,aff,alternate_bibcode,alternate_title,arxiv_class,author,bibcode,bibgroup,bibstem,citation_count,copyright,database,doi,doctype,first_author,grant,id,indexstamp,issue,keyword,lang,orcid_pub,orcid_user,orcid_other,page,property,pub,pubdate,read_count,title,vizier,volume,year",
+            "start": "0",
+            "internal_logging_params": "X-Amzn-Trace-Id=Root=1-624c3c9f-330e7d086f4e7f5e762a8cdc",
+            "rows": "10",
+            "wt": "json"
+        }
+    },
+    "response": {
+        "numFound": 1,
+        "start": 0,
+        "docs": [
+            {
+                "bibcode": "2016PhRvL.116f1102A",
+                "abstract": "On September 14, 2015 at 09:50:45 UTC the two detectors of the Laser Interferometer Gravitational-Wave Observatory simultaneously observed a transient gravitational-wave signal. The signal sweeps upwards in frequency from 35 to 250 Hz with a peak gravitational-wave strain of 1.0 ×10<SUP>-21</SUP>. It matches the waveform predicted by general relativity for the inspiral and merger of a pair of black holes and the ringdown of the resulting single black hole. The signal was observed with a matched-filter signal-to-noise ratio of 24 and a false alarm rate estimated to be less than 1 event per 203 000 years, equivalent to a significance greater than 5.1 σ . The source lies at a luminosity distance of 41 0<SUB>-180</SUB><SUP>+160</SUP> Mpc corresponding to a redshift z =0.0 9<SUB>-0.04</SUB><SUP>+0.03</SUP> . In the source frame, the initial black hole masses are 3 6<SUB>-4</SUB><SUP>+5</SUP>M<SUB>⊙</SUB> and 2 9<SUB>-4</SUB><SUP>+4</SUP>M<SUB>⊙</SUB> , and the final black hole mass is 6 2<SUB>-4</SUB><SUP>+4</SUP>M<SUB>⊙</SUB> , with 3. 0<SUB>-0.5</SUB><SUP>+0.5</SUP>M<SUB>⊙</SUB> c<SUP>2</SUP> radiated in gravitational waves. All uncertainties define 90% credible intervals. These observations demonstrate the existence of binary stellar-mass black hole systems. This is the first direct detection of gravitational waves and the first observation of a binary black hole merger.",
+                "aff": [
+                    "LIGO, California Institute of Technology, Pasadena, California 91125, USA",
+                    "The University of Mississippi, University, Mississippi 38677, USA",
+                    "California State University Fullerton, Fullerton, California 92831, USA",
+                    "LAL, Université Paris-Sud, CNRS/IN2P3, Université Paris-Saclay, Orsay, France"
+                ],
+                "alternate_bibcode": [
+                    "2016arXiv160203837T"
+                ],
+                "arxiv_class": [
+                    "gr-qc",
+                    "astro-ph.HE"
+                ],
+                "author": [
+                    "Abbott, B. P.",
+                    "Babak, S.",
+                    "Di Fiore, L.",
+                    "Virgo Collaboration"
+                ],
+                "bibstem": [
+                    "PhRvL",
+                    "PhRvL.116"
+                ],
+                "copyright": "2016: authors",
+                "database": [
+                    "astronomy",
+                    "physics"
+                ],
+                "doctype": "article",
+                "doi": [
+                    "10.1103/PhysRevLett.116.061102"
+                ],
+                "first_author": "Abbott, B. P.",
+                "id": "1360978",
+                "issue": "6",
+                "keyword": [
+                    "General Relativity and Quantum Cosmology",
+                    "Astrophysics - High Energy Astrophysical Phenomena"
+                ],
+                "orcid_pub": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "page": [
+                    "061102"
+                ],
+                "pub": "Physical Review Letters",
+                "pubdate": "2016-02-00",
+                "title": [
+                    "Observation of Gravitational Waves from a Binary Black Hole Merger"
+                ],
+                "volume": "116",
+                "year": "2016",
+                "orcid_user": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "orcid_other": [
+                    "-",
+                    "-",
+                    "-",
+                    "-"
+                ],
+                "read_count": 639,
+                "property": [
+                    "ARTICLE",
+                    "DATA",
+                    "EPRINT_OPENACCESS",
+                    "ESOURCE",
+                    "OPENACCESS",
+                    "PUB_OPENACCESS",
+                    "REFEREED"
+                ],
+                "citation_count": 7348,
+                "indexstamp": "2022-04-04T22:08:12.481Z"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-article.bib b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-article.bib
new file mode 100644
index 0000000000..e3f1ca1d4e
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-article.bib
@@ -0,0 +1,4 @@
+@article{ Nobody01,
+       author = "Nobody Jr",
+       title = "My Article",
+       year = "2006" }
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-diacritics.bib b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-diacritics.bib
new file mode 100644
index 0000000000..d1cb431bef
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-diacritics.bib
@@ -0,0 +1,4 @@
+@misc{ Nobody01,
+       author = "Mo\ss",
+       title = { The German umlauts: \"A{\"O}{\"{u}}\ss },
+       year = "2006" }
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-multiple-authors.bib b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-multiple-authors.bib
new file mode 100644
index 0000000000..1db78de377
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/bibtex-test-multiple-authors.bib
@@ -0,0 +1,4 @@
+@misc{ Nobody01,
+       author = "A. Nauthor and A. Nother and A. Third",
+       title = "My Article",
+       year = "2006" }
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-first.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-first.xml
new file mode 100644
index 0000000000..449956bb33
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-first.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF xmlns="https://cir.nii.ac.jp/schema/1.0/"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:dc="http://purl.org/dc/elements/1.1/"
+         xmlns:dcterms="http://purl.org/dc/terms/"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:prism="http://prismstandard.org/namespaces/basic/2.0/"
+         xmlns:datacite="https://schema.datacite.org/meta/kernel-4/"
+         xmlns:ndl="http://ndl.go.jp/dcndl/terms/"
+         xmlns:cinii="http://ci.nii.ac.jp/ns/1.0/"
+         xmlns:jpcoar="https://github.com/JPCOAR/schema/blob/master/1.0/">
+    <Article rdf:about="https://cir.nii.ac.jp/crid/1010572092222310146.rdf">
+        <resourceType>学術雑誌論文(journal article)</resourceType>
+        <dc:title xml:lang="ja">Understanding the impact of mandatory accrual accounting on management practices: Interpretation of Japanese local governments’ behavior</dc:title>
+        <publication rdf:parseType="Resource">
+            <prism:publicationName xml:lang="ja">International Review of Administration Science</prism:publicationName>
+            <prism:publicationDate>2023</prism:publicationDate>
+            <prism:volume>89(2)</prism:volume>
+            <jointInternationalResearch>true</jointInternationalResearch>
+        </publication>
+        <reviewed>true</reviewed>
+        <project>
+            <Project rdf:about="https://cir.nii.ac.jp/crid/1040000782003163520">
+                <projectIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/KAKEN">18K12893</projectIdentifier>
+                <projectIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/URI">https://kaken.nii.ac.jp/grant/KAKENHI-PROJECT-18K12893/</projectIdentifier>
+                <notation xml:lang="ja">予算設定者による公会計情報の活用：質問紙実験と実証分析の混合研究</notation>
+                <notation xml:lang="en">accrual accounting for local government budgeteers: Evidence from Experimental and Empirical Study</notation>
+            </Project>
+        </project>
+        <dataSourceIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/KAKEN">PRODUCT-23613691</dataSourceIdentifier>
+    </Article>
+</rdf:RDF>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-responce-ids.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-responce-ids.xml
new file mode 100644
index 0000000000..ae672cd1d7
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-responce-ids.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:prism="http://prismstandard.org/namespaces/basic/2.0/" xmlns:ndl="http://ndl.go.jp/dcndl/terms" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:cir="https://cir.nii.ac.jp/schema/1.0/" xml:lang="ja">
+    <channel rdf:about="https://cir.nii.ac.jp/opensearch/articles?q=science&amp;count=2&amp;lang=ja&amp;start=1&amp;format=rss&amp;sortorder=0">
+        <title>CiNii Research articles - science 2 ja 1 rss 0</title>
+        <description>CiNii Research articles - science 2 ja 1 rss 0</description>
+        <link>https://cir.nii.ac.jp/opensearch/articles?q=science&amp;count=2&amp;lang=ja&amp;start=1&amp;format=rss&amp;sortorder=0</link>
+        <dc:date>2022-06-15T18:37:38.036109+09:00</dc:date>
+        <opensearch:totalResults>32</opensearch:totalResults>
+        <opensearch:startIndex>1</opensearch:startIndex>
+        <opensearch:itemsPerPage>2</opensearch:itemsPerPage>
+        <items>
+            <rdf:Seq>
+                <rdf:li rdf:resource="https://cir.nii.ac.jp/crid/1010572092222310146"/>
+                <rdf:li rdf:resource="https://cir.nii.ac.jp/crid/1050010687833449984"/>
+            </rdf:Seq>
+        </items>
+    </channel>
+    <item rdf:about="https://cir.nii.ac.jp/crid/1010572092222310146">
+        <title>Understanding the impact of mandatory accrual accounting on management practices: Interpretation of Japanese local governments’ behavior</title>
+        <link>https://cir.nii.ac.jp/crid/1010572092222310146</link>
+        <rdfs:seeAlso rdf:resource="https://cir.nii.ac.jp/crid/1010572092222310146.rdf"/>
+        <dc:type>Article</dc:type>
+        <prism:publicationName>International Review of Administration Science</prism:publicationName>
+        <prism:volume>89(2)</prism:volume>
+        <prism:publicationDate>2023</prism:publicationDate>
+    </item>
+    <item rdf:about="https://cir.nii.ac.jp/crid/1050010687833449984">
+        <title>Band structures of passive films on titanium in simulated bioliquids determined by photoelectrochemical response: principle governing the biocompatibility</title>
+        <link>https://cir.nii.ac.jp/crid/1050010687833449984</link>
+        <rdfs:seeAlso rdf:resource="https://cir.nii.ac.jp/crid/1050010687833449984.rdf"/>
+        <dc:type>Article</dc:type>
+        <dc:creator>Kim, Seong-Cheol</dc:creator>
+        <dc:creator>Hanawa, Takao</dc:creator>
+        <dc:creator>Manaka, Tomoyo</dc:creator>
+        <dc:creator>Tsuchiya, Hiroaki</dc:creator>
+        <dc:creator>Fujimoto, Shinji</dc:creator>
+        <dc:publisher>Taylor &amp; Francis</dc:publisher>
+        <prism:publicationName>Science and Technology of Advanced Materials</prism:publicationName>
+        <prism:issn>1468-6996</prism:issn>
+        <prism:volume>23</prism:volume>
+        <prism:number>1</prism:number>
+        <prism:startingPage>322</prism:startingPage>
+        <prism:endingPage>331</prism:endingPage>
+        <prism:publicationDate>2022-12-31</prism:publicationDate>
+        <description>The band structures and band gap energies, E (g), of passive films formed on titanium (Ti) in simulated bioliquids, Hanks&apos; solution (Hanks) and saline, were evaluated. Ti was polarized at 0, −0.1, and −0.2 V-Ag/AgCl, E (f), for 1 h. After polarization, the surfaces were characterized using X-ray photoelectron spectroscopy, and the photoelectrochemical responses were evaluated. The current change during photoirradiation was recorded as a photocurrent transient at each measuring potential, E (m), and by changing the wavelength of the incident light. Passive films consisted of a very thin TiO2 layer containing small amounts of Ti2O3 and TiO, hydroxyl groups, and water. During polarization in Hanks, calcium and phosphate ions were incorporated or formed calcium phosphate but not in saline. Calcium phosphate and hydroxyl groups influenced the band structure. E (g) was graded in Hanks but constant in saline, independent of E (f) and E (m). The passive film on Ti behaved as an n-type semiconductor containing two layers: an inner oxide layer with a large E (g) and an outer hydroxide layer with a small E (g). In Hanks, E (g) was 3.3–3.4 eV in the inner oxide layer and 2.9 eV in the outer hydroxide layer. In saline, E (g) was 3.3 eV in the inner layer and 2.7 eV in the outer layer. Calcium phosphate and hydroxyl groups influenced the band structure of the passive film. The E (g) of the outermost surface was smaller than that of TiO2 ceramics, which is probably one of the principles of the excellent biocompatibility of Ti among metals.</description>
+        <dc:identifier rdf:datatype="cir:URI">http://www.lib.kobe-u.ac.jp/handle_kernel/90009212</dc:identifier>
+        <dc:subject>band gap</dc:subject>
+        <dc:subject>band structure</dc:subject>
+        <dc:subject>biocompatibility</dc:subject>
+        <dc:subject>Hanks&apos; solution</dc:subject>
+        <dc:subject>passive film</dc:subject>
+        <dc:subject>photocurrent</dc:subject>
+        <dc:subject>saline</dc:subject>
+        <dc:subject>Titanium</dc:subject>
+        <dc:subject>XPS</dc:subject>
+        <dc:source rdf:resource="http://www.lib.kobe-u.ac.jp/handle_kernel/90009212" />
+    </item>
+</rdf:RDF>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-second.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-second.xml
new file mode 100644
index 0000000000..8eb68ff047
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-second.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rdf:RDF xmlns="https://cir.nii.ac.jp/schema/1.0/"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:dc="http://purl.org/dc/elements/1.1/"
+         xmlns:dcterms="http://purl.org/dc/terms/"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:prism="http://prismstandard.org/namespaces/basic/2.0/"
+         xmlns:datacite="https://schema.datacite.org/meta/kernel-4/"
+         xmlns:ndl="http://ndl.go.jp/dcndl/terms/"
+         xmlns:cinii="http://ci.nii.ac.jp/ns/1.0/"
+         xmlns:jpcoar="https://github.com/JPCOAR/schema/blob/master/1.0/">
+    <Article rdf:about="https://cir.nii.ac.jp/crid/1050010687833449984.rdf">
+        <productIdentifier rdf:parseType="Resource">
+            <identifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/URI">http://www.lib.kobe-u.ac.jp/handle_kernel/90009212</identifier>
+        </productIdentifier>
+        <resourceType>学術雑誌論文(journal article)</resourceType>
+        <dc:title>Band structures of passive films on titanium in simulated bioliquids determined by photoelectrochemical response: principle governing the biocompatibility</dc:title>
+        <dc:language>en</dc:language>
+        <description rdf:parseType="Resource">
+            <type>Other</type>
+            <notation>The band structures and band gap energies, E (g), of passive films formed on titanium (Ti) in simulated bioliquids, Hanks&apos; solution (Hanks) and saline, were evaluated. Ti was polarized at 0, −0.1, and −0.2 V-Ag/AgCl, E (f), for 1 h. After polarization, the surfaces were characterized using X-ray photoelectron spectroscopy, and the photoelectrochemical responses were evaluated. The current change during photoirradiation was recorded as a photocurrent transient at each measuring potential, E (m), and by changing the wavelength of the incident light. Passive films consisted of a very thin TiO2 layer containing small amounts of Ti2O3 and TiO, hydroxyl groups, and water. During polarization in Hanks, calcium and phosphate ions were incorporated or formed calcium phosphate but not in saline. Calcium phosphate and hydroxyl groups influenced the band structure. E (g) was graded in Hanks but constant in saline, independent of E (f) and E (m). The passive film on Ti behaved as an n-type semiconductor containing two layers: an inner oxide layer with a large E (g) and an outer hydroxide layer with a small E (g). In Hanks, E (g) was 3.3–3.4 eV in the inner oxide layer and 2.9 eV in the outer hydroxide layer. In saline, E (g) was 3.3 eV in the inner layer and 2.7 eV in the outer layer. Calcium phosphate and hydroxyl groups influenced the band structure of the passive film. The E (g) of the outermost surface was smaller than that of TiO2 ceramics, which is probably one of the principles of the excellent biocompatibility of Ti among metals.</notation>
+        </description>
+        <creator>
+            <Researcher rdf:about="https://cir.nii.ac.jp/crid/1070010687833449987">
+                <foaf:name>Kim, Seong-Cheol</foaf:name>
+            </Researcher>
+        </creator>
+        <creator>
+            <Researcher rdf:about="https://cir.nii.ac.jp/crid/1070010687833449988">
+                <foaf:name>Hanawa, Takao</foaf:name>
+            </Researcher>
+        </creator>
+        <creator>
+            <Researcher rdf:about="https://cir.nii.ac.jp/crid/1070010687833449985">
+                <foaf:name>Manaka, Tomoyo</foaf:name>
+            </Researcher>
+        </creator>
+        <creator>
+            <Researcher rdf:about="https://cir.nii.ac.jp/crid/1070010687833449986">
+                <foaf:name>Tsuchiya, Hiroaki</foaf:name>
+            </Researcher>
+        </creator>
+        <creator>
+            <Researcher rdf:about="https://cir.nii.ac.jp/crid/1070010687833449984">
+                <foaf:name>Fujimoto, Shinji</foaf:name>
+            </Researcher>
+        </creator>
+        <publication rdf:parseType="Resource">
+            <publicationIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/NCID">AA11561821</publicationIdentifier>
+            <publicationIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/ISSN">14686996</publicationIdentifier>
+            <publicationIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/ISSN">18785514</publicationIdentifier>
+            <prism:publicationName>Science and Technology of Advanced Materials</prism:publicationName>
+            <dc:publisher>Taylor &amp; Francis</dc:publisher>
+            <prism:publicationDate>2022-12-31</prism:publicationDate>
+            <prism:volume>23</prism:volume>
+            <prism:number>1</prism:number>
+            <prism:startingPage>322</prism:startingPage>
+            <prism:endingPage>331</prism:endingPage>
+        </publication>
+        <dc:rights>© 2022 The Author(s). Published by National Institute for Materials Science in partnership with Taylor &amp; Francis Group. This is an Open Access article distributed under the terms of the Creative Commons Attribution License (http://creativecommons.org/licenses/by/4.0/), which permits unrestricted use, distribution, and reproduction in any medium, provided the original work is properly cited.</dc:rights>
+        <url>
+            <rdf:Description rdf:about="http://www.lib.kobe-u.ac.jp/handle_kernel/90009212">
+        </rdf:Description>
+        </url>
+        <createdAt>2022-05-17</createdAt>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=band%20gap" dc:title="band gap"></foaf:topic>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=band%20structure" dc:title="band structure"></foaf:topic>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=biocompatibility" dc:title="biocompatibility"></foaf:topic>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=Hanks&apos;%20solution" dc:title="Hanks&apos; solution"></foaf:topic>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=passive%20film" dc:title="passive film"></foaf:topic>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=photocurrent" dc:title="photocurrent"></foaf:topic>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=saline" dc:title="saline"></foaf:topic>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=Titanium" dc:title="Titanium"></foaf:topic>
+        <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=XPS" dc:title="XPS"></foaf:topic>
+        <dataSourceIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/IRDB">oai:irdb.nii.ac.jp:01257:0005348137</dataSourceIdentifier>
+    </Article>
+</rdf:RDF>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/crossRef-by-id.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/crossRef-by-id.json
new file mode 100644
index 0000000000..d889319ca7
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/crossRef-by-id.json
@@ -0,0 +1,169 @@
+{
+   "status":"ok",
+   "message-type":"work",
+   "message-version":"1.0.0",
+   "message":{
+      "indexed":{
+         "date-parts":[
+            [
+               2022,
+               4,
+               5
+            ]
+         ],
+         "date-time":"2022-04-05T22:05:30Z",
+         "timestamp":1649196330913
+      },
+      "reference-count":0,
+      "publisher":"Petro Mohyla Black Sea National University",
+      "issue":"2",
+      "content-domain":{
+         "domain":[
+            
+         ],
+         "crossmark-restriction":false
+      },
+      "short-container-title":[
+         "Ukr. \u017e. med. b\u00ecol. sportu"
+      ],
+      "published-print":{
+         "date-parts":[
+            [
+               2016,
+               5,
+               19
+            ]
+         ]
+      },
+      "DOI":"10.26693\/jmbs01.02.184",
+      "type":"journal-article",
+      "created":{
+         "date-parts":[
+            [
+               2017,
+               9,
+               7
+            ]
+         ],
+         "date-time":"2017-09-07T13:30:46Z",
+         "timestamp":1504791046000
+      },
+      "page":"184-187",
+      "source":"Crossref",
+      "is-referenced-by-count":0,
+      "title":[
+         "State of Awareness of Freshers\u2019 Groups Chortkiv State Medical College of Prevention of Iodine Deficiency Diseases"
+      ],
+      "prefix":"10.26693",
+      "volume":"1",
+      "author":[
+         {
+            "given":"L.V.",
+            "family":"Senyuk",
+            "sequence":"first",
+            "affiliation":[
+               
+            ]
+         },
+         {
+            "name":"Chortkiv State Medical College 7, Gogola St., Chortkiv, Ternopil region 48500, Ukraine",
+            "sequence":"first",
+            "affiliation":[
+               
+            ]
+         }
+      ],
+      "member":"11225",
+      "published-online":{
+         "date-parts":[
+            [
+               2016,
+               5,
+               19
+            ]
+         ]
+      },
+      "container-title":[
+         "Ukra\u00efns\u02b9kij \u017eurnal medicini, b\u00ecolog\u00ec\u00ef ta sportu"
+      ],
+      "original-title":[
+         "\u0421\u0422\u0410\u041d \u041e\u0411\u0406\u0417\u041d\u0410\u041d\u041e\u0421\u0422\u0406 \u0421\u0422\u0423\u0414\u0415\u041d\u0422\u0406\u0412 \u041d\u041e\u0412\u041e\u041d\u0410\u0411\u0420\u0410\u041d\u0418\u0425 \u0413\u0420\u0423\u041f \u0427\u041e\u0420\u0422\u041a\u0406\u0412\u0421\u042c\u041a\u041e\u0413\u041e \u0414\u0415\u0420\u0416\u0410\u0412\u041d\u041e\u0413\u041e \u041c\u0415\u0414\u0418\u0427\u041d\u041e\u0413\u041e \u041a\u041e\u041b\u0415\u0414\u0416\u0423 \u0417 \u041f\u0418\u0422\u0410\u041d\u042c \u041f\u0420\u041e\u0424\u0406\u041b\u0410\u041a\u0422\u0418\u041a\u0418 \u0419\u041e\u0414\u041e\u0414\u0415\u0424\u0406\u0426\u0418\u0422\u041d\u0418\u0425 \u0417\u0410\u0425\u0412\u041e\u0420\u042e\u0412\u0410\u041d\u042c"
+      ],
+      "deposited":{
+         "date-parts":[
+            [
+               2017,
+               9,
+               8
+            ]
+         ],
+         "date-time":"2017-09-08T10:14:53Z",
+         "timestamp":1504865693000
+      },
+      "score":1,
+      "resource":{
+         "primary":{
+            "URL":"http:\/\/en.jmbs.com.ua\/archive\/1\/2\/184"
+         }
+      },
+      "subtitle":[
+         
+      ],
+      "short-title":[
+         
+      ],
+      "issued":{
+         "date-parts":[
+            [
+               2016,
+               5,
+               19
+            ]
+         ]
+      },
+      "references-count":0,
+      "journal-issue":{
+         "issue":"2",
+         "published-online":{
+            "date-parts":[
+               [
+                  2016,
+                  5,
+                  19
+               ]
+            ]
+         },
+         "published-print":{
+            "date-parts":[
+               [
+                  2016,
+                  5,
+                  19
+               ]
+            ]
+         }
+      },
+      "URL":"http:\/\/dx.doi.org\/10.26693\/jmbs01.02.184",
+      "relation":{
+         
+      },
+      "ISSN":[
+         "2415-3060"
+      ],
+      "issn-type":[
+         {
+            "value":"2415-3060",
+            "type":"print"
+         }
+      ],
+      "published":{
+         "date-parts":[
+            [
+               2016,
+               5,
+               19
+            ]
+         ]
+      }
+   }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/crossRef-test.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/crossRef-test.json
new file mode 100644
index 0000000000..69a9433868
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/crossRef-test.json
@@ -0,0 +1,309 @@
+{
+    "status": "ok",
+    "message-type": "work-list",
+    "message-version": "1.0.0",
+    "message": {
+        "facets": {},
+        "total-results": 10,
+        "items": [
+            {
+                "indexed": {
+                    "date-parts": [
+                        [
+                            2021,
+                            12,
+                            22
+                        ]
+                    ],
+                    "date-time": "2021-12-22T10:58:16Z",
+                    "timestamp": 1640170696598
+                },
+                "reference-count": 0,
+                "publisher": "Petro Mohyla Black Sea National University",
+                "issue": "2",
+                "content-domain": {
+                    "domain": [],
+                    "crossmark-restriction": false
+                },
+                "short-container-title": [
+                    "Ukr. ž. med. bìol. sportu"
+                ],
+                "published-print": {
+                    "date-parts": [
+                        [
+                            2016,
+                            5,
+                            19
+                        ]
+                    ]
+                },
+                "DOI": "10.26693/jmbs01.02.184",
+                "type": "journal-article",
+                "created": {
+                    "date-parts": [
+                        [
+                            2017,
+                            9,
+                            7
+                        ]
+                    ],
+                    "date-time": "2017-09-07T13:30:46Z",
+                    "timestamp": 1504791046000
+                },
+                "page": "184-187",
+                "source": "Crossref",
+                "is-referenced-by-count": 0,
+                "title": [
+                    "State of Awareness of Freshers’ Groups Chortkiv State Medical College of Prevention of Iodine Deficiency Diseases"
+                ],
+                "prefix": "10.26693",
+                "volume": "1",
+                "author": [
+                    {
+                        "given": "L.V.",
+                        "family": "Senyuk",
+                        "sequence": "first",
+                        "affiliation": []
+                    },
+                    {
+                        "name": "Chortkiv State Medical College 7, Gogola St., Chortkiv, Ternopil region 48500, Ukraine",
+                        "sequence": "first",
+                        "affiliation": []
+                    }
+                ],
+                "member": "11225",
+                "published-online": {
+                    "date-parts": [
+                        [
+                            2016,
+                            5,
+                            19
+                        ]
+                    ]
+                },
+                "container-title": [
+                    "Ukraïnsʹkij žurnal medicini, bìologìï ta sportu"
+                ],
+                "original-title": [
+                    "СТАН ОБІЗНАНОСТІ СТУДЕНТІВ НОВОНАБРАНИХ ГРУП ЧОРТКІВСЬКОГО ДЕРЖАВНОГО МЕДИЧНОГО КОЛЕДЖУ З ПИТАНЬ ПРОФІЛАКТИКИ ЙОДОДЕФІЦИТНИХ ЗАХВОРЮВАНЬ"
+                ],
+                "deposited": {
+                    "date-parts": [
+                        [
+                            2017,
+                            9,
+                            8
+                        ]
+                    ],
+                    "date-time": "2017-09-08T10:14:53Z",
+                    "timestamp": 1504865693000
+                },
+                "score": 22.728952,
+                "issued": {
+                    "date-parts": [
+                        [
+                            2016,
+                            5,
+                            19
+                        ]
+                    ]
+                },
+                "references-count": 0,
+                "journal-issue": {
+                    "issue": "2",
+                    "published-online": {
+                        "date-parts": [
+                            [
+                                2016,
+                                5,
+                                19
+                            ]
+                        ]
+                    },
+                    "published-print": {
+                        "date-parts": [
+                            [
+                                2016,
+                                5,
+                                19
+                            ]
+                        ]
+                    }
+                },
+                "URL": "http://dx.doi.org/10.26693/jmbs01.02.184",
+                "ISSN": [
+                    "2415-3060"
+                ],
+                "issn-type": [
+                    {
+                        "value": "2415-3060",
+                        "type": "print"
+                    }
+                ],
+                "published": {
+                    "date-parts": [
+                        [
+                            2016,
+                            5,
+                            19
+                        ]
+                    ]
+                }
+            },
+            {
+                "indexed": {
+                    "date-parts": [
+                        [
+                            2022,
+                            3,
+                            29
+                        ]
+                    ],
+                    "date-time": "2022-03-29T13:04:48Z",
+                    "timestamp": 1648559088439
+                },
+                "reference-count": 0,
+                "publisher": "Petro Mohyla Black Sea National University",
+                "issue": "2",
+                "content-domain": {
+                    "domain": [],
+                    "crossmark-restriction": false
+                },
+                "short-container-title": [
+                    "Ukr. ž. med. bìol. sportu"
+                ],
+                "published-print": {
+                    "date-parts": [
+                        [
+                            2016,
+                            5,
+                            19
+                        ]
+                    ]
+                },
+                "DOI": "10.26693/jmbs01.02.105",
+                "type": "journal-article",
+                "created": {
+                    "date-parts": [
+                        [
+                            2017,
+                            9,
+                            1
+                        ]
+                    ],
+                    "date-time": "2017-09-01T10:04:04Z",
+                    "timestamp": 1504260244000
+                },
+                "page": "105-108",
+                "source": "Crossref",
+                "is-referenced-by-count": 0,
+                "title": [
+                    "Ischemic Heart Disease and Role of Nurse of Cardiology Department"
+                ],
+                "prefix": "10.26693",
+                "volume": "1",
+                "author": [
+                    {
+                        "given": "K. І.",
+                        "family": "Kozak",
+                        "sequence": "first",
+                        "affiliation": []
+                    },
+                    {
+                        "name": "Chortkiv State Medical College 7, Gogola St., Chortkiv, Ternopil region 48500, Ukraine",
+                        "sequence": "first",
+                        "affiliation": []
+                    }
+                ],
+                "member": "11225",
+                "published-online": {
+                    "date-parts": [
+                        [
+                            2016,
+                            5,
+                            19
+                        ]
+                    ]
+                },
+                "container-title": [
+                    "Ukraïnsʹkij žurnal medicini, bìologìï ta sportu"
+                ],
+                "original-title": [
+                    "ІШЕМІЧНА ХВОРОБА СЕРЦЯ ТА РОЛЬ МЕДИЧНОЇ СЕСТРИ КАРДІОЛОГІЧНОГО ВІДДІЛЕННЯ"
+                ],
+                "deposited": {
+                    "date-parts": [
+                        [
+                            2017,
+                            9,
+                            2
+                        ]
+                    ],
+                    "date-time": "2017-09-02T12:36:15Z",
+                    "timestamp": 1504355775000
+                },
+                "score": 18.263277,
+                "resource": {
+                    "primary": {
+                        "URL": "http://en.jmbs.com.ua/archive/1/2/105"
+                    }
+                },
+                "issued": {
+                    "date-parts": [
+                        [
+                            2016,
+                            5,
+                            19
+                        ]
+                    ]
+                },
+                "references-count": 0,
+                "journal-issue": {
+                    "issue": "2",
+                    "published-online": {
+                        "date-parts": [
+                            [
+                                2016,
+                                5,
+                                19
+                            ]
+                        ]
+                    },
+                    "published-print": {
+                        "date-parts": [
+                            [
+                                2016,
+                                5,
+                                19
+                            ]
+                        ]
+                    }
+                },
+                "URL": "http://dx.doi.org/10.26693/jmbs01.02.105",
+                "ISSN": [
+                    "2415-3060"
+                ],
+                "issn-type": [
+                    {
+                        "value": "2415-3060",
+                        "type": "print"
+                    }
+                ],
+                "published": {
+                    "date-parts": [
+                        [
+                            2016,
+                            5,
+                            19
+                        ]
+                    ]
+                }
+            }
+        ],
+        "items-per-page": 2,
+        "query": {
+            "start-index": 0,
+            "search-terms": "chortkiv"
+        }
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/dataCite-test.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/dataCite-test.json
new file mode 100644
index 0000000000..8ede6f29a0
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/dataCite-test.json
@@ -0,0 +1 @@
+{"data":{"id":"10.48550/arxiv.2207.04779","type":"dois","attributes":{"doi":"10.48550/arxiv.2207.04779","prefix":"10.48550","suffix":"arxiv.2207.04779","identifiers":[{"identifier":"2207.04779","identifierType":"arXiv"}],"alternateIdentifiers":[{"alternateIdentifierType":"arXiv","alternateIdentifier":"2207.04779"}],"creators":[{"name":"Bayer, Jonas","nameType":"Personal","givenName":"Jonas","familyName":"Bayer","affiliation":[],"nameIdentifiers":[]},{"name":"Benzmüller, Christoph","nameType":"Personal","givenName":"Christoph","familyName":"Benzmüller","affiliation":[],"nameIdentifiers":[]},{"name":"Buzzard, Kevin","nameType":"Personal","givenName":"Kevin","familyName":"Buzzard","affiliation":[],"nameIdentifiers":[]},{"name":"David, Marco","nameType":"Personal","givenName":"Marco","familyName":"David","affiliation":[],"nameIdentifiers":[]},{"name":"Lamport, Leslie","nameType":"Personal","givenName":"Leslie","familyName":"Lamport","affiliation":[],"nameIdentifiers":[]},{"name":"Matiyasevich, Yuri","nameType":"Personal","givenName":"Yuri","familyName":"Matiyasevich","affiliation":[],"nameIdentifiers":[]},{"name":"Paulson, Lawrence","nameType":"Personal","givenName":"Lawrence","familyName":"Paulson","affiliation":[],"nameIdentifiers":[]},{"name":"Schleicher, Dierk","nameType":"Personal","givenName":"Dierk","familyName":"Schleicher","affiliation":[],"nameIdentifiers":[]},{"name":"Stock, Benedikt","nameType":"Personal","givenName":"Benedikt","familyName":"Stock","affiliation":[],"nameIdentifiers":[]},{"name":"Zelmanov, Efim","nameType":"Personal","givenName":"Efim","familyName":"Zelmanov","affiliation":[],"nameIdentifiers":[]}],"titles":[{"title":"Mathematical Proof Between Generations"}],"publisher":"arXiv","container":{},"publicationYear":2022,"subjects":[{"lang":"en","subject":"History and Overview (math.HO)","subjectScheme":"arXiv"},{"lang":"en","subject":"Logic in Computer Science (cs.LO)","subjectScheme":"arXiv"},{"subject":"FOS: Mathematics","subjectScheme":"Fields of Science and Technology (FOS)"},{"subject":"FOS: Mathematics","schemeUri":"http://www.oecd.org/science/inno/38235147.pdf","subjectScheme":"Fields of Science and Technology (FOS)"},{"subject":"FOS: Computer and information sciences","subjectScheme":"Fields of Science and Technology (FOS)"},{"subject":"FOS: Computer and information sciences","schemeUri":"http://www.oecd.org/science/inno/38235147.pdf","subjectScheme":"Fields of Science and Technology (FOS)"}],"contributors":[],"dates":[{"date":"2022-07-08T14:42:33Z","dateType":"Submitted","dateInformation":"v1"},{"date":"2022-07-13T00:14:24Z","dateType":"Updated","dateInformation":"v1"},{"date":"2022-07","dateType":"Available","dateInformation":"v1"},{"date":"2022","dateType":"Issued"}],"language":null,"types":{"ris":"GEN","bibtex":"misc","citeproc":"article","schemaOrg":"CreativeWork","resourceType":"Article","resourceTypeGeneral":"Preprint"},"relatedIdentifiers":[],"relatedItems":[],"sizes":[],"formats":[],"version":"1","rightsList":[{"rights":"arXiv.org perpetual, non-exclusive license","rightsUri":"http://arxiv.org/licenses/nonexclusive-distrib/1.0/"}],"descriptions":[{"description":"A proof is one of the most important concepts of mathematics. However, there is a striking difference between how a proof is defined in theory and how it is used in practice. This puts the unique status of mathematics as exact science into peril. Now may be the time to reconcile theory and practice, i.e. precision and intuition, through the advent of computer proof assistants. For the most time this has been a topic for experts in specialized communities. However, mathematical proofs have become increasingly sophisticated, stretching the boundaries of what is humanly comprehensible, so that leading mathematicians have asked for formal verification of their proofs. At the same time, major theorems in mathematics have recently been computer-verified by people from outside of these communities, even by beginning students. This article investigates the gap between the different definitions of a proof and possibilities to build bridges. It is written as a polemic or a collage by different members of the communities in mathematics and computer science at different stages of their careers, challenging well-known preconceptions and exploring new perspectives.","descriptionType":"Abstract"},{"description":"17 pages, 1 figure","descriptionType":"Other"}],"geoLocations":[],"fundingReferences":[],"xml":"PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC00LjMvbWV0YWRhdGEueHNkIj4KICA8aWRlbnRpZmllciBpZGVudGlmaWVyVHlwZT0iRE9JIj4xMC40ODU1MC9BUlhJVi4yMjA3LjA0Nzc5PC9pZGVudGlmaWVyPgogIDxhbHRlcm5hdGVJZGVudGlmaWVycz4KICAgIDxhbHRlcm5hdGVJZGVudGlmaWVyIGFsdGVybmF0ZUlkZW50aWZpZXJUeXBlPSJhclhpdiI+MjIwNy4wNDc3OTwvYWx0ZXJuYXRlSWRlbnRpZmllcj4KICA8L2FsdGVybmF0ZUlkZW50aWZpZXJzPgogIDxjcmVhdG9ycz4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5CYXllciwgSm9uYXM8L2NyZWF0b3JOYW1lPgogICAgICA8Z2l2ZW5OYW1lPkpvbmFzPC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPkJheWVyPC9mYW1pbHlOYW1lPgogICAgPC9jcmVhdG9yPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZSBuYW1lVHlwZT0iUGVyc29uYWwiPkJlbnptw7xsbGVyLCBDaHJpc3RvcGg8L2NyZWF0b3JOYW1lPgogICAgICA8Z2l2ZW5OYW1lPkNocmlzdG9waDwvZ2l2ZW5OYW1lPgogICAgICA8ZmFtaWx5TmFtZT5CZW56bcO8bGxlcjwvZmFtaWx5TmFtZT4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5CdXp6YXJkLCBLZXZpbjwvY3JlYXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+S2V2aW48L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+QnV6emFyZDwvZmFtaWx5TmFtZT4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5EYXZpZCwgTWFyY288L2NyZWF0b3JOYW1lPgogICAgICA8Z2l2ZW5OYW1lPk1hcmNvPC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPkRhdmlkPC9mYW1pbHlOYW1lPgogICAgPC9jcmVhdG9yPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZSBuYW1lVHlwZT0iUGVyc29uYWwiPkxhbXBvcnQsIExlc2xpZTwvY3JlYXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+TGVzbGllPC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPkxhbXBvcnQ8L2ZhbWlseU5hbWU+CiAgICA8L2NyZWF0b3I+CiAgICA8Y3JlYXRvcj4KICAgICAgPGNyZWF0b3JOYW1lIG5hbWVUeXBlPSJQZXJzb25hbCI+TWF0aXlhc2V2aWNoLCBZdXJpPC9jcmVhdG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5ZdXJpPC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPk1hdGl5YXNldmljaDwvZmFtaWx5TmFtZT4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5QYXVsc29uLCBMYXdyZW5jZTwvY3JlYXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+TGF3cmVuY2U8L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+UGF1bHNvbjwvZmFtaWx5TmFtZT4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5TY2hsZWljaGVyLCBEaWVyazwvY3JlYXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+RGllcms8L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+U2NobGVpY2hlcjwvZmFtaWx5TmFtZT4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5TdG9jaywgQmVuZWRpa3Q8L2NyZWF0b3JOYW1lPgogICAgICA8Z2l2ZW5OYW1lPkJlbmVkaWt0PC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPlN0b2NrPC9mYW1pbHlOYW1lPgogICAgPC9jcmVhdG9yPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZSBuYW1lVHlwZT0iUGVyc29uYWwiPlplbG1hbm92LCBFZmltPC9jcmVhdG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5FZmltPC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPlplbG1hbm92PC9mYW1pbHlOYW1lPgogICAgPC9jcmVhdG9yPgogIDwvY3JlYXRvcnM+CiAgPHRpdGxlcz4KICAgIDx0aXRsZT5NYXRoZW1hdGljYWwgUHJvb2YgQmV0d2VlbiBHZW5lcmF0aW9uczwvdGl0bGU+CiAgPC90aXRsZXM+CiAgPHB1Ymxpc2hlcj5hclhpdjwvcHVibGlzaGVyPgogIDxwdWJsaWNhdGlvblllYXI+MjAyMjwvcHVibGljYXRpb25ZZWFyPgogIDxzdWJqZWN0cz4KICAgIDxzdWJqZWN0IHhtbDpsYW5nPSJlbiIgc3ViamVjdFNjaGVtZT0iYXJYaXYiPkhpc3RvcnkgYW5kIE92ZXJ2aWV3IChtYXRoLkhPKTwvc3ViamVjdD4KICAgIDxzdWJqZWN0IHhtbDpsYW5nPSJlbiIgc3ViamVjdFNjaGVtZT0iYXJYaXYiPkxvZ2ljIGluIENvbXB1dGVyIFNjaWVuY2UgKGNzLkxPKTwvc3ViamVjdD4KICAgIDxzdWJqZWN0IHN1YmplY3RTY2hlbWU9IkZpZWxkcyBvZiBTY2llbmNlIGFuZCBUZWNobm9sb2d5IChGT1MpIj5GT1M6IE1hdGhlbWF0aWNzPC9zdWJqZWN0PgogICAgPHN1YmplY3Qgc3ViamVjdFNjaGVtZT0iRmllbGRzIG9mIFNjaWVuY2UgYW5kIFRlY2hub2xvZ3kgKEZPUykiPkZPUzogQ29tcHV0ZXIgYW5kIGluZm9ybWF0aW9uIHNjaWVuY2VzPC9zdWJqZWN0PgogIDwvc3ViamVjdHM+CiAgPGRhdGVzPgogICAgPGRhdGUgZGF0ZVR5cGU9IlN1Ym1pdHRlZCIgZGF0ZUluZm9ybWF0aW9uPSJ2MSI+MjAyMi0wNy0wOFQxNDo0MjozM1o8L2RhdGU+CiAgICA8ZGF0ZSBkYXRlVHlwZT0iVXBkYXRlZCIgZGF0ZUluZm9ybWF0aW9uPSJ2MSI+MjAyMi0wNy0xM1QwMDoxNDoyNFo8L2RhdGU+CiAgICA8ZGF0ZSBkYXRlVHlwZT0iQXZhaWxhYmxlIiBkYXRlSW5mb3JtYXRpb249InYxIj4yMDIyLTA3PC9kYXRlPgogIDwvZGF0ZXM+CiAgPHJlc291cmNlVHlwZSByZXNvdXJjZVR5cGVHZW5lcmFsPSJQcmVwcmludCI+QXJ0aWNsZTwvcmVzb3VyY2VUeXBlPgogIDx2ZXJzaW9uPjE8L3ZlcnNpb24+CiAgPHJpZ2h0c0xpc3Q+CiAgICA8cmlnaHRzIHJpZ2h0c1VSST0iaHR0cDovL2FyeGl2Lm9yZy9saWNlbnNlcy9ub25leGNsdXNpdmUtZGlzdHJpYi8xLjAvIj5hclhpdi5vcmcgcGVycGV0dWFsLCBub24tZXhjbHVzaXZlIGxpY2Vuc2U8L3JpZ2h0cz4KICA8L3JpZ2h0c0xpc3Q+CiAgPGRlc2NyaXB0aW9ucz4KICAgIDxkZXNjcmlwdGlvbiBkZXNjcmlwdGlvblR5cGU9IkFic3RyYWN0Ij5BIHByb29mIGlzIG9uZSBvZiB0aGUgbW9zdCBpbXBvcnRhbnQgY29uY2VwdHMgb2YgbWF0aGVtYXRpY3MuIEhvd2V2ZXIsIHRoZXJlIGlzIGEgc3RyaWtpbmcgZGlmZmVyZW5jZSBiZXR3ZWVuIGhvdyBhIHByb29mIGlzIGRlZmluZWQgaW4gdGhlb3J5IGFuZCBob3cgaXQgaXMgdXNlZCBpbiBwcmFjdGljZS4gVGhpcyBwdXRzIHRoZSB1bmlxdWUgc3RhdHVzIG9mIG1hdGhlbWF0aWNzIGFzIGV4YWN0IHNjaWVuY2UgaW50byBwZXJpbC4gTm93IG1heSBiZSB0aGUgdGltZSB0byByZWNvbmNpbGUgdGhlb3J5IGFuZCBwcmFjdGljZSwgaS5lLiBwcmVjaXNpb24gYW5kIGludHVpdGlvbiwgdGhyb3VnaCB0aGUgYWR2ZW50IG9mIGNvbXB1dGVyIHByb29mIGFzc2lzdGFudHMuIEZvciB0aGUgbW9zdCB0aW1lIHRoaXMgaGFzIGJlZW4gYSB0b3BpYyBmb3IgZXhwZXJ0cyBpbiBzcGVjaWFsaXplZCBjb21tdW5pdGllcy4gSG93ZXZlciwgbWF0aGVtYXRpY2FsIHByb29mcyBoYXZlIGJlY29tZSBpbmNyZWFzaW5nbHkgc29waGlzdGljYXRlZCwgc3RyZXRjaGluZyB0aGUgYm91bmRhcmllcyBvZiB3aGF0IGlzIGh1bWFubHkgY29tcHJlaGVuc2libGUsIHNvIHRoYXQgbGVhZGluZyBtYXRoZW1hdGljaWFucyBoYXZlIGFza2VkIGZvciBmb3JtYWwgdmVyaWZpY2F0aW9uIG9mIHRoZWlyIHByb29mcy4gQXQgdGhlIHNhbWUgdGltZSwgbWFqb3IgdGhlb3JlbXMgaW4gbWF0aGVtYXRpY3MgaGF2ZSByZWNlbnRseSBiZWVuIGNvbXB1dGVyLXZlcmlmaWVkIGJ5IHBlb3BsZSBmcm9tIG91dHNpZGUgb2YgdGhlc2UgY29tbXVuaXRpZXMsIGV2ZW4gYnkgYmVnaW5uaW5nIHN0dWRlbnRzLiBUaGlzIGFydGljbGUgaW52ZXN0aWdhdGVzIHRoZSBnYXAgYmV0d2VlbiB0aGUgZGlmZmVyZW50IGRlZmluaXRpb25zIG9mIGEgcHJvb2YgYW5kIHBvc3NpYmlsaXRpZXMgdG8gYnVpbGQgYnJpZGdlcy4gSXQgaXMgd3JpdHRlbiBhcyBhIHBvbGVtaWMgb3IgYSBjb2xsYWdlIGJ5IGRpZmZlcmVudCBtZW1iZXJzIG9mIHRoZSBjb21tdW5pdGllcyBpbiBtYXRoZW1hdGljcyBhbmQgY29tcHV0ZXIgc2NpZW5jZSBhdCBkaWZmZXJlbnQgc3RhZ2VzIG9mIHRoZWlyIGNhcmVlcnMsIGNoYWxsZW5naW5nIHdlbGwta25vd24gcHJlY29uY2VwdGlvbnMgYW5kIGV4cGxvcmluZyBuZXcgcGVyc3BlY3RpdmVzLjwvZGVzY3JpcHRpb24+CiAgICA8ZGVzY3JpcHRpb24gZGVzY3JpcHRpb25UeXBlPSJPdGhlciI+MTcgcGFnZXMsIDEgZmlndXJlPC9kZXNjcmlwdGlvbj4KICA8L2Rlc2NyaXB0aW9ucz4KPC9yZXNvdXJjZT4=","url":"https://arxiv.org/abs/2207.04779","contentUrl":null,"metadataVersion":1,"schemaVersion":"http://datacite.org/schema/kernel-4","source":"mds","isActive":true,"state":"findable","reason":null,"viewCount":0,"viewsOverTime":[],"downloadCount":0,"downloadsOverTime":[],"referenceCount":0,"citationCount":0,"citationsOverTime":[],"partCount":0,"partOfCount":0,"versionCount":0,"versionOfCount":0,"created":"2022-07-12T01:41:56.000Z","registered":"2022-07-12T01:41:57.000Z","published":"2022","updated":"2022-07-13T01:24:20.000Z"},"relationships":{"client":{"data":{"id":"arxiv.content","type":"clients"}},"provider":{"data":{"id":"arxiv","type":"providers"}},"media":{"data":{"id":"10.48550/arxiv.2207.04779","type":"media"}},"references":{"data":[]},"citations":{"data":[]},"parts":{"data":[]},"partOf":{"data":[]},"versions":{"data":[]},"versionOf":{"data":[]}}}}
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-first.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-first.xml
new file mode 100644
index 0000000000..2499552fc2
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-first.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="/3.2/style/exchange.xsl"?>
+<ops:world-patent-data xmlns="http://www.epo.org/exchange" xmlns:ops="http://ops.epo.org" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <exchange-documents>
+        <exchange-document system="ops.epo.org" family-id="58098534" country="ES" doc-number="2902749" kind="T3">
+            <bibliographic-data>
+                <publication-reference>
+                    <document-id document-id-type="docdb">
+                        <country>ES</country>
+                        <doc-number>2902749</doc-number>
+                        <kind>T3</kind>
+                        <date>20220329</date>
+                    </document-id>
+                    <document-id document-id-type="epodoc">
+                        <doc-number>ES2902749T</doc-number>
+                        <date>20220329</date>
+                    </document-id>
+                </publication-reference>
+                <classifications-ipcr>
+                    <classification-ipcr sequence="1">
+                        <text>G01N  33/   574            A I                    </text>
+                    </classification-ipcr>
+                </classifications-ipcr>
+                <patent-classifications>
+                    <patent-classification sequence="1">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>N</subclass>
+                        <main-group>33</main-group>
+                        <subgroup>57415</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="2">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>N</subclass>
+                        <main-group>33</main-group>
+                        <subgroup>57415</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>EP</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="3">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>N</subclass>
+                        <main-group>33</main-group>
+                        <subgroup>57484</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="4">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>N</subclass>
+                        <main-group>2800</main-group>
+                        <subgroup>54</subgroup>
+                        <classification-value>A</classification-value>
+                        <generating-office>EP</generating-office>
+                    </patent-classification>
+                </patent-classifications>
+                <application-reference doc-id="569851931">
+                    <document-id document-id-type="docdb">
+                        <country>ES</country>
+                        <doc-number>18705153</doc-number>
+                        <kind>T</kind>
+                    </document-id>
+                    <document-id document-id-type="epodoc">
+                        <doc-number>ES20180705153T</doc-number>
+                        <date>20180219</date>
+                    </document-id>
+                    <document-id document-id-type="original">
+                        <doc-number>18705153</doc-number>
+                    </document-id>
+                </application-reference>
+                <priority-claims>
+                    <priority-claim sequence="1" kind="regional">
+                        <document-id document-id-type="epodoc">
+                            <doc-number>EP20170157020</doc-number>
+                            <date>20170220</date>
+                        </document-id>
+                        <document-id document-id-type="original">
+                            <doc-number>17157020</doc-number>
+                        </document-id>
+                    </priority-claim>
+                    <priority-claim sequence="2" kind="national">
+                        <document-id document-id-type="epodoc">
+                            <doc-number>WO2018EP54052</doc-number>
+                            <date>20180219</date>
+                        </document-id>
+                        <document-id document-id-type="original">
+                            <doc-number>PCT/EP2018/054052</doc-number>
+                        </document-id>
+                    </priority-claim>
+                </priority-claims>
+                <parties>
+                    <applicants>
+                        <applicant sequence="1" data-format="epodoc">
+                            <applicant-name>
+                                <name>PANKA BLOOD TEST GMBH</name>
+                            </applicant-name>
+                        </applicant>
+                        <applicant sequence="1" data-format="original">
+                            <applicant-name>
+                                <name>Panka Blood Test GmbH</name>
+                            </applicant-name>
+                        </applicant>
+                    </applicants>
+                    <inventors>
+                        <inventor sequence="1" data-format="epodoc">
+                            <inventor-name>
+                                <name>PANTEL KLAUS</name>
+                            </inventor-name>
+                        </inventor>
+                        <inventor sequence="2" data-format="epodoc">
+                            <inventor-name>
+                                <name> BARTKOWIAK KAI</name>
+                            </inventor-name>
+                        </inventor>
+                        <inventor sequence="1" data-format="original">
+                            <inventor-name>
+                                <name>PANTEL, Klaus, </name>
+                            </inventor-name>
+                        </inventor>
+                        <inventor sequence="2" data-format="original">
+                            <inventor-name>
+                                <name>BARTKOWIAK, Kai</name>
+                            </inventor-name>
+                        </inventor>
+                    </inventors>
+                </parties>
+                <invention-title lang="ol">Método para el diagnóstico del cáncer de mama</invention-title>
+            </bibliographic-data>
+        </exchange-document>
+    </exchange-documents>
+</ops:world-patent-data>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-resp.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-resp.xml
new file mode 100644
index 0000000000..ab3a1ad102
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-resp.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/3.2/style/exchange.xsl"?>
+<ops:world-patent-data xmlns="http://www.epo.org/exchange" xmlns:ops="http://ops.epo.org" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <ops:biblio-search total-result-count="10000">
+        <ops:query syntax="CQL">txt = test</ops:query>
+        <ops:range begin="1" end="25"/>
+        <ops:search-result>
+            <ops:publication-reference system="ops.epo.org" family-id="58098534">
+                <document-id document-id-type="docdb">
+                    <country>ES</country>
+                    <doc-number>2902749</doc-number>
+                    <kind>T3</kind>
+                </document-id>
+            </ops:publication-reference>
+            <ops:publication-reference system="ops.epo.org" family-id="69192062">
+                <document-id document-id-type="docdb">
+                    <country>TW</country>
+                    <doc-number>202202864</doc-number>
+                    <kind>A</kind>
+                </document-id>
+            </ops:publication-reference>
+        </ops:search-result>
+    </ops:biblio-search>
+</ops:world-patent-data>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-second.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-second.xml
new file mode 100644
index 0000000000..c68724a527
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-second.xml
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/3.2/style/exchange.xsl"?>
+<ops:world-patent-data xmlns="http://www.epo.org/exchange" xmlns:ops="http://ops.epo.org" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <exchange-documents>
+        <exchange-document system="ops.epo.org" family-id="69192062" country="TW" doc-number="202202864" kind="A">
+            <bibliographic-data>
+                <publication-reference>
+                    <document-id document-id-type="docdb">
+                        <country>TW</country>
+                        <doc-number>202202864</doc-number>
+                        <kind>A</kind>
+                        <date>20220116</date>
+                    </document-id>
+                    <document-id document-id-type="epodoc">
+                        <doc-number>TW202202864</doc-number>
+                        <date>20220116</date>
+                    </document-id>
+                </publication-reference>
+                <classifications-ipcr>
+                    <classification-ipcr sequence="1">
+                        <text>G01R  31/   319            A I                    </text>
+                    </classification-ipcr>
+                    <classification-ipcr sequence="2">
+                        <text>G01R  31/  3193            A I                    </text>
+                    </classification-ipcr>
+                </classifications-ipcr>
+                <patent-classifications>
+                    <patent-classification sequence="1">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31712</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="2">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31712</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="3">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31713</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="4">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31713</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="5">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31724</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="6">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31724</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="7">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>3177</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="8">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>3177</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="9">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>318307</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="10">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>318307</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="11">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>318533</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="12">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>318533</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>EP</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="13">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31905</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="14">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31905</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="15">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31907</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="16">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31907</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="17">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31907</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>EP</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="18">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31908</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="19">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31908</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="20">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31919</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="21">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31919</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>EP</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="22">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31926</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="23">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31926</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="24">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31935</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="25">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>01</class>
+                        <subclass>R</subclass>
+                        <main-group>31</main-group>
+                        <subgroup>31935</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>EP</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="26">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>06</class>
+                        <subclass>F</subclass>
+                        <main-group>11</main-group>
+                        <subgroup>2733</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="27">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>06</class>
+                        <subclass>F</subclass>
+                        <main-group>11</main-group>
+                        <subgroup>2733</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="28">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>06</class>
+                        <subclass>F</subclass>
+                        <main-group>13</main-group>
+                        <subgroup>20</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>US</generating-office>
+                    </patent-classification>
+                    <patent-classification sequence="29">
+                        <classification-scheme office="EP" scheme="CPCI"/>
+                        <section>G</section>
+                        <class>06</class>
+                        <subclass>F</subclass>
+                        <main-group>13</main-group>
+                        <subgroup>20</subgroup>
+                        <classification-value>I</classification-value>
+                        <generating-office>KR</generating-office>
+                    </patent-classification>
+                </patent-classifications>
+                <application-reference doc-id="569750291">
+                    <document-id document-id-type="docdb">
+                        <country>TW</country>
+                        <doc-number>109122801</doc-number>
+                        <kind>A</kind>
+                    </document-id>
+                    <document-id document-id-type="epodoc">
+                        <doc-number>TW20200122801</doc-number>
+                        <date>20200706</date>
+                    </document-id>
+                    <document-id document-id-type="original">
+                        <doc-number>109122801</doc-number>
+                    </document-id>
+                </application-reference>
+                <priority-claims>
+                    <priority-claim sequence="1" kind="national">
+                        <document-id document-id-type="epodoc">
+                            <doc-number>US201962795456P</doc-number>
+                            <date>20190122</date>
+                        </document-id>
+                    </priority-claim>
+                    <priority-claim sequence="2" kind="national">
+                        <document-id document-id-type="epodoc">
+                            <doc-number>WO2020EP51540</doc-number>
+                            <date>20200122</date>
+                        </document-id>
+                        <document-id document-id-type="original">
+                            <doc-number>2020EP51540</doc-number>
+                        </document-id>
+                    </priority-claim>
+                </priority-claims>
+                <parties>
+                    <applicants>
+                        <applicant sequence="1" data-format="epodoc">
+                            <applicant-name>
+                                <name>ADVANTEST CORP [JP]</name>
+                            </applicant-name>
+                        </applicant>
+                        <applicant sequence="1" data-format="original">
+                            <applicant-name>
+                                <name>ADVANTEST CORPORATION</name>
+                            </applicant-name>
+                        </applicant>
+                    </applicants>
+                    <inventors>
+                        <inventor sequence="1" data-format="epodoc">
+                            <inventor-name>
+                                <name>POEPPE OLAF [DE]</name>
+                            </inventor-name>
+                        </inventor>
+                        <inventor sequence="2" data-format="epodoc">
+                            <inventor-name>
+                                <name> HILLIGES KLAUS-DIETER [DE]</name>
+                            </inventor-name>
+                        </inventor>
+                        <inventor sequence="3" data-format="epodoc">
+                            <inventor-name>
+                                <name> KRECH ALAN [US]</name>
+                            </inventor-name>
+                        </inventor>
+                        <inventor sequence="1" data-format="original">
+                            <inventor-name>
+                                <name>POEPPE, OLAF, </name>
+                            </inventor-name>
+                        </inventor>
+                        <inventor sequence="2" data-format="original">
+                            <inventor-name>
+                                <name>HILLIGES, KLAUS-DIETER, </name>
+                            </inventor-name>
+                        </inventor>
+                        <inventor sequence="3" data-format="original">
+                            <inventor-name>
+                                <name>KRECH, ALAN</name>
+                            </inventor-name>
+                        </inventor>
+                    </inventors>
+                </parties>
+                <invention-title lang="en">Automated test equipment for testing one or more devices under test, method for automated testing of one or more devices under test, and computer program using a buffer memory</invention-title>
+            </bibliographic-data>
+        </exchange-document>
+    </exchange-documents>
+</ops:world-patent-data>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-token.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-token.json
new file mode 100644
index 0000000000..466a8ebeda
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/epo-token.json
@@ -0,0 +1,18 @@
+{
+    "refresh_token_expires_in": "0",
+    "api_product_list": "[ops-prod]",
+    "api_product_list_json": [
+        "ops-prod"
+    ],
+    "organization_name": "epo",
+    "developer.email": "4science.it@gmail.com",
+    "token_type": "BearerToken",
+    "issued_at": "1649175500838",
+    "client_id": "7TzQLOPAbpDS5xwYhPwj22gbgNw0xHp2",
+    "access_token": "ek8VKPuuSwHmfGrjPM79iWVHcUea",
+    "application_name": "5aad89cd-a53b-417c-a585-7a7aa060c92e",
+    "scope": "core",
+    "expires_in": "1199",
+    "refresh_count": "0",
+    "status": "approved"
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/pubmedeurope-empty.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/pubmedeurope-empty.xml
new file mode 100644
index 0000000000..2c432eb832
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/pubmedeurope-empty.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<responseWrapper xmlns:slx="http://www.scholix.org" xmlns:epmc="https://www.europepmc.org/data">
+    <version>6.7</version>
+    <hitCount>0</hitCount>
+    <request>
+        <queryString>chortkiv&amp;cursorMar</queryString>
+        <resultType>core</resultType>
+        <cursorMark>*</cursorMark>
+        <pageSize>25</pageSize>
+        <sort></sort>
+        <synonym>false</synonym>
+    </request>
+    <resultList/>
+</responseWrapper>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/pubmedeurope-test.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/pubmedeurope-test.xml
new file mode 100644
index 0000000000..e1c4dfab4c
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/pubmedeurope-test.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<responseWrapper xmlns:slx="http://www.scholix.org" xmlns:epmc="https://www.europepmc.org/data">
+    <version>6.7</version>
+    <hitCount>3</hitCount>
+    <request>
+        <queryString>chortkiv</queryString>
+        <resultType>core</resultType>
+        <cursorMark>*</cursorMark>
+        <pageSize>25</pageSize>
+        <sort></sort>
+        <synonym>false</synonym>
+    </request>
+    <resultList>
+        <result>
+            <id>21733903</id>
+            <source>MED</source>
+            <pmid>21733903</pmid>
+            <pmcid>PMC3234553</pmcid>
+            <fullTextIdList>
+                <fullTextId>PMC3234553</fullTextId>
+            </fullTextIdList>
+            <doi>10.1098/rspb.2011.0943</doi>
+            <title>First record of preserved soft parts in a Palaeozoic podocopid (Metacopina) ostracod, Cytherellina submagna: phylogenetic implications.</title>
+            <authorString>Olempska E, Horne DJ, Szaniawski H.</authorString>
+            <authorList>
+                <author>
+                    <fullName>Olempska E</fullName>
+                    <firstName>E</firstName>
+                    <lastName>Olempska</lastName>
+                    <initials>E</initials>
+                    <authorId type="ORCID">0000-0003-0310-3876</authorId>
+                    <authorAffiliationDetailsList>
+                        <authorAffiliation>
+                            <affiliation>Institute of Paleobiology, Polish Academy of Sciences, 00-818 Warszawa, Poland. olempska@twarda.pan.pl</affiliation>
+                        </authorAffiliation>
+                    </authorAffiliationDetailsList>
+                </author>
+                <author>
+                    <fullName>Horne DJ</fullName>
+                    <firstName>D J</firstName>
+                    <lastName>Horne</lastName>
+                    <initials>DJ</initials>
+                    <authorId type="ORCID">0000-0002-2148-437X</authorId>
+                </author>
+                <author>
+                    <fullName>Szaniawski H</fullName>
+                    <firstName>H</firstName>
+                    <lastName>Szaniawski</lastName>
+                    <initials>H</initials>
+                </author>
+            </authorList>
+            <authorIdList>
+                <authorId type="ORCID">0000-0002-2148-437X</authorId>
+                <authorId type="ORCID">0000-0003-0310-3876</authorId>
+            </authorIdList>
+            <journalInfo>
+                <issue>1728</issue>
+                <volume>279</volume>
+                <journalIssueId>1890685</journalIssueId>
+                <dateOfPublication>2012 Feb</dateOfPublication>
+                <monthOfPublication>2</monthOfPublication>
+                <yearOfPublication>2012</yearOfPublication>
+                <printPublicationDate>2012-02-01</printPublicationDate>
+                <journal>
+                    <title>Proceedings. Biological sciences</title>
+                    <ISOAbbreviation>Proc Biol Sci</ISOAbbreviation>
+                    <medlineAbbreviation>Proc Biol Sci</medlineAbbreviation>
+                    <NLMid>101245157</NLMid>
+                    <ISSN>0962-8452</ISSN>
+                    <ESSN>1471-2954</ESSN>
+                </journal>
+            </journalInfo>
+            <pubYear>2012</pubYear>
+            <pageInfo>564-570</pageInfo>
+            <abstractText>The metacopines represent one of the oldest and most important extinct groups of ostracods, with a fossil record from the Mid-Ordovician to the Early Jurassic. Herein, we report the discovery of a representative of the group with three-dimensionally preserved soft parts. The specimen--a male of Cytherellina submagna--was found in the Early Devonian (416 Ma) of Podolia, Ukraine. A branchial plate (Bp) of the cephalic maxillula (Mx), a pair of thoracic appendages (walking legs), a presumed furca (Fu) and a copulatory organ are preserved. The material also includes phosphatized steinkerns with exceptionally preserved marginal pore canals and muscle scars. The morphology of the preserved limbs and valves of C. submagna suggests its relationship with extant Podocopida, particularly with the superfamilies Darwinuloidea and Sigillioidea, which have many similar characteristic features, including a large Bp on the Mx, the morphology of walking legs, Fu with two terminal claws, internal stop-teeth in the left valve, adductor muscle scar pattern, and a very narrow fused zone along the anterior and posterior margins. More precise determination of affinities will depend on the soft-part morphology of the cephalic segment, which has not been revealed in the present material.</abstractText>
+            <affiliation>Institute of Paleobiology, Polish Academy of Sciences, 00-818 Warszawa, Poland. olempska@twarda.pan.pl</affiliation>
+            <publicationStatus>ppublish</publicationStatus>
+            <language>eng</language>
+            <pubModel>Print-Electronic</pubModel>
+            <pubTypeList>
+                <pubType>Research Support, Non-U.S. Gov't</pubType>
+                <pubType>research-article</pubType>
+                <pubType>Journal Article</pubType>
+            </pubTypeList>
+            <meshHeadingList>
+                <meshHeading>
+                    <majorTopic_YN>N</majorTopic_YN>
+                    <descriptorName>Animals</descriptorName>
+                </meshHeading>
+                <meshHeading>
+                    <majorTopic_YN>N</majorTopic_YN>
+                    <descriptorName>Crustacea</descriptorName>
+                    <meshQualifierList>
+                        <meshQualifier>
+                            <abbreviation>AH</abbreviation>
+                            <qualifierName>anatomy &amp; histology</qualifierName>
+                            <majorTopic_YN>Y</majorTopic_YN>
+                        </meshQualifier>
+                        <meshQualifier>
+                            <abbreviation>CL</abbreviation>
+                            <qualifierName>classification</qualifierName>
+                            <majorTopic_YN>Y</majorTopic_YN>
+                        </meshQualifier>
+                    </meshQualifierList>
+                </meshHeading>
+                <meshHeading>
+                    <majorTopic_YN>Y</majorTopic_YN>
+                    <descriptorName>Phylogeny</descriptorName>
+                </meshHeading>
+                <meshHeading>
+                    <majorTopic_YN>Y</majorTopic_YN>
+                    <descriptorName>Fossils</descriptorName>
+                </meshHeading>
+                <meshHeading>
+                    <majorTopic_YN>N</majorTopic_YN>
+                    <descriptorName>Ukraine</descriptorName>
+                </meshHeading>
+                <meshHeading>
+                    <majorTopic_YN>N</majorTopic_YN>
+                    <descriptorName>Male</descriptorName>
+                </meshHeading>
+            </meshHeadingList>
+            <subsetList>
+                <subset>
+                    <code>IM</code>
+                    <name>Index Medicus</name>
+                </subset>
+            </subsetList>
+            <fullTextUrlList>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>pdf</documentStyle>
+                    <site>PubMedCentral</site>
+                    <url>https://www.ncbi.nlm.nih.gov/pmc/articles/pmid/21733903/pdf/?tool=EBI</url>
+                </fullTextUrl>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>html</documentStyle>
+                    <site>PubMedCentral</site>
+                    <url>https://www.ncbi.nlm.nih.gov/pmc/articles/pmid/21733903/?tool=EBI</url>
+                </fullTextUrl>
+                <fullTextUrl>
+                    <availability>Subscription required</availability>
+                    <availabilityCode>S</availabilityCode>
+                    <documentStyle>doi</documentStyle>
+                    <site>DOI</site>
+                    <url>https://doi.org/10.1098/rspb.2011.0943</url>
+                </fullTextUrl>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>html</documentStyle>
+                    <site>Europe_PMC</site>
+                    <url>https://europepmc.org/articles/PMC3234553</url>
+                </fullTextUrl>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>pdf</documentStyle>
+                    <site>Europe_PMC</site>
+                    <url>https://europepmc.org/articles/PMC3234553?pdf=render</url>
+                </fullTextUrl>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>doi</documentStyle>
+                    <site>DOI</site>
+                    <url>https://doi.org/10.1098/rspb.2011.0943</url>
+                </fullTextUrl>
+            </fullTextUrlList>
+            <isOpenAccess>N</isOpenAccess>
+            <inEPMC>Y</inEPMC>
+            <inPMC>Y</inPMC>
+            <hasPDF>Y</hasPDF>
+            <hasBook>N</hasBook>
+            <hasSuppl>N</hasSuppl>
+            <citedByCount>2</citedByCount>
+            <hasData>N</hasData>
+            <hasReferences>Y</hasReferences>
+            <hasTextMinedTerms>Y</hasTextMinedTerms>
+            <hasDbCrossReferences>N</hasDbCrossReferences>
+            <hasLabsLinks>N</hasLabsLinks>
+            <authMan>N</authMan>
+            <epmcAuthMan>N</epmcAuthMan>
+            <nihAuthMan>N</nihAuthMan>
+            <hasTMAccessionNumbers>N</hasTMAccessionNumbers>
+            <dateOfCompletion>2012-04-19</dateOfCompletion>
+            <dateOfCreation>2011-07-08</dateOfCreation>
+            <firstIndexDate>2011-07-08</firstIndexDate>
+            <fullTextReceivedDate>2020-07-11</fullTextReceivedDate>
+            <dateOfRevision>2021-10-20</dateOfRevision>
+            <electronicPublicationDate>2011-07-06</electronicPublicationDate>
+            <firstPublicationDate>2011-07-06</firstPublicationDate>
+        </result>
+        <result>
+            <id>UA37818</id>
+            <source>PAT</source>
+            <title>VODKA SYNEVIR</title>
+            <authorString>BARANOV VALENTYN VOLODYMYROVYC, DANCHAK ROMAN ADAMOVYCH, FEDORCHUK NATALIIA HRYHORIVNA, FEDOREIKO LIUBOV ROMANIVNA.</authorString>
+            <authorList>
+                <author>
+                    <fullName>BARANOV VALENTYN VOLODYMYROVYC</fullName>
+                    <lastName>BARANOV VALENTYN VOLODYMYROVYC</lastName>
+                </author>
+                <author>
+                    <fullName>DANCHAK ROMAN ADAMOVYCH</fullName>
+                    <lastName>DANCHAK ROMAN ADAMOVYCH</lastName>
+                </author>
+                <author>
+                    <fullName>FEDORCHUK NATALIIA HRYHORIVNA</fullName>
+                    <lastName>FEDORCHUK NATALIIA HRYHORIVNA</lastName>
+                </author>
+                <author>
+                    <fullName>FEDOREIKO LIUBOV ROMANIVNA</fullName>
+                    <lastName>FEDOREIKO LIUBOV ROMANIVNA</lastName>
+                </author>
+            </authorList>
+            <pubYear>2004</pubYear>
+            <abstractText>Vodka contains aqueous-alcoholic mixture, 65.8 % sugar syrup and apple vinegar. As a result the vodka has light taste without vodka acid and light apple aroma.</abstractText>
+            <affiliation>CHORTKIV DISTILLARY</affiliation>
+            <language>eng</language>
+            <pubTypeList>
+                <pubType>Patent</pubType>
+            </pubTypeList>
+            <patentDetails>
+                <countryCode>UA</countryCode>
+                <typeCode>C2</typeCode>
+                <classifierList>
+                    <classifier>
+                        <classification>C12G3/06</classification>
+                        <classificationType>IPC</classificationType>
+                        <hyperlink>http://www.cooperativepatentclassification.org/cpc/scheme/C/scheme-C12G.pdf</hyperlink>
+                    </classifier>
+                </classifierList>
+                <application>
+                    <applicationNumber>UA20000042245</applicationNumber>
+                    <applicationDate>2000-04-19</applicationDate>
+                    <orderIn>0</orderIn>
+                </application>
+                <priorityList>
+                    <priority>
+                        <priorityNumber>UA20000042245</priorityNumber>
+                        <priorityDate>2000-04-19</priorityDate>
+                        <orderIn>1</orderIn>
+                    </priority>
+                </priorityList>
+            </patentDetails>
+            <fullTextUrlList>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>html</documentStyle>
+                    <site>SureChembl</site>
+                    <url>https://www.surechembl.org/document/UA-37818-U</url>
+                </fullTextUrl>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>html</documentStyle>
+                    <site>EPO</site>
+                    <url>http://v3.espacenet.com/textdoc?DB=EPODOC&amp;IDX=UA37818</url>
+                </fullTextUrl>
+            </fullTextUrlList>
+            <isOpenAccess>N</isOpenAccess>
+            <inEPMC>N</inEPMC>
+            <inPMC>N</inPMC>
+            <hasPDF>N</hasPDF>
+            <hasBook>N</hasBook>
+            <hasSuppl>N</hasSuppl>
+            <citedByCount>0</citedByCount>
+            <hasData>N</hasData>
+            <hasReferences>N</hasReferences>
+            <hasTextMinedTerms>Y</hasTextMinedTerms>
+            <hasDbCrossReferences>N</hasDbCrossReferences>
+            <hasLabsLinks>N</hasLabsLinks>
+            <authMan>N</authMan>
+            <epmcAuthMan>N</epmcAuthMan>
+            <nihAuthMan>N</nihAuthMan>
+            <hasTMAccessionNumbers>N</hasTMAccessionNumbers>
+            <dateOfCompletion>2004-12-15</dateOfCompletion>
+            <dateOfCreation>2000-04-19</dateOfCreation>
+            <firstIndexDate>2010-11-01</firstIndexDate>
+            <firstPublicationDate>2000-04-19</firstPublicationDate>
+        </result>
+        <result>
+            <id>UA37954</id>
+            <source>PAT</source>
+            <title>A VODKA CHARKA</title>
+            <authorString>BARANOV VALENTYN VOLODYMYROVYC, DANCHAK ROMAN ADAMOVYCH, FEDORCHUK NATALIIA HRYHORIVNA, FEDOREIKO LIUBOV ROMANIVNA.</authorString>
+            <authorList>
+                <author>
+                    <fullName>BARANOV VALENTYN VOLODYMYROVYC</fullName>
+                    <lastName>BARANOV VALENTYN VOLODYMYROVYC</lastName>
+                </author>
+                <author>
+                    <fullName>DANCHAK ROMAN ADAMOVYCH</fullName>
+                    <lastName>DANCHAK ROMAN ADAMOVYCH</lastName>
+                </author>
+                <author>
+                    <fullName>FEDORCHUK NATALIIA HRYHORIVNA</fullName>
+                    <lastName>FEDORCHUK NATALIIA HRYHORIVNA</lastName>
+                </author>
+                <author>
+                    <fullName>FEDOREIKO LIUBOV ROMANIVNA</fullName>
+                    <lastName>FEDOREIKO LIUBOV ROMANIVNA</lastName>
+                </author>
+            </authorList>
+            <pubYear>2005</pubYear>
+            <abstractText>The invention relates to food industry, and particularly to liqueur and vodka industry, to vodkas compositions. The aim of this invention is producing vodka with high organoleptic indices, and particularly soft taste without vodka bitterness and without vodka aroma, and high biological properties, by selection of necessary ingredients at required quantities. Ingredients ratio at 100 l of finished drink: Carbohydrate module ôAlkosoftö, l 0.07-0.13Citric oil, kg 0,0015-0,0025 Aqueous-alcoholic mixture as calculated per strength of 40% of volume rest. Technical result - preparation of the vodka of given composition with a strength of 40% of volume, which is transparent, colorless, has mild taste without vodka bitterness and without strong vodka aroma which will not cause alcohol withdrawal syndrome and high charge on the body.</abstractText>
+            <affiliation>CHORTKIV DISTILLARY</affiliation>
+            <language>eng</language>
+            <pubTypeList>
+                <pubType>Patent</pubType>
+            </pubTypeList>
+            <patentDetails>
+                <countryCode>UA</countryCode>
+                <typeCode>C2</typeCode>
+                <classifierList>
+                    <classifier>
+                        <classification>C12G3/06</classification>
+                        <classificationType>IPC</classificationType>
+                        <hyperlink>http://www.cooperativepatentclassification.org/cpc/scheme/C/scheme-C12G.pdf</hyperlink>
+                    </classifier>
+                </classifierList>
+                <application>
+                    <applicationNumber>UA20000052634</applicationNumber>
+                    <applicationDate>2000-05-10</applicationDate>
+                    <orderIn>0</orderIn>
+                </application>
+                <priorityList>
+                    <priority>
+                        <priorityNumber>UA20000052634</priorityNumber>
+                        <priorityDate>2000-05-10</priorityDate>
+                        <orderIn>1</orderIn>
+                    </priority>
+                </priorityList>
+            </patentDetails>
+            <fullTextUrlList>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>html</documentStyle>
+                    <site>SureChembl</site>
+                    <url>https://www.surechembl.org/document/UA-37954-U</url>
+                </fullTextUrl>
+                <fullTextUrl>
+                    <availability>Free</availability>
+                    <availabilityCode>F</availabilityCode>
+                    <documentStyle>html</documentStyle>
+                    <site>EPO</site>
+                    <url>http://v3.espacenet.com/textdoc?DB=EPODOC&amp;IDX=UA37954</url>
+                </fullTextUrl>
+            </fullTextUrlList>
+            <isOpenAccess>N</isOpenAccess>
+            <inEPMC>N</inEPMC>
+            <inPMC>N</inPMC>
+            <hasPDF>N</hasPDF>
+            <hasBook>N</hasBook>
+            <hasSuppl>N</hasSuppl>
+            <citedByCount>0</citedByCount>
+            <hasData>N</hasData>
+            <hasReferences>N</hasReferences>
+            <hasTextMinedTerms>Y</hasTextMinedTerms>
+            <hasDbCrossReferences>N</hasDbCrossReferences>
+            <hasLabsLinks>N</hasLabsLinks>
+            <authMan>N</authMan>
+            <epmcAuthMan>N</epmcAuthMan>
+            <nihAuthMan>N</nihAuthMan>
+            <hasTMAccessionNumbers>N</hasTMAccessionNumbers>
+            <dateOfCompletion>2005-02-15</dateOfCompletion>
+            <dateOfCreation>2000-05-10</dateOfCreation>
+            <firstIndexDate>2010-10-18</firstIndexDate>
+            <firstPublicationDate>2000-05-10</firstPublicationDate>
+        </result>
+    </resultList>
+</responseWrapper>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scielo-single-record.txt b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scielo-single-record.txt
new file mode 100644
index 0000000000..bd9934d2bc
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scielo-single-record.txt
@@ -0,0 +1,24 @@
+TY  - JOUR
+AU  - Torres Marzo, Ricardo
+TI  - Requena Jiménez, Miguel, Los espacios de la muerte en Roma, Madrid, Síntesis, 2021, 365 págs. más bibliografía en línea, ISBN 978-84-135759-6-4.
+JO  - Nova tellus
+J2  - Nova tellus
+SN  - 0185-3058
+VL  - 39
+IS  - 2
+DO  - 10.19130/iifl.nt.2021.39.2.901
+DB  - SciELO México
+DP  - http://www.scielo.org/
+ID  - S0185-30582021000200231-mex
+LA  - es
+SP  - 231
+EP  - 236
+DA  - 2021-12
+PY  - 2021
+UR  - http://www.scielo.org.mx/scielo.php?script=sci_arttext&pid=S0185-30582021000200231&lang=pt
+KW  - Roma
+KW  - Historia
+KW  - ritos funerarios
+KW  - inframundo
+KW  - epitafios
+ER  -
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scielo-test.txt b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scielo-test.txt
new file mode 100644
index 0000000000..4cc9d3ad36
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scielo-test.txt
@@ -0,0 +1,51 @@
+TY  - JOUR
+AU  - Torres Marzo, Ricardo
+TI  - Requena Jiménez, Miguel, Los espacios de la muerte en Roma, Madrid, Síntesis, 2021, 365 págs. más bibliografía en línea, ISBN 978-84-135759-6-4.
+JO  - Nova tellus
+J2  - Nova tellus
+SN  - 0185-3058
+VL  - 39
+IS  - 2
+DO  - 10.19130/iifl.nt.2021.39.2.901
+DB  - SciELO México
+DP  - http://www.scielo.org/
+ID  - S0185-30582021000200231-mex
+LA  - es
+SP  - 231
+EP  - 236
+DA  - 2021-12
+PY  - 2021
+UR  - http://www.scielo.org.mx/scielo.php?script=sci_arttext&pid=S0185-30582021000200231&lang=pt
+KW  - Roma
+KW  - Historia
+KW  - ritos funerarios
+KW  - inframundo
+KW  - epitafios
+ER  -
+
+TY  - JOUR
+AU  - MAGRI, GEO
+TI  - Rinegoziazione e revisione del contratto. Tribunale di Roma, Sez. VI, 27 agosto 2020
+JO  - Revista de Derecho Privado
+J2  - Rev. Derecho Privado
+SN  - 0123-4366
+VL  - 
+IS  - 41
+DO  - 10.18601/01234366.n41.14
+DB  - SciELO Colômbia
+DP  - http://www.scielo.org/
+ID  - S0123-43662021000200397-col
+LA  - it
+SP  - 397
+EP  - 418
+DA  - 2021-12
+PY  - 2021
+AB  - ABSTRACT: The Tribunal of Rome imposes an obligation to renegotiate long-term contracts, the balance of which has been modified by the covro pandemic. The decision establishes a general obligation for the parties to execute the contract in good faith and gives the judge the possibility of a judicial review. This is a long-awaited decision in doctrine which complies with the indications of the Supreme Court of Cassation expressed in its memorandum 56/2020.
+UR  - http://www.scielo.org.co/scielo.php?script=sci_arttext&pid=S0123-43662021000200397&lang=pt
+L1  - http://www.scielo.org.co/pdf/rdp/n41/0123-4366-rdp-41-397.pdf
+KW  - sopravvenienza contrattuale
+KW  - covro
+KW  - buona fede in senso oggettivo
+KW  - obbligo di rinegoziare
+KW  - revisione del contratto
+ER  -
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scopus-empty-resp.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scopus-empty-resp.xml
new file mode 100644
index 0000000000..b2b4264b5c
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scopus-empty-resp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<search-results xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:prism="http://prismstandard.org/namespaces/basic/2.0/" xmlns:atom="http://www.w3.org/2005/Atom">
+    <opensearch:totalResults>0</opensearch:totalResults>
+    <opensearch:startIndex>0</opensearch:startIndex>
+    <opensearch:itemsPerPage>0</opensearch:itemsPerPage>
+    <opensearch:Query role="request" searchTerms="(probizna)" startPage="0"/>
+    <link ref="self" href="https://api.elsevier.com/content/search/scopus?start=0&amp;count=2&amp;query=%28testemptyresp%29&amp;view=COMPLETE" type="application/xml"/>
+    <entry>
+        <error>Result set was empty</error>
+    </entry>
+</search-results>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scopus-ex.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scopus-ex.xml
new file mode 100644
index 0000000000..cd50281f38
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/scopus-ex.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<search-results xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:prism="http://prismstandard.org/namespaces/basic/2.0/" xmlns:atom="http://www.w3.org/2005/Atom">
+    <opensearch:totalResults>2</opensearch:totalResults>
+    <opensearch:startIndex>0</opensearch:startIndex>
+    <opensearch:itemsPerPage>2</opensearch:itemsPerPage>
+    <opensearch:Query role="request" searchTerms="(roma)" startPage="0"/>
+    <link ref="self" href="https://api.elsevier.com/content/search/scopus?start=0&amp;count=2&amp;query=%28roma%29&amp;view=COMPLETE" type="application/xml"/>
+    <link ref="first" href="https://api.elsevier.com/content/search/scopus?start=0&amp;count=2&amp;query=%28roma%29&amp;view=COMPLETE" type="application/xml"/>
+    <link ref="next" href="https://api.elsevier.com/content/search/scopus?start=2&amp;count=2&amp;query=%28roma%29&amp;view=COMPLETE" type="application/xml"/>
+    <link ref="last" href="https://api.elsevier.com/content/search/scopus?start=4998&amp;count=2&amp;query=%28roma%29&amp;view=COMPLETE" type="application/xml"/>
+    <entry>
+        <link ref="self" href="https://api.elsevier.com/content/abstract/scopus_id/85124241875"/>
+        <link ref="author-affiliation" href="https://api.elsevier.com/content/abstract/scopus_id/85124241875?field=author,affiliation"/>
+        <link ref="scopus" href="https://www.scopus.com/inward/record.uri?partnerID=xxxxxxx&amp;scp=85124241875&amp;origin=inward"/>
+        <link ref="scopus-citedby" href="https://www.scopus.com/inward/citedby.uri?partnerID=xxxxxxx&amp;scp=85124241875&amp;origin=inward"/>
+        <prism:url>https://api.elsevier.com/content/abstract/scopus_id/85124241875</prism:url>
+        <dc:identifier>SCOPUS_ID:85124241875</dc:identifier>
+        <eid>2-s2.0-85124241875</eid>
+        <dc:title>Hardy potential versus lower order terms in Dirichlet problems: regularizing effects&lt;sup&gt;†&lt;/sup&gt;</dc:title>
+        <dc:creator>Arcoya D.</dc:creator>
+        <prism:publicationName>Mathematics In Engineering</prism:publicationName>
+        <prism:eIssn>26403501</prism:eIssn>
+        <prism:volume>5</prism:volume>
+        <prism:issueIdentifier>1</prism:issueIdentifier>
+        <prism:pageRange/>
+        <prism:coverDate>2023-01-01</prism:coverDate>
+        <prism:coverDisplayDate>2023</prism:coverDisplayDate>
+        <prism:doi>10.3934/mine.2023004</prism:doi>
+        <citedby-count>0</citedby-count>
+        <affiliation>
+            <affiliation-url>https://api.elsevier.com/content/affiliation/affiliation_id/60032350</affiliation-url>
+            <afid>60032350</afid>
+            <affilname>Sapienza Università di Roma</affilname>
+            <affiliation-city>Rome</affiliation-city>
+            <affiliation-country>Italy</affiliation-country>
+        </affiliation>
+        <affiliation>
+            <affiliation-url>https://api.elsevier.com/content/affiliation/affiliation_id/60027844</affiliation-url>
+            <afid>60027844</afid>
+            <affilname>Universidad de Granada</affilname>
+            <affiliation-city>Granada</affiliation-city>
+            <affiliation-country>Spain</affiliation-country>
+        </affiliation>
+        <prism:aggregationType>Journal</prism:aggregationType>
+        <subtype>ar</subtype>
+        <subtypeDescription>Article</subtypeDescription>
+        <author-count limit="100" total="3">3</author-count>
+        <author seq="1">
+            <author-url>https://api.elsevier.com/content/author/author_id/6602330574</author-url>
+            <authid>6602330574</authid>
+            <authname>Arcoya D.</authname>
+            <surname>Arcoya</surname>
+            <given-name>David</given-name>
+            <initials>D.</initials>
+            <afid>60027844</afid>
+        </author>
+        <author seq="2">
+            <author-url>https://api.elsevier.com/content/author/author_id/7003612261</author-url>
+            <authid>7003612261</authid>
+            <authname>Boccardo L.</authname>
+            <surname>Boccardo</surname>
+            <given-name>Lucio</given-name>
+            <initials>L.</initials>
+            <afid>60032350</afid>
+        </author>
+        <author seq="3">
+            <author-url>https://api.elsevier.com/content/author/author_id/6602595438</author-url>
+            <authid>6602595438</authid>
+            <authname>Orsina L.</authname>
+            <surname>Orsina</surname>
+            <given-name>Luigi</given-name>
+            <initials>L.</initials>
+            <afid>60032350</afid>
+        </author>
+        <authkeywords>Hardy potentials | Laplace equation | Summability of solutions</authkeywords>
+        <source-id>21101039848</source-id>
+        <fund-no>PGC2018-096422-B-I00</fund-no>
+        <fund-sponsor>Junta de Andalucía</fund-sponsor>
+        <openaccess>1</openaccess>
+        <openaccessFlag>true</openaccessFlag>
+        <freetoread>
+            <value>all</value>
+            <value>publisherfullgold</value>
+            <value>repository</value>
+            <value>repositoryvor</value>
+        </freetoread>
+        <freetoreadLabel>
+            <value>All Open Access</value>
+            <value>Gold</value>
+            <value>Green</value>
+        </freetoreadLabel>
+    </entry>
+    <entry>
+        <link ref="self" href="https://api.elsevier.com/content/abstract/scopus_id/85124226483"/>
+        <link ref="author-affiliation" href="https://api.elsevier.com/content/abstract/scopus_id/85124226483?field=author,affiliation"/>
+        <link ref="scopus" href="https://www.scopus.com/inward/record.uri?partnerID=xxxxxxx&amp;scp=85124226483&amp;origin=inward"/>
+        <link ref="scopus-citedby" href="https://www.scopus.com/inward/citedby.uri?partnerID=xxxxxxx&amp;scp=85124226483&amp;origin=inward"/>
+        <prism:url>https://api.elsevier.com/content/abstract/scopus_id/85124226483</prism:url>
+        <dc:identifier>SCOPUS_ID:85124226483</dc:identifier>
+        <eid>2-s2.0-85124226483</eid>
+        <dc:title>Large deviations for a binary collision model: energy evaporation&lt;sup&gt;†&lt;/sup&gt;</dc:title>
+        <dc:creator>Basile G.</dc:creator>
+        <prism:publicationName>Mathematics In Engineering</prism:publicationName>
+        <prism:eIssn>26403501</prism:eIssn>
+        <prism:volume>5</prism:volume>
+        <prism:issueIdentifier>1</prism:issueIdentifier>
+        <prism:pageRange/>
+        <prism:coverDate>2023-01-01</prism:coverDate>
+        <prism:coverDisplayDate>2023</prism:coverDisplayDate>
+        <prism:doi>10.3934/mine.2023001</prism:doi>
+        <citedby-count>0</citedby-count>
+        <affiliation>
+            <affiliation-url>https://api.elsevier.com/content/affiliation/affiliation_id/60032350</affiliation-url>
+            <afid>60032350</afid>
+            <affilname>Sapienza Università di Roma</affilname>
+            <affiliation-city>Rome</affiliation-city>
+            <affiliation-country>Italy</affiliation-country>
+        </affiliation>
+        <prism:aggregationType>Journal</prism:aggregationType>
+        <subtype>ar</subtype>
+        <subtypeDescription>Article</subtypeDescription>
+        <author-count limit="100" total="4">4</author-count>
+        <author seq="1">
+            <author-url>https://api.elsevier.com/content/author/author_id/55613229065</author-url>
+            <authid>55613229065</authid>
+            <authname>Basile G.</authname>
+            <surname>Basile</surname>
+            <given-name>Giada</given-name>
+            <initials>G.</initials>
+            <afid>60032350</afid>
+        </author>
+        <author seq="2">
+            <author-url>https://api.elsevier.com/content/author/author_id/55893665100</author-url>
+            <authid>55893665100</authid>
+            <authname>Benedetto D.</authname>
+            <surname>Benedetto</surname>
+            <given-name>Dario</given-name>
+            <initials>D.</initials>
+            <afid>60032350</afid>
+        </author>
+        <author seq="3">
+            <author-url>https://api.elsevier.com/content/author/author_id/7004588675</author-url>
+            <authid>7004588675</authid>
+            <authname>Caglioti E.</authname>
+            <surname>Caglioti</surname>
+            <given-name>Emanuele</given-name>
+            <initials>E.</initials>
+            <afid>60032350</afid>
+        </author>
+        <author seq="4">
+            <author-url>https://api.elsevier.com/content/author/author_id/7005555198</author-url>
+            <authid>7005555198</authid>
+            <authname>Bertini L.</authname>
+            <surname>Bertini</surname>
+            <given-name>Lorenzo</given-name>
+            <initials>L.</initials>
+            <afid>60032350</afid>
+        </author>
+        <authkeywords>Boltzmann equation | Discrete energy model | Kac model | Large deviations | Violation of energy conservation</authkeywords>
+        <source-id>21101039848</source-id>
+        <fund-no>undefined</fund-no>
+        <openaccess>1</openaccess>
+        <openaccessFlag>true</openaccessFlag>
+        <freetoread>
+            <value>all</value>
+            <value>publisherfullgold</value>
+            <value>repository</value>
+            <value>repositoryam</value>
+        </freetoread>
+        <freetoreadLabel>
+            <value>All Open Access</value>
+            <value>Gold</value>
+            <value>Green</value>
+        </freetoreadLabel>
+    </entry>
+</search-results>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/vuFind-by-id.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/vuFind-by-id.json
new file mode 100644
index 0000000000..c992ea5f57
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/vuFind-by-id.json
@@ -0,0 +1,44 @@
+{
+    "resultCount": 1,
+    "records": [
+        {
+            "authors": {
+                "primary": [],
+                "secondary": {
+                    "Carettoni, Gianfilippo.": []
+                },
+                "corporate": []
+            },
+            "formats": [
+                "Map",
+                "Map",
+                "Book"
+            ],
+            "id": "653510",
+            "languages": [
+                "Italian"
+            ],
+            "series": [],
+            "subjects": [
+                [
+                    "Rome (Italy)",
+                    "Maps",
+                    "Early works to 1800."
+                ],
+                [
+                    "Rome (Italy)",
+                    "Antiquities",
+                    "Maps."
+                ]
+            ],
+            "title": "La pianta marmorea di Roma antica: Forma urbis Romae /",
+            "urls": [
+                            {
+                    "url": "http://hdl.handle.net/20.500.12390/231",
+                    "desc": "http://hdl.handle.net/20.500.12390/231"
+                }
+                ]
+        }
+    ],
+    "status": "OK"
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/vuFind-generic.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/vuFind-generic.json
new file mode 100644
index 0000000000..889ec89016
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/vuFind-generic.json
@@ -0,0 +1,82 @@
+{
+    "resultCount": 1994,
+    "records": [
+        {
+            "authors": {
+                "primary": [],
+                "secondary": {
+                    "Carettoni, Gianfilippo.": []
+                },
+                "corporate": []
+            },
+            "formats": [
+                "Map",
+                "Map",
+                "Book"
+            ],
+            "id": "653510",
+            "languages": [
+                "Italian"
+            ],
+            "series": [],
+            "subjects": [
+                [
+                    "Rome (Italy)",
+                    "Maps",
+                    "Early works to 1800."
+                ],
+                [
+                    "Rome (Italy)",
+                    "Antiquities",
+                    "Maps."
+                ]
+            ],
+            "title": "La pianta marmorea di Roma antica: Forma urbis Romae /",
+            "urls": [
+                {
+                    "url": "http://hdl.handle.net/20.500.12390/231",
+                    "desc": "http://hdl.handle.net/20.500.12390/231"
+                }
+                ]
+        },
+        {
+            "authors": {
+                "primary": {
+                    "Surdu, Mihai.": []
+                },
+                "secondary": [],
+                "corporate": []
+            },
+            "formats": [
+                "Online",
+                "Book"
+            ],
+            "id": "1665326",
+            "languages": [
+                "English"
+            ],
+            "series": [],
+            "subjects": [
+                [
+                    "Public opinion",
+                    "Europe."
+                ],
+                [
+                    "Stereotypes (Social psychology)"
+                ],
+                [
+                    "Romanies",
+                    "Public opinion."
+                ]
+            ],
+            "title": "Expert frames : scientific and policy practices of Roma classification /",
+            "urls": [
+                {
+                    "url": "http://ezproxy.villanova.edu/login?URL=http://www.jstor.org/stable/10.7829/j.ctt1ggjj08",
+                    "desc": "http://ezproxy.villanova.edu/login?URL=http://www.jstor.org/stable/10.7829/j.ctt1ggjj08"
+                }
+            ]
+        }
+    ],
+    "status": "OK"
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/wos-responce.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/wos-responce.xml
new file mode 100644
index 0000000000..a961a11c40
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/wos-responce.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response xmlns="http://www.isinet.com/xrpc42">
+    <map>
+        <map name="Data">
+            <val name="Records">
+                <![CDATA[<records><REC r_id_disclaimer="ResearcherID data provided by Clarivate Analytics"><UID>WOS:000805105200003</UID><static_data><summary><EWUID><WUID coll_id="WOS" /><edition value="WOS.SSCI" /></EWUID><pub_info sortdate="2022-06-02" pubyear="2022" early_access_month="06" early_access_year="2022" early_access_date="JUN 2022" has_abstract="Y" has_citation_context="Y" coverdate="" pubmonth="JUN 2" pubtype="Journal" journal_oas_gold="N"><page page_count="33" /></pub_info><titles count="6"><title type="source">ETR&amp;D-EDUCATIONAL TECHNOLOGY RESEARCH AND DEVELOPMENT</title><title type="source_abbrev">ETR&amp;D-EDUC TECH RES</title><title type="abbrev_iso">ETR&amp;D-Educ. Tech. Res. Dev.</title><title type="abbrev_11">ETR&amp;D</title><title type="abbrev_29">ETR&amp;D-EDUC TECHNOL RES DEV</title><title type="item">Preservice science teachers coding science simulations: epistemological understanding, coding skills, and lesson design</title></titles><names count="2"><name seq_no="1" role="author" reprint="Y" addr_no="1"><display_name>Vasconcelos, Lucas</display_name><full_name>Vasconcelos, Lucas</full_name><wos_standard>Vasconcelos, L</wos_standard><first_name>Lucas</first_name><last_name>Vasconcelos</last_name></name><name seq_no="2" role="author" addr_no="2"><display_name>Kim, ChanMin</display_name><full_name>Kim, ChanMin</full_name><wos_standard>Kim, C</wos_standard><first_name>ChanMin</first_name><last_name>Kim</last_name></name></names><doctypes count="2"><doctype>Article</doctype><doctype>Early Access</doctype></doctypes><publishers><publisher><address_spec addr_no="1"><full_address>ONE NEW YORK PLAZA, SUITE 4600, NEW YORK, NY, UNITED STATES</full_address><city>NEW YORK</city></address_spec><names count="1"><name role="publisher" seq_no="1" addr_no="1"><display_name>SPRINGER</display_name><full_name>SPRINGER</full_name><unified_name>Springer Nature</unified_name></name></names></publisher></publishers></summary><fullrecord_metadata><languages count="1"><language type="primary">English</language></languages><normalized_languages count="1"><language type="primary">English</language></normalized_languages><normalized_doctypes count="2"><doctype>Article</doctype><doctype>Early Access</doctype></normalized_doctypes><refs count="140" /><addresses count="2"><address_name><address_spec addr_no="1"><full_address>Univ South Carolina, 820 Main St, Columbia, SC 29208 USA</full_address><organizations count="3"><organization pref="null">Univ South Carolina</organization><organization pref="Y">University of South Carolina System</organization><organization pref="Y">University of South Carolina Columbia</organization></organizations><street>820 Main St</street><city>Columbia</city><state>SC</state><country>USA</country><zip location="AP">29208</zip></address_spec><names count="1"><name seq_no="1" role="author" reprint="Y" addr_no="1"><display_name>Vasconcelos, Lucas</display_name><full_name>Vasconcelos, Lucas</full_name><wos_standard>Vasconcelos, L</wos_standard><first_name>Lucas</first_name><last_name>Vasconcelos</last_name></name></names></address_name><address_name><address_spec addr_no="2"><full_address>Penn State Univ, 304 Fischer Rd, State Coll, PA 16801 USA</full_address><organizations count="3"><organization pref="null">Penn State Univ</organization><organization pref="Y">Pennsylvania Commonwealth System of Higher Education (PCSHE)</organization><organization pref="Y">Pennsylvania State University</organization></organizations><street>304 Fischer Rd</street><city>State Coll</city><state>PA</state><country>USA</country><zip location="AP">16801</zip></address_spec><names count="1"><name seq_no="2" role="author" addr_no="2"><display_name>Kim, ChanMin</display_name><full_name>Kim, ChanMin</full_name><wos_standard>Kim, C</wos_standard><first_name>ChanMin</first_name><last_name>Kim</last_name></name></names></address_name></addresses><reprint_addresses count="1"><address_name><address_spec addr_no="1"><full_address>Univ South Carolina, 820 Main St, Columbia, SC 29208 USA</full_address><organizations count="3"><organization pref="null">Univ South Carolina</organization><organization pref="Y">University of South Carolina System</organization><organization pref="Y">University of South Carolina Columbia</organization></organizations><street>820 Main St</street><city>Columbia</city><state>SC</state><country>USA</country><zip location="AP">29208</zip></address_spec><names count="1"><name seq_no="1" role="author" reprint="Y" addr_no="1"><display_name>Vasconcelos, Lucas</display_name><full_name>Vasconcelos, Lucas</full_name><wos_standard>Vasconcelos, L</wos_standard><first_name>Lucas</first_name><last_name>Vasconcelos</last_name></name></names></address_name></reprint_addresses><category_info><headings count="1"><heading>Social Sciences</heading></headings><subjects count="2"><subject ascatype="traditional">Education &amp; Educational Research</subject><subject ascatype="extended">Education &amp; Educational Research</subject></subjects></category_info><keywords count="6"><keyword>Scientific models</keyword><keyword>Scientific modeling</keyword><keyword>Block-based coding</keyword><keyword>Epistemological understanding</keyword><keyword>Coding concepts</keyword><keyword>Lesson design</keyword></keywords><abstracts count="1"><abstract><abstract_text count="1"><p>National and state science learning standards urge K-12 educators to offer authentic Science, Technology, Engineering, and Mathematics learning experiences.</p></abstract_text></abstract></abstracts></fullrecord_metadata><item xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="itemType_wos" coll_id="WOS"><ids avail="N">1U0IP</ids><bib_id>: - JUN 2 2022</bib_id><bib_pagecount type="Journal">87</bib_pagecount><keywords_plus count="10"><keyword>MODEL-BASED INQUIRY</keyword><keyword>COMPUTATIONAL THINKING</keyword><keyword>ELEMENTARY TEACHERS</keyword><keyword>STIMULATED-RECALL</keyword><keyword>STUDENTS</keyword><keyword>TECHNOLOGY</keyword><keyword>KNOWLEDGE</keyword><keyword>K-12</keyword><keyword>CONCEPTIONS</keyword><keyword>VIEWS</keyword></keywords_plus></item></static_data><dynamic_data><citation_related><tc_list><silo_tc coll_id="WOS" local_count="0" /></tc_list></citation_related><cluster_related><identifiers><identifier type="issn" value="1042-1629" /><identifier type="eissn" value="1556-6501" /><identifier type="doi" value="10.1007/s11423-022-10119-7" /></identifiers></cluster_related></dynamic_data><dates date_modified="2022-06-12T22:03:46.007848" date_created="2022-06-12T22:03:46.007848" /></REC><REC r_id_disclaimer="ResearcherID data provided by Clarivate Analytics"><UID>WOS:000805100600001</UID><static_data><summary><EWUID><WUID coll_id="WOS" /><edition value="WOS.SCI" /><edition value="WOS.SSCI" /></EWUID><pub_info sortdate="2022-06-02" pubyear="2022" early_access_month="06" early_access_year="2022" early_access_date="JUN 2022" has_abstract="Y" has_citation_context="Y" coverdate="" pubmonth="JUN 2" pubtype="Journal" journal_oas_gold="N"><page page_count="14" /></pub_info><titles count="6"><title type="source">NATURE HUMAN BEHAVIOUR</title><title type="source_abbrev">NAT HUM BEHAV</title><title type="abbrev_iso">Nat. Hum. Behav.</title><title type="abbrev_11">NAT HUM BEH</title><title type="abbrev_29">NAT HUM BEHAV</title><title type="item">The latent structure of global scientific development</title></titles><names count="6"><name seq_no="1" role="author" addr_no="1"><display_name>Miao, Lili</display_name><full_name>Miao, Lili</full_name><wos_standard>Miao, LL</wos_standard><first_name>Lili</first_name><last_name>Miao</last_name></name><name seq_no="2" role="author" addr_no="1"><display_name>Murray, Dakota</display_name><full_name>Murray, Dakota</full_name><wos_standard>Murray, D</wos_standard><first_name>Dakota</first_name><last_name>Murray</last_name></name><name seq_no="3" role="author" addr_no="2 3"><display_name>Jung, Woo-Sung</display_name><full_name>Jung, Woo-Sung</full_name><wos_standard>Jung, WS</wos_standard><first_name>Woo-Sung</first_name><last_name>Jung</last_name></name><name seq_no="4" role="author" addr_no="4 5 6"><display_name>Lariviere, Vincent</display_name><full_name>Lariviere, Vincent</full_name><wos_standard>Lariviere, V</wos_standard><first_name>Vincent</first_name><last_name>Lariviere</last_name></name><name seq_no="5" role="author" addr_no="7"><display_name>Sugimoto, Cassidy R.</display_name><full_name>Sugimoto, Cassidy R.</full_name><wos_standard>Sugimoto, CR</wos_standard><first_name>Cassidy R.</first_name><last_name>Sugimoto</last_name></name><name seq_no="6" role="author" reprint="Y" addr_no="1 8 9"><display_name>Ahn, Yong-Yeol</display_name><full_name>Ahn, Yong-Yeol</full_name><wos_standard>Ahn, YY</wos_standard><first_name>Yong-Yeol</first_name><last_name>Ahn</last_name></name></names><doctypes count="2"><doctype>Article</doctype><doctype>Early Access</doctype></doctypes><publishers><publisher><address_spec addr_no="1"><full_address>HEIDELBERGER PLATZ 3, BERLIN, 14197, GERMANY</full_address><city>BERLIN</city></address_spec><names count="1"><name role="publisher" seq_no="1" addr_no="1"><display_name>NATURE PORTFOLIO</display_name><full_name>NATURE PORTFOLIO</full_name></name></names></publisher></publishers></summary><fullrecord_metadata><languages count="1"><language type="primary">English</language></languages><normalized_languages count="1"><language type="primary">English</language></normalized_languages><normalized_doctypes count="2"><doctype>Article</doctype><doctype>Early Access</doctype></normalized_doctypes><refs count="62" /><addresses count="9"><address_name><address_spec addr_no="1"><full_address>Indiana Univ, Luddy Sch Informat Comp &amp; Engn, Ctr Complex Networks &amp; Syst Res, Bloomington, IN 47405 USA</full_address><organizations count="3"><organization pref="null">Indiana Univ</organization><organization pref="Y">Indiana University System</organization><organization pref="Y">Indiana University Bloomington</organization></organizations><suborganizations count="2"><suborganization>Luddy Sch Informat Comp &amp; Engn</suborganization><suborganization>Ctr Complex Networks &amp; Syst Res</suborganization></suborganizations><city>Bloomington</city><state>IN</state><country>USA</country><zip location="AP">47405</zip></address_spec><names count="3"><name seq_no="1" role="author" addr_no="1"><display_name>Miao, Lili</display_name><full_name>Miao, Lili</full_name><wos_standard>Miao, LL</wos_standard><first_name>Lili</first_name><last_name>Miao</last_name></name><name seq_no="2" role="author" addr_no="1"><display_name>Murray, Dakota</display_name><full_name>Murray, Dakota</full_name><wos_standard>Murray, D</wos_standard><first_name>Dakota</first_name><last_name>Murray</last_name></name><name seq_no="6" role="author" reprint="Y" addr_no="1"><display_name>Ahn, Yong-Yeol</display_name><full_name>Ahn, Yong-Yeol</full_name><wos_standard>Ahn, YY</wos_standard><first_name>Yong-Yeol</first_name><last_name>Ahn</last_name></name></names></address_name><address_name><address_spec addr_no="2"><full_address>Pohang Univ Sci &amp; Technol, Dept Ind &amp; Management Engn, Pohang, South Korea</full_address><organizations count="2"><organization pref="null">Pohang Univ Sci &amp; Technol</organization><organization pref="Y">Pohang University of Science &amp; Technology (POSTECH)</organization></organizations><suborganizations count="1"><suborganization>Dept Ind &amp; Management Engn</suborganization></suborganizations><city>Pohang</city><country>South Korea</country></address_spec><names count="1"><name seq_no="3" role="author" addr_no="2"><display_name>Jung, Woo-Sung</display_name><full_name>Jung, Woo-Sung</full_name><wos_standard>Jung, WS</wos_standard><first_name>Woo-Sung</first_name><last_name>Jung</last_name></name></names></address_name><address_name><address_spec addr_no="3"><full_address>Pohang Univ Sci &amp; Technol, Dept Phys, Pohang, South Korea</full_address><organizations count="2"><organization pref="null">Pohang Univ Sci &amp; Technol</organization><organization pref="Y">Pohang University of Science &amp; Technology (POSTECH)</organization></organizations><suborganizations count="1"><suborganization>Dept Phys</suborganization></suborganizations><city>Pohang</city><country>South Korea</country></address_spec><names count="1"><name seq_no="3" role="author" addr_no="3"><display_name>Jung, Woo-Sung</display_name><full_name>Jung, Woo-Sung</full_name><wos_standard>Jung, WS</wos_standard><first_name>Woo-Sung</first_name><last_name>Jung</last_name></name></names></address_name><address_name><address_spec addr_no="4"><full_address>Univ Montreal, Ecole Bibliothecon &amp; Sci Informat, Montreal, PQ, Canada</full_address><organizations count="2"><organization pref="null">Univ Montreal</organization><organization pref="Y">Universite de Montreal</organization></organizations><suborganizations count="1"><suborganization>Ecole Bibliothecon &amp; Sci Informat</suborganization></suborganizations><city>Montreal</city><state>PQ</state><country>Canada</country></address_spec><names count="1"><name seq_no="4" role="author" addr_no="4"><display_name>Lariviere, Vincent</display_name><full_name>Lariviere, Vincent</full_name><wos_standard>Lariviere, V</wos_standard><first_name>Vincent</first_name><last_name>Lariviere</last_name></name></names></address_name><address_name><address_spec addr_no="5"><full_address>Univ Quebec Montreal, Observ Sci &amp; Technol, Montreal, PQ, Canada</full_address><organizations count="3"><organization pref="null">Univ Quebec Montreal</organization><organization pref="Y">University of Quebec</organization><organization pref="Y">University of Quebec Montreal</organization></organizations><suborganizations count="1"><suborganization>Observ Sci &amp; Technol</suborganization></suborganizations><city>Montreal</city><state>PQ</state><country>Canada</country></address_spec><names count="1"><name seq_no="4" role="author" addr_no="5"><display_name>Lariviere, Vincent</display_name><full_name>Lariviere, Vincent</full_name><wos_standard>Lariviere, V</wos_standard><first_name>Vincent</first_name><last_name>Lariviere</last_name></name></names></address_name><address_name><address_spec addr_no="6"><full_address>Stellenbosch Univ, Natl Res Fdn Ctr Excellence Scientometr &amp; Sci Tec, Dept Sci &amp; Innovat, Stellenbosch, South Africa</full_address><organizations count="2"><organization pref="null">Stellenbosch Univ</organization><organization pref="Y">Stellenbosch University</organization></organizations><suborganizations count="2"><suborganization>Natl Res Fdn Ctr Excellence Scientometr &amp; Sci Tec</suborganization><suborganization>Dept Sci &amp; Innovat</suborganization></suborganizations><city>Stellenbosch</city><country>South Africa</country></address_spec><names count="1"><name seq_no="4" role="author" addr_no="6"><display_name>Lariviere, Vincent</display_name><full_name>Lariviere, Vincent</full_name><wos_standard>Lariviere, V</wos_standard><first_name>Vincent</first_name><last_name>Lariviere</last_name></name></names></address_name><address_name><address_spec addr_no="7"><full_address>Georgia Inst Technol, Sch Publ Policy, Atlanta, GA 30332 USA</full_address><organizations count="3"><organization pref="null">Georgia Inst Technol</organization><organization pref="Y">University System of Georgia</organization><organization pref="Y">Georgia Institute of Technology</organization></organizations><suborganizations count="1"><suborganization>Sch Publ Policy</suborganization></suborganizations><city>Atlanta</city><state>GA</state><country>USA</country><zip location="AP">30332</zip></address_spec><names count="1"><name seq_no="5" role="author" addr_no="7"><display_name>Sugimoto, Cassidy R.</display_name><full_name>Sugimoto, Cassidy R.</full_name><wos_standard>Sugimoto, CR</wos_standard><first_name>Cassidy R.</first_name><last_name>Sugimoto</last_name></name></names></address_name><address_name><address_spec addr_no="8"><full_address>Indiana Univ, Network Sci Inst, Bloomington, IN 47405 USA</full_address><organizations count="3"><organization pref="null">Indiana Univ</organization><organization pref="Y">Indiana University System</organization><organization pref="Y">Indiana University Bloomington</organization></organizations><suborganizations count="1"><suborganization>Network Sci Inst</suborganization></suborganizations><city>Bloomington</city><state>IN</state><country>USA</country><zip location="AP">47405</zip></address_spec><names count="1"><name seq_no="6" role="author" reprint="Y" addr_no="8"><display_name>Ahn, Yong-Yeol</display_name><full_name>Ahn, Yong-Yeol</full_name><wos_standard>Ahn, YY</wos_standard><first_name>Yong-Yeol</first_name><last_name>Ahn</last_name></name></names></address_name><address_name><address_spec addr_no="9"><full_address>MIT, Connect Sci, 77 Massachusetts Ave, Cambridge, MA 02139 USA</full_address><organizations count="2"><organization pref="null">MIT</organization><organization pref="Y">Massachusetts Institute of Technology (MIT)</organization></organizations><suborganizations count="1"><suborganization>Connect Sci</suborganization></suborganizations><street>77 Massachusetts Ave</street><city>Cambridge</city><state>MA</state><country>USA</country><zip location="AP">02139</zip></address_spec><names count="1"><name seq_no="6" role="author" reprint="Y" addr_no="9"><display_name>Ahn, Yong-Yeol</display_name><full_name>Ahn, Yong-Yeol</full_name><wos_standard>Ahn, YY</wos_standard><first_name>Yong-Yeol</first_name><last_name>Ahn</last_name></name></names></address_name></addresses><reprint_addresses count="3"><address_name><address_spec addr_no="1"><full_address>Indiana Univ, Luddy Sch Informat Comp &amp; Engn, Ctr Complex Networks &amp; Syst Res, Bloomington, IN 47405 USA</full_address><organizations count="3"><organization pref="null">Indiana Univ</organization><organization pref="Y">Indiana University System</organization><organization pref="Y">Indiana University Bloomington</organization></organizations><suborganizations count="2"><suborganization>Luddy Sch Informat Comp &amp; Engn</suborganization><suborganization>Ctr Complex Networks &amp; Syst Res</suborganization></suborganizations><city>Bloomington</city><state>IN</state><country>USA</country><zip location="AP">47405</zip></address_spec><names count="1"><name seq_no="1" role="author" reprint="Y" addr_no="1"><display_name>Ahn, Yong-Yeol</display_name><full_name>Ahn, Yong-Yeol</full_name><wos_standard>Ahn, YY</wos_standard><first_name>Yong-Yeol</first_name><last_name>Ahn</last_name></name></names></address_name><address_name><address_spec addr_no="2"><full_address>Indiana Univ, Network Sci Inst, Bloomington, IN 47405 USA</full_address><organizations count="3"><organization pref="null">Indiana Univ</organization><organization pref="Y">Indiana University System</organization><organization pref="Y">Indiana University Bloomington</organization></organizations><suborganizations count="1"><suborganization>Network Sci Inst</suborganization></suborganizations><city>Bloomington</city><state>IN</state><country>USA</country><zip location="AP">47405</zip></address_spec><names count="1"><name seq_no="1" role="author" reprint="Y" addr_no="2"><display_name>Ahn, Yong-Yeol</display_name><full_name>Ahn, Yong-Yeol</full_name><wos_standard>Ahn, YY</wos_standard><first_name>Yong-Yeol</first_name><last_name>Ahn</last_name></name></names></address_name><address_name><address_spec addr_no="3"><full_address>MIT, Connect Sci, 77 Massachusetts Ave, Cambridge, MA 02139 USA</full_address><organizations count="2"><organization pref="null">MIT</organization><organization pref="Y">Massachusetts Institute of Technology (MIT)</organization></organizations><suborganizations count="1"><suborganization>Connect Sci</suborganization></suborganizations><street>77 Massachusetts Ave</street><city>Cambridge</city><state>MA</state><country>USA</country><zip location="AP">02139</zip></address_spec><names count="1"><name seq_no="1" role="author" reprint="Y" addr_no="3"><display_name>Ahn, Yong-Yeol</display_name><full_name>Ahn, Yong-Yeol</full_name><wos_standard>Ahn, YY</wos_standard><first_name>Yong-Yeol</first_name><last_name>Ahn</last_name></name></names></address_name></reprint_addresses><category_info><headings count="2"><heading>Social Sciences</heading><heading>Science &amp; Technology</heading></headings><subheadings count="1"><subheading>Life Sciences &amp; Biomedicine</subheading></subheadings><subjects count="7"><subject ascatype="traditional" code="BV">Psychology, Biological</subject><subject ascatype="traditional" code="RO">Multidisciplinary Sciences</subject><subject ascatype="traditional" code="RU">Neurosciences</subject><subject ascatype="traditional" code="VX">Psychology, Experimental</subject><subject ascatype="extended">Psychology</subject><subject ascatype="extended">Science &amp; Technology - Other Topics</subject><subject ascatype="extended">Neurosciences &amp; Neurology</subject></subjects></category_info><fund_ack><fund_text><p>L.M., D.M. and Y.Y.A. acknowledges funding support from the Air Force Office of Scientific Research under award no. FA9550-19-1-0391. The funder had no role in study design, data collection and analysis, decision to publish or preparation of the manuscript. We thank S. Milojevic, J. Yoon, S. Kojaku, B.-K. Lee, B. Weinberg, P. Stephan, S. Schnell, T. Zhou, J. Huang, J. Gao, Y. Bu, Q. Zhang, B. Uzzi, H. Youn and N. Dehmamy for helpful discussion and comments.</p></fund_text><grants count="1"><grant><grant_agency>Air Force Office of Scientific Research</grant_agency><grant_ids count="1"><grant_id>FA9550-19-1-0391</grant_id></grant_ids><grant_agency_names pref="Y" content="United States Department of Defense" /><grant_agency_names pref="Y" content="Air Force Office of Scientific Research (AFOSR)" /><grant_agency_names pref="N" content="Air Force Office of Scientific Research" /></grant></grants></fund_ack><abstracts count="1"><abstract><abstract_text count="2"><p>Science is essential to innovation and economic prosperity.</p><p>By examining the scientific output of each country, Ahn et al. reveal a three-cluster structure of global science.</p></abstract_text></abstract></abstracts></fullrecord_metadata><item xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="itemType_wos" coll_id="WOS"><ids avail="N">1U0GV</ids><bib_id>: - JUN 2 2022</bib_id><bib_pagecount type="Journal">82</bib_pagecount><keywords_plus count="8"><keyword>RESEARCH OUTPUT</keyword><keyword>ECONOMIC-GROWTH</keyword><keyword>SCIENCE</keyword><keyword>KNOWLEDGE</keyword><keyword>CHINA</keyword><keyword>CAUSALITY</keyword><keyword>BACKBONE</keyword><keyword>SPREAD</keyword></keywords_plus></item><contributors count="2"><contributor><name seq_no="1" role="researcher_id" r_id="C-6334-2011" orcid_id="0000-0002-4352-4301"><display_name>Ahn, Yong-Yeol</display_name><full_name>Ahn, Yong-Yeol</full_name><first_name>Yong-Yeol</first_name><last_name>Ahn</last_name></name></contributor><contributor><name seq_no="2" role="researcher_id" r_id="B-1251-2008" orcid_id="0000-0001-9590-3859"><display_name>Jung, Woo-Sung</display_name><full_name>Jung, Woo-Sung</full_name><first_name>Woo-Sung</first_name><last_name>Jung</last_name></name></contributor></contributors></static_data><dynamic_data><citation_related><tc_list><silo_tc coll_id="WOS" local_count="0" /></tc_list></citation_related><cluster_related><identifiers><identifier type="issn" value="2397-3374" /><identifier type="doi" value="10.1038/s41562-022-01367-x" /><identifier type="pmid" value="MEDLINE:35654964" /></identifiers></cluster_related></dynamic_data><dates date_modified="2022-06-12T22:03:46.007848" date_created="2022-06-12T22:03:46.007848" /></REC></records>]]>
+</val>
+</map>
+<map name="QueryResult">
+    <map>
+        <val name="QueryID">1798</val>
+        <val name="RecordsSearched">65931239</val>
+        <val name="RecordsFound">1853785</val>
+    </map>
+</map>
+</map>
+</response>
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/test-config.properties b/dspace-server-webapp/src/test/resources/test-config.properties
index 3af96b20fc..37db1c9f9c 100644
--- a/dspace-server-webapp/src/test/resources/test-config.properties
+++ b/dspace-server-webapp/src/test/resources/test-config.properties
@@ -13,4 +13,4 @@ test.folder.assetstore = ./target/testing/dspace/assetstore
 test.bitstream = ./target/testing/dspace/assetstore/ConstitutionofIreland.pdf
 
 #Path for a test Taskfile for the curate script
-test.curateTaskFile = ./target/testing/dspace/assetstore/curate.txt
+test.curateTaskFile = ./target/testing/dspace/assetstore/curate.txt
\ No newline at end of file
diff --git a/dspace-services/pom.xml b/dspace-services/pom.xml
index 7f08f304d7..5eabcca707 100644
--- a/dspace-services/pom.xml
+++ b/dspace-services/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -90,13 +90,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <!-- this needs to eventually go into common/lib for tomcat 5 -->
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache-core</artifactId>
-            <version>2.6.11</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- for filters -->
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java b/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
index 8bf037cbe3..c20ee19628 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
+++ b/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
@@ -177,7 +177,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
      * @see org.dspace.services.ConfigurationService#getProperty(java.lang.String)
      */
     @Override
-    public String getProperty(String name) {
+    public synchronized String getProperty(String name) {
         return getProperty(name, null);
     }
 
@@ -188,7 +188,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
      * @see org.dspace.services.ConfigurationService#getProperty(java.lang.String, java.lang.String)
      */
     @Override
-    public String getProperty(String name, String defaultValue) {
+    public synchronized String getProperty(String name, String defaultValue) {
         return getPropertyAsType(name, defaultValue);
     }
 
@@ -410,7 +410,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
             throw new IllegalArgumentException("properties cannot be null");
         }
 
-        ArrayList<String> changed = new ArrayList<String>();
+        ArrayList<String> changed = new ArrayList<>();
 
         // loop through each new property entry
         for (Entry<String, Object> entry : properties.entrySet()) {
diff --git a/dspace-services/src/main/java/org/dspace/services/CachingService.java b/dspace-services/src/main/java/org/dspace/services/CachingService.java
deleted file mode 100644
index 0672a1b2b7..0000000000
--- a/dspace-services/src/main/java/org/dspace/services/CachingService.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.services;
-
-import java.util.List;
-
-import org.dspace.services.model.Cache;
-import org.dspace.services.model.CacheConfig;
-
-/**
- * A service to manage creation and retrieval of caches.
- *
- * @author Aaron Zeckoski (azeckoski @ gmail.com)
- */
-public interface CachingService {
-
-    /**
-     * This is the cache key used to stored requests in a request cache,
-     * typically handled by a servlet filter but can be handled by
-     * anything.
-     * This is here to ensure we use the right name.
-     */
-    public static final String REQUEST_CACHE = "dsRequestCache";
-
-    /**
-     * Gets all the caches that the service knows about.
-     * This will include caches of all scopes but only includes request
-     * caches for the current thread.
-     *
-     * @return a list of all the caches which the caching service knows about
-     */
-    public List<Cache> getCaches();
-
-    /**
-     * Construct a Cache with the given name OR retrieve the one that
-     * already exists with this name.  Often the name is the fully
-     * qualified classpath of the API for the service that is being
-     * cached, or of the class if there is no API.
-     * This will operate on system defaults (probably a distributed
-     * cache without replication) OR it will use the defaults which are
-     * configured for this cacheName (part of the underlying
-     * implementation) if the cacheConfig is null.
-     * <p>
-     * This can only retrieve request caches for the current request.
-     * <p>
-     * If the cache already exists then the cacheConfig is ignored.
-     *
-     * @param cacheName   the unique name for this cache (e.g. org.dspace.user.UserCache)
-     * @param cacheConfig defines the configuration for this cache
-     * @return a cache which can be used to store objects
-     */
-    public Cache getCache(String cacheName, CacheConfig cacheConfig);
-
-    /**
-     * Flushes and destroys the cache with this name.
-     * Generally there is no reason to call this.
-     *
-     * @param cacheName the unique name for this cache (e.g. org.dspace.user.UserCache)
-     */
-    public void destroyCache(String cacheName);
-
-    /**
-     * Get a status report of cache usage which is suitable for log or
-     * screen output.
-     *
-     * @param cacheName (optional) the unique name for this cache (e.g. org.dspace.user.UserCache)
-     *                  OR null for status of all caches
-     * @return a string representing the current status of the specified cache or all caches
-     */
-    public String getStatus(String cacheName);
-
-    /**
-     * Clears all caches.
-     * Generally there is no reason to call this.
-     *
-     * @throws SecurityException if the current user does not have super user permissions
-     */
-    public void resetCaches();
-
-    /**
-     * Unbinds all request caches.  Destroys the caches completely.
-     * You should not call this unless you know what you are doing;
-     * it is handled automatically by the system.
-     */
-    public void unbindRequestCaches();
-
-}
diff --git a/dspace-services/src/main/java/org/dspace/services/EventService.java b/dspace-services/src/main/java/org/dspace/services/EventService.java
index 4944389b05..92080f0358 100644
--- a/dspace-services/src/main/java/org/dspace/services/EventService.java
+++ b/dspace-services/src/main/java/org/dspace/services/EventService.java
@@ -27,14 +27,6 @@ public interface EventService {
      */
     public void fireEvent(Event event);
 
-    /**
-     * Queues up an event to be fired at the end of a successful
-     * request/transaction.
-     *
-     * @param event contains the data related to this event
-     */
-    public void queueEvent(Event event);
-
     /**
      * Register an event listener which will be notified when events occur.
      *
diff --git a/dspace-services/src/main/java/org/dspace/services/RequestService.java b/dspace-services/src/main/java/org/dspace/services/RequestService.java
index 0c0c5fad45..d28a04ecf6 100644
--- a/dspace-services/src/main/java/org/dspace/services/RequestService.java
+++ b/dspace-services/src/main/java/org/dspace/services/RequestService.java
@@ -111,7 +111,7 @@ public interface RequestService {
     /**
      * Set the ID of the current authenticated user
      *
-     * @return the id of the user associated with the current thread OR null if there is no user
+     * @param epersonId the id of the user associated with the current thread OR null if there is no user
      */
     public void setCurrentUserId(UUID epersonId);
 
diff --git a/dspace-services/src/main/java/org/dspace/services/caching/CachingServiceImpl.java b/dspace-services/src/main/java/org/dspace/services/caching/CachingServiceImpl.java
deleted file mode 100644
index ab24cb40fa..0000000000
--- a/dspace-services/src/main/java/org/dspace/services/caching/CachingServiceImpl.java
+++ /dev/null
@@ -1,556 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.services.caching;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Statistics;
-import org.dspace.kernel.ServiceManager;
-import org.dspace.kernel.mixins.ConfigChangeListener;
-import org.dspace.services.CachingService;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.RequestService;
-import org.dspace.services.caching.model.EhcacheCache;
-import org.dspace.services.caching.model.MapCache;
-import org.dspace.services.model.Cache;
-import org.dspace.services.model.CacheConfig;
-import org.dspace.services.model.CacheConfig.CacheScope;
-import org.dspace.services.model.RequestInterceptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * Implementation of the core caching service, which is available for
- * anyone who is writing code for DSpace to use.
- *
- * @author Aaron Zeckoski (azeckoski @ gmail.com)
- */
-public final class CachingServiceImpl
-    implements CachingService, ConfigChangeListener {
-
-    private static final Logger log = LoggerFactory.getLogger(CachingServiceImpl.class);
-
-    /**
-     * This is the event key for a full cache reset.
-     */
-    protected static final String EVENT_RESET = "caching.reset";
-    /**
-     * The default configuration location.
-     */
-    protected static final String DEFAULT_CONFIG = "org/dspace/services/caching/ehcache-config.xml";
-
-    /**
-     * All the non-thread caches that we know about.
-     * Mostly used for tracking purposes.
-     */
-    private final Map<String, EhcacheCache> cacheRecord = new ConcurrentHashMap<>();
-
-    /**
-     * All the request caches.  This is bound to the thread.
-     * The initial value of this TL is set automatically when it is
-     * created.
-     */
-    private final Map<String, Map<String, MapCache>> requestCachesMap = new ConcurrentHashMap<>();
-
-    /**
-     * @return the current request map which is bound to the current thread
-     */
-    protected Map<String, MapCache> getRequestCaches() {
-        if (requestService == null || requestService.getCurrentRequestId() == null) {
-            return null;
-        }
-
-        Map<String, MapCache> requestCaches = requestCachesMap.get(requestService.getCurrentRequestId());
-        if (requestCaches == null) {
-            requestCaches = new HashMap<>();
-            requestCachesMap.put(requestService.getCurrentRequestId(), requestCaches);
-        }
-
-        return requestCaches;
-    }
-
-    /**
-     * Unbinds all request caches.  Destroys the caches completely.
-     */
-    @Override
-    public void unbindRequestCaches() {
-        if (requestService != null) {
-            requestCachesMap.remove(requestService.getCurrentRequestId());
-        }
-    }
-
-    private ConfigurationService configurationService;
-
-    @Autowired(required = true)
-    public void setConfigurationService(ConfigurationService configurationService) {
-        this.configurationService = configurationService;
-    }
-
-    private RequestService requestService;
-
-    @Autowired
-    public void setRequestService(RequestService requestService) {
-        this.requestService = requestService;
-    }
-
-    private ServiceManager serviceManager;
-
-    @Autowired(required = true)
-    public void setServiceManager(ServiceManager serviceManager) {
-        this.serviceManager = serviceManager;
-    }
-
-    /**
-     * The underlying cache manager; injected.
-     */
-    protected net.sf.ehcache.CacheManager cacheManager;
-
-    @Autowired(required = true)
-    public void setCacheManager(net.sf.ehcache.CacheManager cacheManager) {
-        this.cacheManager = cacheManager;
-    }
-
-    public net.sf.ehcache.CacheManager getCacheManager() {
-        return cacheManager;
-    }
-
-    private boolean useClustering = false;
-    private boolean useDiskStore = true;
-    private int maxElementsInMemory = 2000;
-    private int timeToLiveSecs = 3600;
-    private int timeToIdleSecs = 600;
-
-    /**
-     * Reloads the configuration settings from the configuration service.
-     */
-    protected void reloadConfig() {
-        // Reload caching configurations, but have sane default values if unspecified in configs
-        useClustering = configurationService.getPropertyAsType(knownConfigNames[0], false);
-        useDiskStore = configurationService.getPropertyAsType(knownConfigNames[1], true);
-        maxElementsInMemory = configurationService.getPropertyAsType(knownConfigNames[2], 2000);
-        timeToLiveSecs = configurationService.getPropertyAsType(knownConfigNames[3], 3600);
-        timeToIdleSecs = configurationService.getPropertyAsType(knownConfigNames[4], 600);
-    }
-
-    /**
-     * WARNING: Do not change the order of these! <br/>
-     * If you do, you have to fix the {@link #reloadConfig()} method -AZ
-     */
-    private final String[] knownConfigNames = {
-        "caching.use.clustering", // bool - whether to use clustering
-        "caching.default.use.disk.store", // whether to use the disk store
-        "caching.default.max.elements", // the maximum number of elements in memory, before they are evicted
-        "caching.default.time.to.live.secs", // the default amount of time to live for an element from its creation date
-        "caching.default.time.to.idle.secs", // the default amount of time to live for an element from its last
-        // accessed or modified date
-    };
-
-    /* (non-Javadoc)
-     * @see org.dspace.kernel.mixins.ConfigChangeListener#notifyForConfigNames()
-     */
-    @Override
-    public String[] notifyForConfigNames() {
-        return knownConfigNames.clone();
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.kernel.mixins.ConfigChangeListener#configurationChanged(java.util.List, java.util.Map)
-     */
-    @Override
-    public void configurationChanged(List<String> changedSettingNames, Map<String, String> changedSettings) {
-        reloadConfig();
-    }
-
-    @PostConstruct
-    public void init() {
-        log.info("init()");
-        // get settings
-        reloadConfig();
-
-        // get all caches out of the cachemanager and load them into the cache list
-        List<Ehcache> ehcaches = getAllEhCaches(false);
-        for (Ehcache ehcache : ehcaches) {
-            EhcacheCache cache = new EhcacheCache(ehcache, null);
-            cacheRecord.put(cache.getName(), cache);
-        }
-
-        if (requestService != null) {
-            requestService.registerRequestInterceptor(new CachingServiceRequestInterceptor());
-        }
-
-        log.info("Caching service initialized:\n" + getStatus(null));
-    }
-
-    @PreDestroy
-    public void shutdown() {
-        log.info("destroy()");
-        // for some reason this causes lots of errors so not using it for now -AZ
-        //ehCacheManagementService.dispose();
-        try {
-            cacheRecord.clear();
-        } catch (RuntimeException e) {
-            // whatever
-        }
-        try {
-            requestCachesMap.clear();
-        } catch (RuntimeException e) {
-            // whatever
-        }
-        try {
-            cacheManager.removalAll();
-        } catch (RuntimeException e) {
-            // whatever
-        }
-        try {
-            cacheManager.shutdown();
-        } catch (RuntimeException e) {
-            // whatever
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.CachingService#destroyCache(java.lang.String)
-     */
-    @Override
-    public void destroyCache(String cacheName) {
-        if (cacheName == null || "".equals(cacheName)) {
-            throw new IllegalArgumentException("cacheName cannot be null or empty string");
-        }
-
-        EhcacheCache cache = cacheRecord.get(cacheName);
-        if (cache != null) {
-            cacheManager.removeCache(cacheName);
-            cacheRecord.remove(cacheName);
-        } else {
-            Map<String, MapCache> caches = getRequestCaches();
-            if (caches != null) {
-                caches.remove(cacheName);
-            }
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.CachingService#getCache(java.lang.String, org.dspace.services.model.CacheConfig)
-     */
-    @Override
-    public Cache getCache(String cacheName, CacheConfig cacheConfig) {
-        Cache cache = null;
-
-        if (cacheName == null || "".equals(cacheName)) {
-            throw new IllegalArgumentException("cacheName cannot be null or empty string");
-        }
-
-        if (cacheConfig != null && CacheScope.REQUEST.equals(cacheConfig.getCacheScope())) {
-            Map<String, MapCache> caches = getRequestCaches();
-            if (caches != null) {
-                cache = caches.get(cacheName);
-            }
-
-            if (cache == null) {
-                cache = instantiateMapCache(cacheName, cacheConfig);
-            }
-        } else {
-            // find the cache in the records if possible
-            cache = this.cacheRecord.get(cacheName);
-
-            if (cache == null) {
-                cache = instantiateEhCache(cacheName, cacheConfig);
-            }
-        }
-
-        return cache;
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.CachingService#getCaches()
-     */
-    @Override
-    public List<Cache> getCaches() {
-        List<Cache> caches = new ArrayList<>(this.cacheRecord.values());
-//        TODO implement reporting on request caches?
-//        caches.addAll(this.requestMap.values());
-        Collections.sort(caches, new NameComparator());
-        return caches;
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.CachingService#getStatus(java.lang.String)
-     */
-    @Override
-    public String getStatus(String cacheName) {
-        final StringBuilder sb = new StringBuilder();
-
-        if (cacheName == null || "".equals(cacheName)) {
-            // add in overall memory stats
-            sb.append("** Memory report\n");
-            sb.append(" freeMemory: ").append(Runtime.getRuntime().freeMemory());
-            sb.append("\n");
-            sb.append(" totalMemory: ").append(Runtime.getRuntime().totalMemory());
-            sb.append("\n");
-            sb.append(" maxMemory: ").append(Runtime.getRuntime().maxMemory());
-            sb.append("\n");
-
-            // caches summary report
-            List<Cache> allCaches = getCaches();
-            sb.append("\n** Full report of all known caches (").append(allCaches.size()).append("):\n");
-            for (Cache cache : allCaches) {
-                sb.append(" * ");
-                sb.append(cache.toString());
-                sb.append("\n");
-                if (cache instanceof EhcacheCache) {
-                    Ehcache ehcache = ((EhcacheCache) cache).getCache();
-                    sb.append(generateCacheStats(ehcache));
-                    sb.append("\n");
-                }
-            }
-        } else {
-            // report for a single cache
-            sb.append("\n** Report for cache (").append(cacheName).append("):\n");
-            Cache cache = this.cacheRecord.get(cacheName);
-            if (cache == null) {
-                Map<String, MapCache> caches = getRequestCaches();
-                if (caches != null) {
-                    cache = caches.get(cacheName);
-                }
-            }
-            if (cache == null) {
-                sb.append(" * Could not find cache by this name: ").append(cacheName);
-            } else {
-                sb.append(" * ");
-                sb.append(cache.toString());
-                sb.append("\n");
-                if (cache instanceof EhcacheCache) {
-                    Ehcache ehcache = ((EhcacheCache) cache).getCache();
-                    sb.append(generateCacheStats(ehcache));
-                    sb.append("\n");
-                }
-            }
-        }
-
-        return sb.toString();
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.CachingService#resetCaches()
-     */
-    @Override
-    public void resetCaches() {
-        log.debug("resetCaches()");
-
-        List<Cache> allCaches = getCaches();
-        for (Cache cache : allCaches) {
-            cache.clear();
-        }
-
-        System.runFinalization(); // force the JVM to try to clean up any remaining objects
-        // DO NOT CALL System.gc() here or I will have you shot -AZ
-
-        log.info("doReset(): Memory Recovery to: " + Runtime.getRuntime().freeMemory());
-    }
-
-    /**
-     * Return all caches from the CacheManager.
-     *
-     * @param sorted if true then sort by name
-     * @return the list of all known ehcaches
-     */
-    protected List<Ehcache> getAllEhCaches(boolean sorted) {
-        log.debug("getAllCaches()");
-
-        final String[] cacheNames = cacheManager.getCacheNames();
-        if (sorted) {
-            Arrays.sort(cacheNames);
-        }
-        final List<Ehcache> caches = new ArrayList<>(cacheNames.length);
-        for (String cacheName : cacheNames) {
-            caches.add(cacheManager.getEhcache(cacheName));
-        }
-        return caches;
-    }
-
-    /**
-     * Create an EhcacheCache (and the associated EhCache) using the
-     * supplied name (with default settings), or get the cache out of
-     * Spring or the current configured cache.
-     * <p>
-     * This expects that the cacheRecord has already been checked and
-     * will not check it again.
-     * <p>
-     * Will proceed in this order:
-     * <ol>
-     * <li>Attempt to load a bean with the name of the cache</li>
-     * <li>Attempt to load cache from caching system</li>
-     * <li>Create a new cache by this name</li>
-     * <li>Put the cache in the cache record</li>
-     * </ol>
-     *
-     * @param cacheName   the name of the cache
-     * @param cacheConfig the config for this cache
-     * @return a cache instance
-     */
-    protected EhcacheCache instantiateEhCache(String cacheName, CacheConfig cacheConfig) {
-        if (log.isDebugEnabled()) {
-            log.debug("instantiateEhCache(String " + cacheName + ")");
-        }
-
-        if (cacheName == null || "".equals(cacheName)) {
-            throw new IllegalArgumentException("String cacheName must not be null or empty!");
-        }
-
-        // try to locate a named cache in the service manager
-        Ehcache ehcache = serviceManager.getServiceByName(cacheName, Ehcache.class);
-
-        // try to locate the cache in the cacheManager by name
-        if (ehcache == null) {
-            // if this cache name is created or already in use then we just get it
-            if (!cacheManager.cacheExists(cacheName)) {
-                // did not find the cache
-                if (cacheConfig == null) {
-                    cacheManager.addCache(cacheName); // create a new cache using ehcache defaults
-                } else {
-                    if (useClustering) {
-                        // TODO
-                        throw new UnsupportedOperationException("Still need to do this");
-                    } else {
-                        cacheManager.addCache(cacheName); // create a new cache using ehcache defaults
-                    }
-                }
-                log.info("Created new Cache (from default settings): " + cacheName);
-            }
-            ehcache = cacheManager.getEhcache(cacheName);
-        }
-        // wrap the ehcache in the cache impl
-        EhcacheCache cache = new EhcacheCache(ehcache, cacheConfig);
-        cacheRecord.put(cacheName, cache);
-        return cache;
-    }
-
-    /**
-     * Create a thread map cache using the supplied name with supplied
-     * settings.
-     * <p>
-     * This expects that the cacheRecord has already been checked and
-     * will not check it again.  It also places the cache into the
-     * request map.
-     *
-     * @param cacheName   the name of the cache
-     * @param cacheConfig the config for this cache
-     * @return a cache instance
-     */
-    protected MapCache instantiateMapCache(String cacheName, CacheConfig cacheConfig) {
-        if (log.isDebugEnabled()) {
-            log.debug("instantiateMapCache(String " + cacheName + ")");
-        }
-
-        if (cacheName == null || "".equals(cacheName)) {
-            throw new IllegalArgumentException("String cacheName must not be null or empty!");
-        }
-
-        // check for existing cache
-        MapCache cache = null;
-        CacheScope scope = CacheScope.REQUEST;
-        if (cacheConfig != null) {
-            scope = cacheConfig.getCacheScope();
-        }
-
-        Map<String, MapCache> caches = getRequestCaches();
-        if (caches != null) {
-            if (CacheScope.REQUEST.equals(scope)) {
-                cache = caches.get(cacheName);
-            }
-
-            if (cache == null) {
-                cache = new MapCache(cacheName, cacheConfig);
-                // place cache into the right TL
-                if (CacheScope.REQUEST.equals(scope)) {
-                    caches.put(cacheName, cache);
-                }
-            }
-        }
-
-        return cache;
-    }
-
-    /**
-     * Generate some stats for this cache.
-     * Note that this is not cheap so do not use it very often.
-     *
-     * @param cache an Ehcache
-     * @return the stats of this cache as a string
-     */
-    protected static String generateCacheStats(Ehcache cache) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(cache.getName()).append(":");
-        // this will make this costly but it is important to get accurate settings
-        cache.setStatisticsAccuracy(Statistics.STATISTICS_ACCURACY_GUARANTEED);
-        Statistics stats = cache.getStatistics();
-        final long memSize = cache.getMemoryStoreSize();
-        final long diskSize = cache.getDiskStoreSize();
-        final long size = memSize + diskSize;
-        final long hits = stats.getCacheHits();
-        final long misses = stats.getCacheMisses();
-        final String hitPercentage = ((hits + misses) > 0) ? ((100l * hits) / (hits + misses)) + "%" : "N/A";
-        final String missPercentage = ((hits + misses) > 0) ? ((100l * misses) / (hits + misses)) + "%" : "N/A";
-        sb.append("  Size: ").append(size).append(" [memory:").append(memSize).append(", disk:").append(diskSize)
-          .append("]");
-        sb.append(",  Hits: ").append(hits).append(" [memory:").append(stats.getInMemoryHits()).append(", disk:")
-          .append(stats.getOnDiskHits()).append("] (").append(hitPercentage).append(")");
-        sb.append(",  Misses: ").append(misses).append(" (").append(missPercentage).append(")");
-        return sb.toString();
-    }
-
-    /**
-     * Compare two Cache objects by name.
-     */
-    public static final class NameComparator implements Comparator<Cache>, Serializable {
-        public static final long serialVersionUID = 1l;
-
-        @Override
-        public int compare(Cache o1, Cache o2) {
-            return o1.getName().compareTo(o2.getName());
-        }
-    }
-
-    private class CachingServiceRequestInterceptor implements RequestInterceptor {
-
-        @Override
-        public void onStart(String requestId) {
-            if (requestId != null) {
-                Map<String, MapCache> requestCaches = requestCachesMap.get(requestId);
-                if (requestCaches == null) {
-                    requestCaches = new HashMap<>();
-                    requestCachesMap.put(requestId, requestCaches);
-                }
-            }
-        }
-
-        @Override
-        public void onEnd(String requestId, boolean succeeded, Exception failure) {
-            if (requestId != null) {
-                requestCachesMap.remove(requestId);
-            }
-        }
-
-        @Override
-        public int getOrder() {
-            return 1;
-        }
-    }
-}
diff --git a/dspace-services/src/main/java/org/dspace/services/caching/model/EhcacheCache.java b/dspace-services/src/main/java/org/dspace/services/caching/model/EhcacheCache.java
deleted file mode 100644
index a3e86748ac..0000000000
--- a/dspace-services/src/main/java/org/dspace/services/caching/model/EhcacheCache.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.services.caching.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.Status;
-import org.dspace.services.model.Cache;
-import org.dspace.services.model.CacheConfig;
-import org.dspace.services.model.CacheConfig.CacheScope;
-
-
-/**
- * The ehcache implementation of the Cache object.
- *
- * @author Aaron Zeckoski (azeckoski @ gmail.com)
- */
-public final class EhcacheCache implements Cache {
-
-    protected Ehcache cache;
-
-    public Ehcache getCache() {
-        return cache;
-    }
-
-    protected CacheConfig cacheConfig;
-
-    public EhcacheCache(Ehcache cache, CacheConfig cacheConfig) {
-        // setup the cache
-        if (cache == null) {
-            throw new NullPointerException("Cache must be set and cannot be null");
-        } else {
-            if (cache.getStatus() != Status.STATUS_ALIVE) {
-                throw new IllegalArgumentException(
-                    "Cache (" + cache.getName() + ") must already be initialized and alive");
-            }
-        }
-        this.cache = cache;
-        if (cacheConfig != null) {
-            this.cacheConfig = cacheConfig;
-        } else {
-            this.cacheConfig = new CacheConfig(CacheScope.INSTANCE);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#getConfig()
-     */
-    public CacheConfig getConfig() {
-        return cacheConfig;
-    }
-
-    /* (non-Javadoc)
-     * @see org.sakaiproject.caching.Cache#clear()
-     */
-    public void clear() {
-        cache.removeAll();
-        cache.clearStatistics();
-    }
-
-    /* (non-Javadoc)
-     * @see org.sakaiproject.caching.Cache#exists(java.lang.String)
-     */
-    public boolean exists(String key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-        return cache.isKeyInCache(key);
-    }
-
-    /* (non-Javadoc)
-     * @see org.sakaiproject.caching.Cache#get(java.lang.String)
-     */
-    public Object get(String key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-
-        return (Serializable) getCachePayload(key, false);
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#getKeys()
-     */
-    public List<String> getKeys() {
-        ArrayList<String> keys = new ArrayList<String>();
-        List<?> eKeys = cache.getKeys();
-        for (Object object : eKeys) {
-            if (object != null) {
-                keys.add(object.toString());
-            }
-        }
-        return keys;
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#look(java.lang.String)
-     */
-    public Object look(String key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-
-        return (Serializable) getCachePayload(key, true);
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#put(java.lang.String, java.io.Serializable)
-     */
-    public void put(String key, Object value) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-        cache.put(new Element(key, value));
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#getName()
-     */
-    public String getName() {
-        if (cache != null) {
-            return cache.getName();
-        } else {
-            return "NULL cache";
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.sakaiproject.caching.Cache#remove(java.lang.String)
-     */
-    public boolean remove(String key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-        return cache.remove(key);
-    }
-
-    /* (non-Javadoc)
-     * @see org.sakaiproject.caching.Cache#size()
-     */
-    public int size() {
-        return cache.getSize();
-    }
-
-    /**
-     * Retrieve a payload from the cache for this key if one can be found.
-     *
-     * @param key the key for this cache element
-     * @return the payload or null if none found
-     */
-    private Object getCachePayload(String key, boolean quiet) {
-        Object payload = null;
-        Element e;
-        if (quiet) {
-            e = cache.getQuiet(key);
-        } else {
-            e = cache.get(key);
-        }
-        if (e != null) {
-            // attempt to get the serialized value first
-            if (e.isSerializable()) {
-                payload = e.getValue();
-            } else {
-                // not serializable so get the object value
-                payload = e.getObjectValue();
-            }
-        }
-        return payload;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (null == obj) {
-            return false;
-        }
-        if (!(obj instanceof EhcacheCache)) {
-            return false;
-        } else {
-            EhcacheCache castObj = (EhcacheCache) obj;
-            if (null == this.getName() || null == castObj.getName()) {
-                return false;
-            } else {
-                return (this.getName().equals(castObj.getName()));
-            }
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        if (null == this.getName()) {
-            return super.hashCode();
-        }
-        String hashStr = this.getClass().getName() + ":" + this.getName().hashCode();
-        return hashStr.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return "EhCache:name=" + getName() + ":Scope=" + cacheConfig.getCacheScope() + ":size=" + size();
-    }
-
-}
diff --git a/dspace-services/src/main/java/org/dspace/services/caching/model/MapCache.java b/dspace-services/src/main/java/org/dspace/services/caching/model/MapCache.java
deleted file mode 100644
index 49e3aead0d..0000000000
--- a/dspace-services/src/main/java/org/dspace/services/caching/model/MapCache.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.services.caching.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.dspace.services.model.Cache;
-import org.dspace.services.model.CacheConfig;
-import org.dspace.services.model.CacheConfig.CacheScope;
-
-
-/**
- * This is a simple Cache that just uses a map to store the cache values.
- * Used for the request and thread caches.
- *
- * @author Aaron Zeckoski (azeckoski @ gmail.com)
- */
-public final class MapCache implements Cache {
-
-    private Map<String, Object> cache;
-
-    public Map<String, Object> getCache() {
-        return cache;
-    }
-
-    protected String name;
-    protected CacheConfig cacheConfig;
-
-    public MapCache(String name, CacheConfig cacheConfig) {
-        if (name == null) {
-            throw new IllegalArgumentException("name cannot be null");
-        }
-        this.name = name;
-        this.cache = new HashMap<String, Object>();
-        if (cacheConfig != null) {
-            this.cacheConfig = cacheConfig;
-        } else {
-            this.cacheConfig = new CacheConfig(CacheScope.REQUEST);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#clear()
-     */
-    public void clear() {
-        this.cache.clear();
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#exists(java.lang.String)
-     */
-    public boolean exists(String key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-        return this.cache.containsKey(key);
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#get(java.lang.String)
-     */
-    public Object get(String key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-        return this.cache.get(key);
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#getKeys()
-     */
-    public List<String> getKeys() {
-        return new ArrayList<String>(this.cache.keySet());
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#getConfig()
-     */
-    public CacheConfig getConfig() {
-        return this.cacheConfig;
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#getName()
-     */
-    public String getName() {
-        return this.name;
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#look(java.lang.String)
-     */
-    public Object look(String key) {
-        return get(key);
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#put(java.lang.String, java.io.Serializable)
-     */
-    public void put(String key, Object value) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-        this.cache.put(key, value);
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#remove(java.lang.String)
-     */
-    public boolean remove(String key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key cannot be null");
-        }
-        return this.cache.remove(key) != null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.dspace.services.model.Cache#size()
-     */
-    public int size() {
-        return this.cache.size();
-    }
-
-    @Override
-    public String toString() {
-        return "MapCache:name=" + getName() + ":Scope=" + cacheConfig.getCacheScope() + ":size=" + size();
-    }
-
-}
diff --git a/dspace-services/src/main/java/org/dspace/services/events/SystemEventService.java b/dspace-services/src/main/java/org/dspace/services/events/SystemEventService.java
index 39a1f41f6a..1787c688f6 100644
--- a/dspace-services/src/main/java/org/dspace/services/events/SystemEventService.java
+++ b/dspace-services/src/main/java/org/dspace/services/events/SystemEventService.java
@@ -7,20 +7,14 @@
  */
 package org.dspace.services.events;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.PreDestroy;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.dspace.services.CachingService;
 import org.dspace.services.EventService;
 import org.dspace.services.RequestService;
-import org.dspace.services.model.Cache;
-import org.dspace.services.model.CacheConfig;
-import org.dspace.services.model.CacheConfig.CacheScope;
 import org.dspace.services.model.Event;
 import org.dspace.services.model.Event.Scope;
 import org.dspace.services.model.EventListener;
@@ -40,24 +34,20 @@ public final class SystemEventService implements EventService {
 
     private final Logger log = LoggerFactory.getLogger(SystemEventService.class);
 
-    private static final String QUEUE_CACHE_NAME = "eventQueueCache";
-
     /**
      * Map for holding onto the listeners which is ClassLoader safe.
      */
     private final Map<String, EventListener> listenersMap = new ConcurrentHashMap<>();
 
     private final RequestService requestService;
-    private final CachingService cachingService;
     private EventRequestInterceptor requestInterceptor;
 
     @Autowired(required = true)
-    public SystemEventService(RequestService requestService, CachingService cachingService) {
-        if (requestService == null || cachingService == null) {
-            throw new IllegalArgumentException("requestService, cachingService, and all inputs must not be null");
+    public SystemEventService(RequestService requestService) {
+        if (requestService == null) {
+            throw new IllegalArgumentException("requestService and all inputs must not be null");
         }
         this.requestService = requestService;
-        this.cachingService = cachingService;
 
         // register interceptor
         this.requestInterceptor = new EventRequestInterceptor();
@@ -93,28 +83,6 @@ public final class SystemEventService implements EventService {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.dspace.services.EventService#queueEvent(org.dspace.services.model.Event)
-     */
-    @Override
-    public void queueEvent(Event event) {
-        validateEvent(event);
-
-        // get the cache
-        Cache queueCache = this.cachingService.getCache(QUEUE_CACHE_NAME, new CacheConfig(CacheScope.REQUEST));
-
-        // put the event in the queue if this is in a request
-        if (requestService.getCurrentRequestId() != null) {
-            // create a key which is orderable and unique
-            String key = System.currentTimeMillis() + ":" + queueCache.size() + ":" + event.getId();
-            queueCache.put(key, event);
-        } else {
-            // no request so fire the event immediately
-            log.info("No request to queue this event (" + event + ") so firing immediately");
-            fireEvent(event);
-        }
-    }
-
     /* (non-Javadoc)
      * @see org.dspace.services.EventService#registerEventListener(org.dspace.services.model.EventListener)
      */
@@ -143,10 +111,9 @@ public final class SystemEventService implements EventService {
                 try {
                     listener.receiveEvent(event);
                 } catch (Exception e) {
-                    log.warn("Listener (" + listener + ")[" + listener.getClass()
-                                                                      .getName() + "] failed to recieve event (" +
-                                 event + "): " + e
-                        .getMessage() + ":" + e.getCause());
+                    log.warn("Listener ({})[{}] failed to receive event ({}): {}:{}",
+                            listener, listener.getClass().getName(), event,
+                            e.getMessage(), e.getCause());
                 }
             }
         }
@@ -176,40 +143,6 @@ public final class SystemEventService implements EventService {
                 "external listeners: " + event);
     }
 
-    /**
-     * Fires all queued events for the current request.
-     *
-     * @return the number of events which were fired
-     */
-    protected int fireQueuedEvents() {
-        int fired = 0;
-        Cache queueCache = this.cachingService.getCache(QUEUE_CACHE_NAME, new CacheConfig(CacheScope.REQUEST));
-
-        List<String> eventIds = queueCache.getKeys();
-        Collections.sort(eventIds); // put it in the order they were added (hopefully)
-        if (eventIds.size() > 0) {
-            for (String eventId : eventIds) {
-                Event event = (Event) queueCache.get(eventId);
-                fireEvent(event);
-                fired++;
-            }
-        }
-        queueCache.clear();
-        return fired;
-    }
-
-    /**
-     * Clears all events for the current request.
-     *
-     * @return the number of events that were cleared
-     */
-    protected int clearQueuedEvents() {
-        Cache queueCache = this.cachingService.getCache(QUEUE_CACHE_NAME, new CacheConfig(CacheScope.REQUEST));
-        int cleared = queueCache.size();
-        queueCache.clear();
-        return cleared;
-    }
-
     /**
      * This will validate the event object and set any values which are
      * unset but can be figured out.
@@ -265,10 +198,8 @@ public final class SystemEventService implements EventService {
                 }
             }
         } catch (Exception e1) {
-            log.warn("Listener (" + listener + ")[" + listener.getClass()
-                                                              .getName() + "] failure calling getEventNamePrefixes: "
-                         + e1
-                .getMessage() + ":" + e1.getCause());
+            log.warn("Listener ({})[{}] failure calling getEventNamePrefixes: {}:{}",
+                    listener, listener.getClass().getName(), e1.getMessage(), e1.getCause());
         }
         boolean allowResource = true;
         try {
@@ -286,9 +217,8 @@ public final class SystemEventService implements EventService {
                 }
             }
         } catch (Exception e1) {
-            log.warn("Listener (" + listener + ")[" + listener.getClass()
-                                                              .getName() + "] failure calling getResourcePrefix: " + e1
-                .getMessage() + ":" + e1.getCause());
+            log.warn("Listener ({})[{}] failure calling getResourcePrefix: {}:{}",
+                    listener, listener.getClass().getName(), e1.getMessage(), e1.getCause());
         }
 
         return allowName && allowResource;
@@ -328,14 +258,6 @@ public final class SystemEventService implements EventService {
          */
         @Override
         public void onEnd(String requestId, boolean succeeded, Exception failure) {
-            if (succeeded) {
-                int fired = fireQueuedEvents();
-                log.debug("Fired " + fired + " events at the end of the request (" + requestId + ")");
-            } else {
-                int cleared = clearQueuedEvents();
-                log.debug(
-                    "Cleared/cancelled " + cleared + " events at the end of the failed request (" + requestId + ")");
-            }
         }
 
         /* (non-Javadoc)
diff --git a/dspace-services/src/main/java/org/dspace/services/factory/DSpaceServicesFactory.java b/dspace-services/src/main/java/org/dspace/services/factory/DSpaceServicesFactory.java
index 0e91388b7d..eec5a69a17 100644
--- a/dspace-services/src/main/java/org/dspace/services/factory/DSpaceServicesFactory.java
+++ b/dspace-services/src/main/java/org/dspace/services/factory/DSpaceServicesFactory.java
@@ -8,7 +8,6 @@
 package org.dspace.services.factory;
 
 import org.dspace.kernel.ServiceManager;
-import org.dspace.services.CachingService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.EmailService;
 import org.dspace.services.EventService;
@@ -20,8 +19,6 @@ import org.dspace.utils.DSpace;
  * implementation
  */
 public abstract class DSpaceServicesFactory {
-    public abstract CachingService getCachingService();
-
     public abstract ConfigurationService getConfigurationService();
 
     public abstract EmailService getEmailService();
diff --git a/dspace-services/src/main/java/org/dspace/services/factory/DSpaceServicesFactoryImpl.java b/dspace-services/src/main/java/org/dspace/services/factory/DSpaceServicesFactoryImpl.java
index 328f49bfc1..9e3fa0ae4e 100644
--- a/dspace-services/src/main/java/org/dspace/services/factory/DSpaceServicesFactoryImpl.java
+++ b/dspace-services/src/main/java/org/dspace/services/factory/DSpaceServicesFactoryImpl.java
@@ -8,7 +8,6 @@
 package org.dspace.services.factory;
 
 import org.dspace.kernel.ServiceManager;
-import org.dspace.services.CachingService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.EmailService;
 import org.dspace.services.EventService;
@@ -21,9 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class DSpaceServicesFactoryImpl extends DSpaceServicesFactory {
 
-    @Autowired(required = true)
-    private CachingService cachingService;
-
     @Autowired(required = true)
     private ConfigurationService configurationService;
 
@@ -39,11 +35,6 @@ public class DSpaceServicesFactoryImpl extends DSpaceServicesFactory {
     @Autowired(required = true)
     private ServiceManager serviceManager;
 
-    @Override
-    public CachingService getCachingService() {
-        return cachingService;
-    }
-
     @Override
     public ConfigurationService getConfigurationService() {
         return configurationService;
diff --git a/dspace-services/src/main/resources/caching/ehcache-config.xml b/dspace-services/src/main/resources/caching/ehcache-config.xml
deleted file mode 100644
index bd32b38740..0000000000
--- a/dspace-services/src/main/resources/caching/ehcache-config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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/
-
--->
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="ehcache.xsd"
-         updateCheck='false'>
-
-    <!-- WARNING: If you are running multiple DSpace instances on the same server, make sure to start
-         each DSpace instance with another value for java.io.tmpdir !!! -->
-
-    <diskStore path="java.io.tmpdir"/>
-
-    <!--
-    Mandatory Default Cache configuration. These settings will be applied to caches
-    created programmtically using CacheManager.add(String cacheName).
-
-    The defaultCache has an implicit name "default" which is a reserved cache name.
-    -->
-    <defaultCache
-            maxElementsInMemory="3000"
-            eternal="false"
-            timeToIdleSeconds="600"
-            timeToLiveSeconds="1200"
-            overflowToDisk="true"
-            diskSpoolBufferSizeMB="30"
-            maxElementsOnDisk="10000"
-            diskPersistent="false"
-            diskExpiryThreadIntervalSeconds="120"
-            memoryStoreEvictionPolicy="LRU">
-    </defaultCache>
-
-</ehcache>
diff --git a/dspace-services/src/main/resources/caching/ehcache.xsd b/dspace-services/src/main/resources/caching/ehcache.xsd
deleted file mode 100644
index 349734c184..0000000000
--- a/dspace-services/src/main/resources/caching/ehcache.xsd
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
-    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/
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.7">
-
-    <xs:element name="ehcache">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="1" minOccurs="0" ref="diskStore"/>
-                <xs:element maxOccurs="1" minOccurs="0" ref="transactionManagerLookup"/>
-                <xs:element maxOccurs="1" minOccurs="0" ref="cacheManagerEventListenerFactory"/>
-                <xs:element maxOccurs="unbounded" minOccurs="0" ref="cacheManagerPeerProviderFactory"/>
-                <xs:element maxOccurs="unbounded" minOccurs="0" ref="cacheManagerPeerListenerFactory"/>
-                <xs:element maxOccurs="1" minOccurs="0" ref="terracottaConfig"/>
-                <xs:element ref="defaultCache"/>
-                <xs:element maxOccurs="unbounded" minOccurs="0" ref="cache"/>
-            </xs:sequence>
-            <xs:attribute name="name" use="optional"/>
-            <xs:attribute default="true" name="updateCheck" type="xs:boolean" use="optional"/>
-            <xs:attribute default="autodetect" name="monitoring" type="monitoringType" use="optional"/>
-            <xs:attribute default="true" name="dynamicConfig" type="xs:boolean" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="diskStore">
-        <xs:complexType>
-            <xs:attribute name="path" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-     <xs:element name="transactionManagerLookup">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cacheManagerEventListenerFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cacheManagerPeerProviderFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cacheManagerPeerListenerFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="terracottaConfig">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="1" minOccurs="0" name="tc-config">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:any maxOccurs="unbounded" minOccurs="0" processContents="skip"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-            <xs:attribute default="localhost:9510" name="url" use="optional"/>
-            <xs:attribute name="registerStatsMBean" type="xs:boolean" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- add clone support for addition of cacheExceptionHandler. Important! -->
-    <xs:element name="defaultCache">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheEventListenerFactory"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheExtensionFactory"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheLoaderFactory"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="bootstrapCacheLoaderFactory"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="cacheExceptionHandlerFactory"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="terracotta"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="cacheWriter"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="copyStrategy"/>
-            </xs:sequence>
-            <xs:attribute name="diskExpiryThreadIntervalSeconds" type="xs:integer" use="optional"/>
-            <xs:attribute name="diskSpoolBufferSizeMB" type="xs:integer" use="optional"/>
-            <xs:attribute name="diskPersistent" type="xs:boolean" use="optional"/>
-            <xs:attribute name="diskAccessStripes" type="xs:integer" use="optional" default="1"/>
-            <xs:attribute name="eternal" type="xs:boolean" use="required"/>
-            <xs:attribute name="maxElementsInMemory" type="xs:integer" use="required"/>
-            <xs:attribute name="clearOnFlush" type="xs:boolean" use="optional"/>
-            <xs:attribute name="memoryStoreEvictionPolicy" type="xs:string" use="optional"/>
-            <xs:attribute name="overflowToDisk" type="xs:boolean" use="required"/>
-            <xs:attribute name="timeToIdleSeconds" type="xs:integer" use="optional"/>
-            <xs:attribute name="timeToLiveSeconds" type="xs:integer" use="optional"/>
-            <xs:attribute name="maxElementsOnDisk" type="xs:integer" use="optional"/>
-            <xs:attribute name="transactionalMode" type="transactionalMode" use="optional" default="off"/>
-            <xs:attribute name="statistics" type="xs:boolean" use="optional" default="false"/>
-            <xs:attribute name="copyOnRead" type="xs:boolean" use="optional" default="false"/>
-            <xs:attribute name="copyOnWrite" type="xs:boolean" use="optional" default="false"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cache">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheEventListenerFactory"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheExtensionFactory"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheLoaderFactory"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="cacheDecoratorFactory"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="bootstrapCacheLoaderFactory"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="cacheExceptionHandlerFactory"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="terracotta"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="cacheWriter"/>
-                <xs:element minOccurs="0" maxOccurs="1" ref="copyStrategy"/>
-            </xs:sequence>
-            <xs:attribute name="diskExpiryThreadIntervalSeconds" type="xs:integer" use="optional"/>
-            <xs:attribute name="diskSpoolBufferSizeMB" type="xs:integer" use="optional"/>
-            <xs:attribute name="diskPersistent" type="xs:boolean" use="optional"/>
-            <xs:attribute name="diskAccessStripes" type="xs:integer" use="optional" default="1"/>
-            <xs:attribute name="eternal" type="xs:boolean" use="required"/>
-            <xs:attribute name="maxElementsInMemory" type="xs:integer" use="required"/>
-            <xs:attribute name="memoryStoreEvictionPolicy" type="xs:string" use="optional"/>
-            <xs:attribute name="clearOnFlush" type="xs:boolean" use="optional"/>
-            <xs:attribute name="name" type="xs:string" use="required"/>
-            <xs:attribute name="overflowToDisk" type="xs:boolean" use="required"/>
-            <xs:attribute name="timeToIdleSeconds" type="xs:integer" use="optional"/>
-            <xs:attribute name="timeToLiveSeconds" type="xs:integer" use="optional"/>
-            <xs:attribute name="maxElementsOnDisk" type="xs:integer" use="optional"/>
-            <xs:attribute name="transactionalMode" type="transactionalMode" use="optional" default="off" />
-            <xs:attribute name="statistics" type="xs:boolean" use="optional" default="false"/>
-            <xs:attribute name="copyOnRead" type="xs:boolean" use="optional" default="false"/>
-            <xs:attribute name="copyOnWrite" type="xs:boolean" use="optional" default="false"/>
-            <xs:attribute name="logging" type="xs:boolean" use="optional" default="false"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cacheEventListenerFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-            <xs:attribute name="listenFor" use="optional" type="notificationScope" default="all"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="bootstrapCacheLoaderFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cacheExtensionFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cacheExceptionHandlerFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cacheLoaderFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="cacheDecoratorFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="terracotta">
-        <xs:complexType>
-            <xs:attribute name="clustered" use="optional" type="xs:boolean" default="true"/>
-            <xs:attribute name="valueMode" use="optional" type="terracottaCacheValueType" default="serialization"/>
-            <xs:attribute name="coherentReads" use="optional" type="xs:boolean" default="true"/>
-            <xs:attribute name="localKeyCache" use="optional" type="xs:boolean" default="false"/>
-            <xs:attribute name="localKeyCacheSize" use="optional" type="xs:positiveInteger" default="300000"/>
-            <xs:attribute name="orphanEviction" use="optional" type="xs:boolean" default="true"/>
-            <xs:attribute name="orphanEvictionPeriod" use="optional" type="xs:positiveInteger" default="4"/>
-            <xs:attribute name="copyOnRead" use="optional" type="xs:boolean" default="false"/>
-            <xs:attribute name="coherent" use="optional" type="xs:boolean" default="true"/>
-            <xs:attribute name="synchronousWrites" use="optional" type="xs:boolean" default="false"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:simpleType name="monitoringType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="autodetect"/>
-            <xs:enumeration value="on"/>
-            <xs:enumeration value="off"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="terracottaCacheValueType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="serialization" />
-            <xs:enumeration value="identity" />
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="transactionalMode">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="off"/>
-            <xs:enumeration value="xa"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:element name="cacheWriter">
-        <xs:complexType>
-            <xs:sequence >
-                <xs:element minOccurs="0" maxOccurs="1" ref="cacheWriterFactory"/>
-            </xs:sequence>
-            <xs:attribute name="writeMode" use="optional" type="writeModeType" default="write-through"/>
-            <xs:attribute name="notifyListenersOnException" use="optional" type="xs:boolean" default="false"/>
-            <xs:attribute name="minWriteDelay" use="optional" type="xs:nonNegativeInteger" default="1"/>
-            <xs:attribute name="maxWriteDelay" use="optional" type="xs:nonNegativeInteger" default="1"/>
-            <xs:attribute name="rateLimitPerSecond" use="optional" type="xs:nonNegativeInteger" default="0"/>
-            <xs:attribute name="writeCoalescing" use="optional" type="xs:boolean" default="false"/>
-            <xs:attribute name="writeBatching" use="optional" type="xs:boolean" default="false"/>
-            <xs:attribute name="writeBatchSize" use="optional" type="xs:positiveInteger" default="1"/>
-            <xs:attribute name="retryAttempts" use="optional" type="xs:nonNegativeInteger" default="0"/>
-            <xs:attribute name="retryAttemptDelaySeconds" use="optional" type="xs:nonNegativeInteger" default="1"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:simpleType name="writeModeType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="write-through" />
-            <xs:enumeration value="write-behind" />
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:element name="cacheWriterFactory">
-        <xs:complexType>
-            <xs:attribute name="class" use="required"/>
-            <xs:attribute name="properties" use="optional"/>
-            <xs:attribute name="propertySeparator" use="optional"/>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="copyStrategy">
-        <xs:complexType>
-            <xs:attribute name="class" use="required" type="xs:string" />
-        </xs:complexType>
-    </xs:element>
-
-    <xs:simpleType name="notificationScope">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="local"/>
-            <xs:enumeration value="remote"/>
-            <xs:enumeration value="all"/>
-        </xs:restriction>
-    </xs:simpleType>
-</xs:schema>
diff --git a/dspace-services/src/main/resources/spring/spring-dspace-core-services.xml b/dspace-services/src/main/resources/spring/spring-dspace-core-services.xml
index fc769bd7fd..04c2576d4b 100644
--- a/dspace-services/src/main/resources/spring/spring-dspace-core-services.xml
+++ b/dspace-services/src/main/resources/spring/spring-dspace-core-services.xml
@@ -32,28 +32,6 @@
     </bean>
     <!-- end PROPERTY PLACEHOLDER SETUP-->
 
-    <!-- CACHING service beans -->
-    <bean id="org.dspace.services.CachingService" class="org.dspace.services.caching.CachingServiceImpl"/>
-
-    <!-- This is the main cache manager -->
-    <bean id="org.dspace.caching.ehcache.CacheManager"
-          class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
-        <property name="configLocation">
-            <bean class="org.dspace.servicemanager.spring.ResourceFinder"
-                  factory-method="getResourceFromPaths">
-                <constructor-arg>
-                    <list>
-                        <value>ehcache-config.xml</value>
-                        <value>caching/ehcache-config.xml</value>
-                    </list>
-                </constructor-arg>
-            </bean>
-        </property>
-        <property name='acceptExisting' value='true'/>
-        <property name='cacheManagerName' value='org.dspace.services'/>
-    </bean>
-    <!-- CACHING end beans -->
-
     <!-- REQUEST - request service (implemented as a single bean) -->
     <bean id="org.dspace.services.RequestService" class="org.dspace.services.sessions.StatelessRequestServiceImpl"/>
     <!-- REQUEST end beans -->
diff --git a/dspace-services/src/test/java/org/dspace/services/caching/CachingServiceTest.java b/dspace-services/src/test/java/org/dspace/services/caching/CachingServiceTest.java
deleted file mode 100644
index 7236a04f58..0000000000
--- a/dspace-services/src/test/java/org/dspace/services/caching/CachingServiceTest.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.services.caching;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.dspace.services.RequestService;
-import org.dspace.services.caching.model.EhcacheCache;
-import org.dspace.services.caching.model.MapCache;
-import org.dspace.services.model.Cache;
-import org.dspace.services.model.CacheConfig;
-import org.dspace.services.model.CacheConfig.CacheScope;
-import org.dspace.test.DSpaceAbstractKernelTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * Testing the caching service
- *
- * @author Aaron Zeckoski (azeckoski @ gmail.com)
- */
-public class CachingServiceTest extends DSpaceAbstractKernelTest {
-
-    private CachingServiceImpl cachingService;
-    private RequestService requestService;
-
-    @Before
-    public void init() {
-        cachingService = getService(CachingServiceImpl.class);
-        requestService = getService(RequestService.class);
-        assertNotNull(cachingService);
-        assertNotNull(requestService);
-    }
-
-    @After
-    public void tearDown() {
-        cachingService = null;
-        requestService = null;
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.CachingServiceImpl#reloadConfig()}.
-     */
-    @Test
-    public void testReloadConfig() {
-        // just make sure no failure
-        cachingService.reloadConfig();
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.CachingServiceImpl#notifyForConfigNames()}.
-     */
-    @Test
-    public void testNotifyForConfigNames() {
-        assertNotNull(cachingService.notifyForConfigNames());
-    }
-
-    /**
-     * Test method for
-     * {@link org.dspace.services.caching.CachingServiceImpl#instantiateEhCache(java.lang.String, org.dspace.services.model.CacheConfig)}.
-     */
-    @Test
-    public void testInstantiateEhCache() {
-        EhcacheCache cache = cachingService.instantiateEhCache("aaronz-eh", null); // make default ehcache
-        assertNotNull(cache);
-        assertEquals("aaronz-eh", cache.getName());
-        assertNotNull(cache.getCache());
-        assertEquals(0, cache.size());
-        assertNotNull(cache.getConfig());
-        assertEquals(cache.getConfig().getCacheScope(), CacheScope.INSTANCE);
-
-        EhcacheCache cache2 = cachingService.instantiateEhCache("aaronz-eh", null);
-        assertNotNull(cache2);
-        assertEquals(cache2, cache);
-
-        //trash the references
-        cache = cache2 = null;
-    }
-
-    /**
-     * Test method for
-     * {@link org.dspace.services.caching.CachingServiceImpl#instantiateMapCache(java.lang.String, org.dspace.services.model.CacheConfig)}.
-     */
-    @Test
-    public void testInstantiateMapCache() {
-        requestService.startRequest();
-
-        MapCache cache = cachingService.instantiateMapCache("aaronz-map", null);
-        assertNotNull(cache);
-        assertEquals("aaronz-map", cache.getName());
-        assertNotNull(cache.getCache());
-        assertEquals(0, cache.size());
-        assertNotNull(cache.getConfig());
-        assertEquals(cache.getConfig().getCacheScope(), CacheScope.REQUEST);
-
-        MapCache cache2 = cachingService.instantiateMapCache("aaronz-map", null);
-        assertNotNull(cache2);
-        assertEquals(cache2, cache);
-
-        requestService.endRequest(null);
-
-        //trash the references
-        cache = cache2 = null;
-    }
-
-    /**
-     * Test method for
-     * {@link org.dspace.services.caching.CachingServiceImpl#getCache(java.lang.String, org.dspace.services.model.CacheConfig)}.
-     */
-    @Test
-    public void testGetCache() {
-        // test getting ehcache from the config
-        Cache cache = cachingService.getCache("org.dspace.caching.MemOnly", null);
-        assertNotNull(cache);
-        assertEquals("org.dspace.caching.MemOnly", cache.getName());
-
-        // test getting ehcache from bean
-        Cache sampleCache = cachingService.getCache("org.sakaiproject.caching.test.SampleCache", null);
-        assertNotNull(sampleCache);
-        assertEquals("org.sakaiproject.caching.test.SampleCache", sampleCache.getName());
-
-        // test making new caches
-        Cache c1 = cachingService.getCache("org.dspace.aztest", null);
-        assertNotNull(c1);
-        assertEquals("org.dspace.aztest", c1.getName());
-        assertEquals(CacheScope.INSTANCE, c1.getConfig().getCacheScope());
-        assertTrue(c1 instanceof EhcacheCache);
-
-        requestService.startRequest();
-
-        Cache rc1 = cachingService.getCache("org.dspace.request.cache1", new CacheConfig(CacheScope.REQUEST));
-        assertNotNull(rc1);
-        assertEquals("org.dspace.request.cache1", rc1.getName());
-        assertEquals(CacheScope.REQUEST, rc1.getConfig().getCacheScope());
-        assertTrue(rc1 instanceof MapCache);
-
-        requestService.endRequest(null);
-
-        // try getting the same one twice
-        Cache c2 = cachingService.getCache("org.dspace.aztest", null);
-        assertNotNull(c2);
-        assertEquals(c1, c2);
-
-        //trash the references
-        cache = sampleCache = c1 = rc1 = c2 = null;
-
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.CachingServiceImpl#getCaches()}.
-     */
-    @Test
-    public void testGetCaches() {
-        List<Cache> caches = cachingService.getCaches();
-        assertNotNull(caches);
-        int curSize = caches.size();
-        assertTrue(curSize > 0);
-
-        Cache memCache = cachingService.getCache("org.dspace.caching.MemOnly", null);
-        assertNotNull(memCache);
-        assertTrue(caches.contains(memCache));
-
-        // This should create a new cache (as cache name is unique)
-        Cache c1 = cachingService.getCache("org.dspace.timtest.newcache", null);
-        assertNotNull(c1);
-
-        // Test that new cache was created and total caches increases by one
-        caches = cachingService.getCaches();
-        assertNotNull(caches);
-        assertEquals(curSize + 1, caches.size());
-        assertTrue(caches.contains(c1));
-
-        //trash the references
-        memCache = c1 = null;
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.CachingServiceImpl#getStatus(java.lang.String)}.
-     */
-    @Test
-    public void testGetStatus() {
-        String status = cachingService.getStatus(null);
-        assertNotNull(status);
-
-        // make sure invalid cache is not a failure
-        status = cachingService.getStatus("XXXXXXXXX");
-        assertNotNull(status);
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.CachingServiceImpl#resetCaches()}.
-     */
-    @Test
-    public void testResetCaches() {
-        cachingService.resetCaches();
-
-        // now add new cache
-        Cache c1 = cachingService.getCache("org.dspace.aztest.new", null);
-        assertNotNull(c1);
-        c1.put("AZ", "aaron.zeckoski");
-        c1.put("BZ", "becky.zeckoski");
-        assertEquals("aaron.zeckoski", c1.get("AZ"));
-        assertEquals(null, c1.get("CZ"));
-        assertEquals(2, c1.size());
-
-        cachingService.resetCaches();
-
-        assertEquals(null, c1.get("AZ"));
-        assertEquals(0, c1.size());
-
-        c1 = null;
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.CachingServiceImpl#destroyCache(java.lang.String)}.
-     */
-    @Test
-    public void testDestroyCache() {
-        // destroy existing cache
-        Cache cache = cachingService.getCache("org.dspace.caching.MemOnly", null);
-        assertNotNull(cache);
-
-        cachingService.destroyCache(cache.getName());
-
-        Cache c2 = cachingService.getCache("org.dspace.caching.MemOnly", null);
-        assertNotNull(c2);
-        assertNotSame(cache, c2);
-
-        // ok to destroy non-existent caches
-        cachingService.destroyCache("XXXXXXXXXXXX");
-
-        // destroy new cache
-        Cache ca = cachingService.getCache("org.dspace.aztest", null);
-        assertNotNull(ca);
-
-        cachingService.destroyCache(ca.getName());
-
-        Cache cb = cachingService.getCache("org.dspace.aztest", null);
-        assertNotNull(cb);
-        assertNotSame(ca, cb);
-
-        //trash the references
-        cache = c2 = ca = cb = null;
-    }
-
-}
diff --git a/dspace-services/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java b/dspace-services/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java
deleted file mode 100644
index 271d39b6ce..0000000000
--- a/dspace-services/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * 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/
- */
-package org.dspace.services.caching;
-
-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 static org.junit.Assert.fail;
-
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import org.dspace.services.caching.model.EhcacheCache;
-import org.dspace.services.model.Cache;
-import org.dspace.services.model.CacheConfig;
-import org.dspace.services.model.CacheConfig.CacheScope;
-import org.dspace.test.DSpaceAbstractKernelTest;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-/**
- * Testing the functionality of the DSpace caches
- *
- * @author Aaron Zeckoski (azeckoski @ gmail.com)
- */
-public class EhcacheCacheTest extends DSpaceAbstractKernelTest {
-
-    static String cacheName = "org.dspace.aaronz.test.Cache";
-    static CacheManager cacheManager;
-    static Cache cache = null;
-
-    @BeforeClass
-    public static void initClass() {
-        CachingServiceImpl cachingService = getService(CachingServiceImpl.class);
-        cacheManager = cachingService.getCacheManager();
-        cache = cachingService.getCache(cacheName, new CacheConfig(CacheScope.INSTANCE));
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-        if (cacheManager != null) {
-            cacheManager.shutdown();
-        }
-        cacheManager = null;
-        cache = null;
-    }
-
-    @Before
-    public void init() {
-        cache.clear();
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#getCache()}.
-     */
-    @Test
-    public void testGetCache() {
-        assertTrue(cache instanceof EhcacheCache);
-        assertNotNull(((EhcacheCache) cache).getCache());
-    }
-
-    /**
-     * Test method for
-     * {@link org.dspace.services.caching.model.EhcacheCache#EhcacheCache(net.sf.ehcache.Ehcache, org.dspace.services.model.CacheConfig)}.
-     */
-    @Test
-    public void testEhcacheCache() {
-        cacheManager.addCache("org.dspace.ehcache");
-        Ehcache ehcache = cacheManager.getEhcache("org.dspace.ehcache");
-        assertNotNull(ehcache);
-
-        EhcacheCache cache = new EhcacheCache(ehcache, new CacheConfig(CacheScope.INSTANCE));
-        assertEquals("org.dspace.ehcache", cache.getName());
-
-        //trash the references
-        ehcache = null;
-        cache = null;
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#getConfig()}.
-     */
-    @Test
-    public void testGetConfig() {
-        CacheConfig cacheConfig = cache.getConfig();
-        assertNotNull(cacheConfig);
-
-        cacheConfig = null;
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#getName()}.
-     */
-    @Test
-    public void testGetName() {
-        String name = cache.getName();
-        assertNotNull(name);
-        assertEquals(cacheName, name);
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#clear()}.
-     */
-    @Test
-    public void testClear() {
-        cache.put("XX", "XXXX");
-        assertTrue(cache.size() > 0);
-        cache.clear();
-        assertEquals(0, cache.size());
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#exists(java.lang.String)}.
-     */
-    @Test
-    public void testExists() {
-        assertFalse(cache.exists("XXX"));
-        cache.put("XXX", 123);
-        assertTrue(cache.exists("XXX"));
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#get(java.lang.String)}.
-     */
-    @Test
-    public void testGet() {
-        cache.put("XXX", 123);
-        Integer i = (Integer) cache.get("XXX");
-        assertNotNull(i);
-        assertEquals(new Integer(123), i);
-
-        Object o = cache.get("YYYYYYYY");
-        assertNull(o);
-
-        try {
-            cache.get(null);
-            fail("Should have thrown exception");
-        } catch (IllegalArgumentException e) {
-            assertNotNull(e.getMessage());
-        }
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#look(java.lang.String)}.
-     */
-    @Test
-    public void testLook() {
-        cache.put("XXX", "AZ");
-        String thing = (String) cache.look("XXX");
-        assertNotNull(thing);
-        assertEquals("AZ", thing);
-
-        // TODO better way to test this
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#put(java.lang.String, java.lang.Object)}.
-     */
-    @Test
-    public void testPut() {
-        assertEquals(0, cache.size());
-        cache.put("XXX", 123);
-        assertEquals(1, cache.size());
-        cache.put("YYY", null);
-        assertEquals(2, cache.size());
-        cache.put("XXX", "ABC");
-        assertEquals(2, cache.size());
-        cache.put("XXX", null);
-        assertEquals(2, cache.size());
-        Object o = cache.get("XXX");
-        assertNull(o);
-
-        try {
-            cache.put(null, "XXX");
-            fail("Should have thrown exception");
-        } catch (IllegalArgumentException e) {
-            assertNotNull(e.getMessage());
-        }
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#remove(java.lang.String)}.
-     */
-    @Test
-    public void testRemove() {
-        cache.put("XXX", 123);
-        cache.put("YYY", null);
-        assertEquals(2, cache.size());
-        cache.remove("XXX");
-        assertEquals(1, cache.size());
-        cache.remove("XXX");
-        assertEquals(1, cache.size());
-        cache.remove("ZZZ");
-        assertEquals(1, cache.size());
-
-        try {
-            cache.remove(null);
-            fail("Should have thrown exception");
-        } catch (IllegalArgumentException e) {
-            assertNotNull(e.getMessage());
-        }
-    }
-
-    /**
-     * Test method for {@link org.dspace.services.caching.model.EhcacheCache#size()}.
-     */
-    @Test
-    public void testSize() {
-        assertEquals(0, cache.size());
-        cache.put("A", "AASSDDFF");
-        assertEquals(1, cache.size());
-        cache.put("B", "AASSDDFF");
-        cache.put("C", "AASSDDFF");
-        assertEquals(3, cache.size());
-    }
-
-}
diff --git a/dspace-services/src/test/java/org/dspace/services/events/EventServiceTest.java b/dspace-services/src/test/java/org/dspace/services/events/EventServiceTest.java
index afe11c7acd..cbddbf5457 100644
--- a/dspace-services/src/test/java/org/dspace/services/events/EventServiceTest.java
+++ b/dspace-services/src/test/java/org/dspace/services/events/EventServiceTest.java
@@ -101,53 +101,6 @@ public class EventServiceTest extends DSpaceAbstractKernelTest {
         assertEquals(event5, listenerBothFilters.getReceivedEvents().get(2));
     }
 
-    /**
-     * Test method for
-     * {@link org.dspace.services.events.SystemEventService#queueEvent(org.dspace.services.model.Event)}.
-     */
-    @Test
-    public void testQueueEvent() {
-        Event event1 = new Event("test.event.read", "test-resource-1", "11111", false);
-        Event event2 = new Event("test.event.jump", null, "11111", false);
-        Event event3 = new Event("some.event.write", "test-resource-2", "11111", true);
-        Event event4 = new Event("some.event.add", "fake-resource-555", "11111", true);
-
-        assertEquals(0, listenerNoFilter.getReceivedEvents().size());
-
-        // no request, so it fires now
-        eventService.queueEvent(event1);
-
-        // now check that the listeners were properly triggered
-        assertEquals(1, listenerNoFilter.getReceivedEvents().size());
-
-        // now start a request
-        requestService.startRequest();
-        eventService.queueEvent(event2);
-        eventService.queueEvent(event3);
-
-        // not yet fired
-        assertEquals(1, listenerNoFilter.getReceivedEvents().size());
-
-        // fail request
-        requestService.endRequest(new RuntimeException("die request!"));
-
-        // still nothing because fail
-        assertEquals(1, listenerNoFilter.getReceivedEvents().size());
-
-        // try a successful one
-        requestService.startRequest();
-        eventService.queueEvent(event2);
-        eventService.queueEvent(event3);
-        eventService.queueEvent(event4);
-        requestService.endRequest(null);
-
-        assertEquals(4, listenerNoFilter.getReceivedEvents().size());
-        assertEquals(event1, listenerNoFilter.getReceivedEvents().get(0));
-        assertEquals(event2, listenerNoFilter.getReceivedEvents().get(1));
-        assertEquals(event3, listenerNoFilter.getReceivedEvents().get(2));
-        assertEquals(event4, listenerNoFilter.getReceivedEvents().get(3));
-    }
-
     /**
      * Test method for
      * {@link org.dspace.services.events.SystemEventService#registerEventListener(org.dspace.services.model.EventListener)}.
diff --git a/dspace-services/src/test/java/org/dspace/services/session/StatelessRequestServiceImplTest.java b/dspace-services/src/test/java/org/dspace/services/session/StatelessRequestServiceImplTest.java
index 4fccf9f36a..7b41a295e3 100644
--- a/dspace-services/src/test/java/org/dspace/services/session/StatelessRequestServiceImplTest.java
+++ b/dspace-services/src/test/java/org/dspace/services/session/StatelessRequestServiceImplTest.java
@@ -13,17 +13,12 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.dspace.services.CachingService;
-import org.dspace.services.model.Cache;
-import org.dspace.services.model.CacheConfig;
-import org.dspace.services.model.CacheConfig.CacheScope;
 import org.dspace.services.sessions.StatelessRequestServiceImpl;
 import org.dspace.test.DSpaceAbstractKernelTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-
 /**
  * Testing the request and session services
  *
@@ -32,20 +27,16 @@ import org.junit.Test;
 public class StatelessRequestServiceImplTest extends DSpaceAbstractKernelTest {
 
     private StatelessRequestServiceImpl statelessRequestService;
-    private CachingService cachingService;
 
     @Before
     public void before() {
         statelessRequestService = getService(StatelessRequestServiceImpl.class);
-        cachingService = getService(CachingService.class);
     }
 
     @After
     public void after() {
         statelessRequestService.clear();
-        cachingService.resetCaches();
         statelessRequestService = null;
-        cachingService = null;
     }
 
     /**
@@ -68,7 +59,6 @@ public class StatelessRequestServiceImplTest extends DSpaceAbstractKernelTest {
         assertNotNull(requestId);
 
         statelessRequestService.endRequest(null);
-        assertNull(getRequestCache());
     }
 
     /**
@@ -140,13 +130,4 @@ public class StatelessRequestServiceImplTest extends DSpaceAbstractKernelTest {
         requestId = statelessRequestService.getCurrentRequestId();
         assertNull(requestId); // no request yet
     }
-
-
-    /**
-     * @return the request storage cache
-     */
-    private Cache getRequestCache() {
-        return cachingService.getCache(CachingService.REQUEST_CACHE, new CacheConfig(CacheScope.REQUEST));
-    }
-
 }
diff --git a/dspace-services/src/test/resources/ehcache-config.xml b/dspace-services/src/test/resources/ehcache-config.xml
deleted file mode 100644
index 363a61ee70..0000000000
--- a/dspace-services/src/test/resources/ehcache-config.xml
+++ /dev/null
@@ -1,527 +0,0 @@
-<?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/
-
--->
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ehcache.xsd">
-
-    <!-- Sets the path to the directory where cache .data files are created.
-
-         If the path is a Java System Property it is replaced by
-         its value in the running VM.
-
-         The following properties are translated:
-         user.home - User's home directory
-         user.dir - User's current working directory
-         java.io.tmpdir - Default temp file path -->
-
-    <diskStore path="java.io.tmpdir"/>
-
-
-    <!--
-    Cache configuration
-    ===================
-
-    The following attributes are required.
-
-    name:
-    Sets the name of the cache. This is used to identify the cache. It must be unique.
-
-    maxElementsInMemory:
-    Sets the maximum number of objects that will be created in memory
-
-        maxElementsOnDisk:
-    Sets the maximum number of objects that will be maintained in the DiskStore
-        The default value is zero, meaning unlimited.
-
-    eternal:
-    Sets whether elements are eternal. If eternal,  timeouts are ignored and the
-    element is never expired.
-
-    overflowToDisk:
-    Sets whether elements can overflow to disk when the memory store
-    has reached the maxInMemory limit.
-
-    The following attributes and elements are optional.
-
-    timeToIdleSeconds:
-    Sets the time to idle for an element before it expires.
-    i.e. The maximum amount of time between accesses before an element expires
-    Is only used if the element is not eternal.
-    Optional attribute. A value of 0 means that an Element can idle for infinity.
-    The default value is 0.
-
-    timeToLiveSeconds:
-    Sets the time to live for an element before it expires.
-    i.e. The maximum time between creation time and when an element expires.
-    Is only used if the element is not eternal.
-    Optional attribute. A value of 0 means that and Element can live for infinity.
-    The default value is 0.
-
-    diskPersistent:
-    Whether the disk store persists between restarts of the Virtual Machine.
-    The default value is false.
-
-    diskExpiryThreadIntervalSeconds:
-    The number of seconds between runs of the disk expiry thread. The default value
-    is 120 seconds.
-
-    diskSpoolBufferSizeMB:
-    This is the size to allocate the DiskStore for a spool buffer. Writes are made
-    to this area and then asynchronously written to disk. The default size is 30MB.
-    Each spool buffer is used only by its cache. If you get OutOfMemory errors consider
-    lowering this value. To improve DiskStore performance consider increasing it. Trace level
-    logging in the DiskStore will show if put back ups are occurring.
-
-    memoryStoreEvictionPolicy:
-    Policy would be enforced upon reaching the maxElementsInMemory limit. Default
-    policy is Least Recently Used (specified as LRU). Other policies available -
-    First In First Out (specified as FIFO) and Less Frequently Used
-    (specified as LFU)
-    *NOTE: LFU seems to have some possible issues -AZ
-
-    Cache elements can also contain sub elements which take the same format of a factory class
-    and properties. Defined sub-elements are:
-
-    * cacheEventListenerFactory - Enables registration of listeners for cache events, such as
-      put, remove, update, and expire.
-
-    * bootstrapCacheLoaderFactory - Specifies a BootstrapCacheLoader, which is called by a
-      cache on initialisation to prepopulate itself.
-
-    * cacheExtensionFactory - Specifies a CacheExtension, a generic mechansim to tie a class
-      which holds a reference to a cache to the cache lifecycle.
-
-    RMI Cache Replication
-
-    Each cache that will be distributed needs to set a cache event listener which replicates
-    messages to the other CacheManager peers. For the built-in RMI implementation this is done
-    by adding a cacheEventListenerFactory element of type RMICacheReplicatorFactory to each
-    distributed cache's configuration as per the following example:
-
-    <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-         properties="replicateAsynchronously=true,
-         replicatePuts=true,
-         replicateUpdates=true,
-         replicateUpdatesViaCopy=true,
-         replicateRemovals=true
-         asynchronousReplicationIntervalMillis=<number of milliseconds"
-         propertySeparator="," />
-
-    The RMICacheReplicatorFactory recognises the following properties:
-
-    * replicatePuts=true|false - whether new elements placed in a cache are
-      replicated to others. Defaults to true.
-
-    * replicateUpdates=true|false - whether new elements which override an
-      element already existing with the same key are replicated. Defaults to true.
-
-    * replicateRemovals=true - whether element removals are replicated. Defaults to true.
-
-    * replicateAsynchronously=true | false - whether replications are
-      asynchronous (true) or synchronous (false). Defaults to true.
-
-    * replicateUpdatesViaCopy=true | false - whether the new elements are
-      copied to other caches (true), or whether a remove message is sent. Defaults to true.
-
-    * asynchronousReplicationIntervalMillis=<number of milliseconds> - The asynchronous
-      replicator runs at a set interval of milliseconds. The default is 1000. The minimum
-      is 10. This property is only applicable if replicateAsynchronously=true
-
-
-    Cluster Bootstrapping
-
-    The RMIBootstrapCacheLoader bootstraps caches in clusters where RMICacheReplicators are
-    used. It is configured as per the following example:
-
-    <bootstrapCacheLoaderFactory
-        class="net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactory"
-        properties="bootstrapAsynchronously=true, maximumChunkSizeBytes=5000000"
-        propertySeparator="," />
-
-    The RMIBootstrapCacheLoaderFactory recognises the following optional properties:
-
-    * bootstrapAsynchronously=true|false - whether the bootstrap happens in the background
-      after the cache has started. If false, bootstrapping must complete before the cache is
-      made available. The default value is true.
-
-    * maximumChunkSizeBytes=<integer> - Caches can potentially be very large, larger than the
-      memory limits of the VM. This property allows the bootstraper to fetched elements in
-      chunks. The default chunk size is 5000000 (5MB).
-
-
-    Cache Exception Handling
-
-    By default, most cache operations will propagate a runtime CacheException on failure. An interceptor,
-      using a dynamic proxy, may be configured so that a CacheExceptionHandler can be configured to
-      intercept Exceptions. Errors are not intercepted. It is configured as per the following example:
-
-      <cacheExceptionHandlerFactory class="net.sf.ehcache.exceptionhandler.CountingExceptionHandlerFactory"
-                                      properties="logLevel=FINE"/>
-
-    Caches with ExceptionHandling configured are not of type Cache, but are of type Ehcache only, and are not available
-    using CacheManager.getCache(), but using CacheManager.getEhcache().
-
-
-    CacheLoader
-
-    A CacheLoader may be configured against a cache.
-
-        <cacheLoaderFactory class="net.sf.ehcache.loader.CountingCacheLoaderFactory"
-                                      properties="type=int,startCounter=10"/>
-
-    -->
-
-    <!--
-    Mandatory Default Cache configuration. These settings will be applied to caches
-    created programmtically using CacheManager.add(String cacheName).
-
-    The defaultCache has an implicit name "default" which is a reserved cache name.
-    -->
-    <defaultCache
-            maxElementsInMemory="3000"
-            eternal="false"
-            timeToIdleSeconds="600"
-            timeToLiveSeconds="1200"
-            overflowToDisk="true"
-            diskSpoolBufferSizeMB="30"
-            maxElementsOnDisk="10000"
-            diskPersistent="false"
-            diskExpiryThreadIntervalSeconds="120"
-            memoryStoreEvictionPolicy="LRU">
-    </defaultCache>
-
-
-    <!--Predefined caches.  Add your cache configuration settings here.
-        If you do not have a configuration for your cache a WARNING will be issued when the
-        CacheManager starts
-
-        The following attributes are required for defaultCache:
-
-        name              - Sets the name of the cache. This is used to identify the cache. It must be unique.
-        maxInMemory       - Sets the maximum number of objects that will be created in memory
-        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
-                            is never expired.
-        timeToIdleSeconds - Sets the time to idle for an element before it expires.
-                            i.e. The maximum amount of time between accesses before an element expires
-                            Is only used if the element is not eternal.
-                            Optional attribute. A value of 0 means that an Element can idle for infinity
-        timeToLiveSeconds - Sets the time to live for an element before it expires.
-                            i.e. The maximum time between creation time and when an element expires.
-                            Is only used if the element is not eternal.
-                            Optional attribute. A value of 0 means that an Element can live for infinity
-        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
-                            has reached the maxInMemory limit.
-
-        -->
-
-    <!-- CACHES FOR TESTING -->
-    <cache name="org.dspace.caching.MemOnly"
-           maxElementsInMemory="10000"
-           eternal="false"
-           timeToIdleSeconds="600"
-           timeToLiveSeconds="1200"
-           overflowToDisk="false"
-           diskSpoolBufferSizeMB="0"
-           maxElementsOnDisk="0"
-           diskPersistent="false"
-           diskExpiryThreadIntervalSeconds="120"
-           memoryStoreEvictionPolicy="LRU">
-    </cache>
-
-    <cache name="org.dspace.caching.DiskOnly"
-           maxElementsInMemory="1"
-           eternal="false"
-           timeToIdleSeconds="600"
-           timeToLiveSeconds="1200"
-           overflowToDisk="true"
-           diskSpoolBufferSizeMB="30"
-           maxElementsOnDisk="10000"
-           diskPersistent="false"
-           diskExpiryThreadIntervalSeconds="120"
-           memoryStoreEvictionPolicy="LRU">
-    </cache>
-
-    <!--
-        <cache name="org.dspace.caching.Distributed"
-             maxElementsInMemory="10"
-             eternal="false"
-             timeToIdleSeconds="10"
-             timeToLiveSeconds="30"
-             overflowToDisk="false"
-             memoryStoreEvictionPolicy="LRU">
-             <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                properties="replicateAsynchronously=true,
-                   replicatePuts=true,
-                   replicateUpdates=true,
-                   replicateUpdatesViaCopy=false,
-                   replicateRemovals=true "/>
-         </cache>
-
-        <cache name="org.dspace.caching.DistributedDisk"
-             maxElementsInMemory="5"
-             eternal="false"
-             timeToIdleSeconds="10"
-             timeToLiveSeconds="30"
-             overflowToDisk="true"
-             diskSpoolBufferSizeMB="30"
-             maxElementsOnDisk="10"
-             diskPersistent="false"
-             diskExpiryThreadIntervalSeconds="120"
-             memoryStoreEvictionPolicy="LRU">
-             <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                properties="replicateAsynchronously=true,
-                   replicatePuts=true,
-                   replicateUpdates=true,
-                   replicateUpdatesViaCopy=false,
-                   replicateRemovals=true "/>
-         </cache>
-    -->
-
-    <!-- Place configuration for your caches following -->
-
-    <!-- this cache tracks the timestamps of the most recent updates to particular tables.
-      It is important that the cache timeout of the underlying cache implementation be set to a
-      higher value than the timeouts of any of the query caches. In fact, it is recommended that
-      the the underlying cache not be configured for expiry at all. -->
-    <!--   <cache name="org.hibernate.cache.UpdateTimestampsCache"-->
-    <!--      maxElementsInMemory="6000"-->
-    <!--      eternal="true"-->
-    <!--      overflowToDisk="false" />-->
-
-    <!-- this cache stores the actual objects pulled out of the DB by hibernate -->
-    <!--    <cache name="org.hibernate.cache.StandardQueryCache"-->
-    <!--      maxElementsInMemory="12000"-->
-    <!--      eternal="false"-->
-    <!--      timeToIdleSeconds="600"-->
-    <!--      timeToLiveSeconds="1200"-->
-    <!--      overflowToDisk="false" />-->
-
-
-    <!-- DISTRIBUTED CACHING
-
-        Add cacheEventListenerFactory to the cache
-        ==========================================
-             <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                properties="replicateAsynchronously=true,
-                   replicatePuts=true,
-                   replicateUpdates=true,
-                   replicateUpdatesViaCopy=false,
-                   replicateRemovals=true "/>
-
-        For Example:
-        ============
-        <cache name="org.dspace.authz.api.SecurityService.cache"
-             maxElementsInMemory="20000"
-             eternal="false"
-             timeToIdleSeconds="1800"
-             timeToLiveSeconds="2400"
-             overflowToDisk="true"
-             diskSpoolBufferSizeMB="30"
-             maxElementsOnDisk="100000"
-             diskPersistent="true"
-             diskExpiryThreadIntervalSeconds="120">
-             <cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                properties="replicateAsynchronously=true,
-                   replicatePuts=true,
-                   replicateUpdates=true,
-                   replicateUpdatesViaCopy=false,
-                   replicateRemovals=true "/>
-       </cache>
-
-
-        CacheManagerPeerProvider
-        ========================
-        (Enable for distributed operation)
-
-        Specifies a CacheManagerPeerProviderFactory which will be used to create a
-        CacheManagerPeerProvider, which discovers other CacheManagers in the cluster.
-
-        The attributes of cacheManagerPeerProviderFactory are:
-        * class - a fully qualified factory class name
-        * properties - comma separated properties having meaning only to the factory.
-
-        Ehcache comes with a built-in RMI-based distribution system with two means of discovery of
-        CacheManager peers participating in the cluster:
-        * automatic, using a multicast group. This one automatically discovers peers and detects
-          changes such as peers entering and leaving the group
-        * manual, using manual rmiURL configuration. A hardcoded list of peers is provided at
-          configuration time.
-
-        Configuring Automatic Discovery:
-        Automatic discovery is configured as per the following example:
-        <cacheManagerPeerProviderFactory
-                            class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                            properties="peerDiscovery=automatic, multicastGroupAddress=230.0.0.1,
-                                        multicastGroupPort=4446, timeToLive=32"/>
-
-        Valid properties are:
-        * peerDiscovery (mandatory) - specify "automatic"
-        * multicastGroupAddress (mandatory) - specify a valid multicast group address
-        * multicastGroupPort (mandatory) - specify a dedicated port for the multicast heartbeat
-          traffic
-        * timeToLive - specify a value between 0 and 255 which determines how far the packets will propagate.
-          By convention, the restrictions are:
-          0   - the same host
-          1   - the same subnet
-          32  - the same site
-          64  - the same region
-          128 - the same continent
-          255 - unrestricted
-
-        Configuring Manual Discovery:
-        Manual discovery is configured as per the following example:
-        <cacheManagerPeerProviderFactory class=
-                              "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                              properties="peerDiscovery=manual,
-                              rmiUrls=//server1:40000/sampleCache1|//server2:40000/sampleCache1
-                              | //server1:40000/sampleCache2|//server2:40000/sampleCache2"
-                              propertySeparator="," />
-
-        Valid properties are:
-        * peerDiscovery (mandatory) - specify "manual"
-        * rmiUrls (mandatory) - specify a pipe separated list of rmiUrls, in the form
-                                //hostname:port
-
-        The hostname is the hostname of the remote CacheManager peer. The port is the listening
-        port of the RMICacheManagerPeerListener of the remote CacheManager peer.
-
-        <cacheManagerPeerProviderFactory
-                class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                properties="peerDiscovery=automatic,
-                            multicastGroupAddress=230.0.0.1,
-                            multicastGroupPort=4446, timeToLive=1"
-                propertySeparator=","
-                />
-        -->
-
-    <!--
-    CacheManagerPeerListener
-    ========================
-    (Enable for distributed operation)
-
-    Specifies a CacheManagerPeerListenerFactory which will be used to create a
-    CacheManagerPeerListener, which
-    listens for messages from cache replicators participating in the cluster.
-
-    The attributes of cacheManagerPeerListenerFactory are:
-    class - a fully qualified factory class name
-    properties - comma separated properties having meaning only to the factory.
-
-    Ehcache comes with a built-in RMI-based distribution system. The listener component is
-    RMICacheManagerPeerListener which is configured using
-    RMICacheManagerPeerListenerFactory. It is configured as per the following example:
-
-    <cacheManagerPeerListenerFactory
-        class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
-        properties="hostName=fully_qualified_hostname_or_ip,
-                    port=40001,
-                    socketTimeoutMillis=120000"
-                    propertySeparator="," />
-
-    All properties are optional. They are:
-    * hostName - the hostName of the host the listener is running on. Specify
-      where the host is multihomed and you want to control the interface over which cluster
-      messages are received. Defaults to the host name of the default interface if not
-      specified.
-    * port - the port the listener listens on. This defaults to a free port if not specified.
-    * socketTimeoutMillis - the number of ms client sockets will stay open when sending
-      messages to the listener. This should be long enough for the slowest message.
-      If not specified it defaults 120000ms.
-    * timeToLive - You can control how far the multicast packets propagate by setting the 
-    badly misnamed time to live. Using the multicast IP protocol, the timeToLive value 
-    indicates the scope or range in which a packet may be forwarded. By convention:
-        0 is restricted to the same host
-        1 is restricted to the same subnet
-        32 is restricted to the same site
-        64 is restricted to the same region
-        128 is restricted to the same continent
-        255 is unrestricted
-
-    <cacheManagerPeerListenerFactory
-            class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"/>
-    -->
-
-    <!-- Sample Distributed cache settings -->
-    <!-- automatic discovery using tcp multicast
-         For the multicast version, the IP address is no longer that of the server.
-         Rather, you need to choose the address and port in a designated range that has been reserved for multicasting.
-         It is as if the server and all potential clients are agreeing that messages will be left in a particular location.
-         The available addresses for multicasting are in the range 224.0.0.0 through 239.255.255.255.
-         You can check for the assigned addresses in this range (http://www.iana.org/assignments/multicast-addresses).
-         Recommended default is to use the IP address 230.0.0.1 and the port 4446.
-    -->
-
-    <!--
-    <cacheManagerPeerProviderFactory
-       class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-       properties="peerDiscovery=automatic,
-          multicastGroupAddress=230.0.0.1,
-          multicastGroupPort=4446,
-          timeToLive=1" />
-
-    -->
-
-    <!-- manual discovery (you must customize this to include every node in the cluster) -->
-    <!--   <cacheManagerPeerProviderFactory
-          class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-          properties="peerDiscovery=manual,
-          rmiUrls=//server2:40001/sampleCache11|//server2:40001/sampleCache12" />
-    -->
-
-    <!-- 
-        A CacheManagerPeerListener listens for messages from peers to the current CacheManager.
-        
-        You configure the CacheManagerPeerListener by specifiying a CacheManagerPeerListenerFactory which is used to create 
-        the CacheManagerPeerListener using the plugin mechanism.
-        
-        The attributes of cacheManagerPeerListenerFactory are:
-        * class - a fully qualified factory class name 
-        * properties - comma separated properties having meaning only to the factory.
-        
-        Ehcache comes with a built-in RMI-based distribution system. The listener component is RMICacheManagerPeerListener 
-        which is configured using RMICacheManagerPeerListenerFactory. It is configured as per the following example:
-        
-        <cacheManagerPeerListenerFactory
-            class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
-            properties="hostName=localhost, port=40001, socketTimeoutMillis=2000" />
-        
-        Valid properties are:
-        * hostName (optional) - the hostName of the host the listener is running on. Specify where the host is 
-            multihomed and you want to control the interface over which cluster messages are received.
-            
-            The hostname is checked for reachability during CacheManager initialisation.
-            
-            If the hostName is unreachable, the CacheManager will refuse to start and an CacheException will be thrown 
-            indicating connection was refused.
-            
-            If unspecified, the hostname will use InetAddress.getLocalHost().getHostAddress(), which corresponds to the 
-            default host network interface.
-            
-            Warning: Explicitly setting this to localhost refers to the local loopback of 127.0.0.1, which is not network 
-            visible and will cause no replications to be received from remote hosts. You should only use this setting when 
-            multiple CacheManagers are on the same machine.
-
-            NOTE: this is not obvious, but if you run a netstat -an | grep LISTEN you will see that the configuration shown below:
-            properties="hostName=127.0.0.1, port=40001"
-            will actually cause a bind to happen to *:40001 which is what we want and will allow the servers to start
-            even if there is no netowkr connection. On the other hand, if you use localhost there will be a resolution
-            failure on startup. This is probably what you should use regardless of the setup of the peer provider factory. -AZ
-        * port (mandatory) - the port the listener listens on.
-        * socketTimeoutMillis (optional) - the number of seconds client sockets will wait when sending messages to this 
-            listener until they give up. By default this is 2000ms.
-    -->
-
-    <!-- this will listen for the messages from peers  -->
-    <!-- 
-   <cacheManagerPeerListenerFactory
-      class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
-      properties="hostName=127.0.0.1, port=40001" />
-     -->
-
-</ehcache>
diff --git a/dspace-services/src/test/resources/spring/spring-test-beans.xml b/dspace-services/src/test/resources/spring/spring-test-beans.xml
index ed53d7f8f4..60564bee99 100644
--- a/dspace-services/src/test/resources/spring/spring-test-beans.xml
+++ b/dspace-services/src/test/resources/spring/spring-test-beans.xml
@@ -22,17 +22,6 @@
          @Configuration annotations, e.g. see org.dspace.servicemanager.config.TestDynamicAnnotationConfiguration -->
     <context:component-scan base-package="org.dspace.servicemanager.config" />
 
-    <!-- sample cache bean -->
-    <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
-        <property name="cacheManager" ref="org.dspace.caching.ehcache.CacheManager"/>
-        <property name="cacheName" value="org.dspace.caching.ehcache.SampleCache"/>
-        <property name="maxElementsInMemory" value="1000"/>
-        <property name="diskPersistent" value="false"/>
-        <property name="eternal" value="false"/>
-        <property name="timeToLive" value="10"/>
-        <property name="timeToIdle" value="30"/>
-    </bean>
-
     <!-- Test bean for property substitution from configuration service (used by DSpaceConfigurationBeanTest)
          The value of "testDynamicBean.property" should be auto-substituted from config/local.properties -->
     <bean id="dynamicPropertyBean" class="org.dspace.servicemanager.config.TestDynamicPropertyBean">
diff --git a/dspace-sword/pom.xml b/dspace-sword/pom.xml
index a55e0457a9..3a0aa6df5c 100644
--- a/dspace-sword/pom.xml
+++ b/dspace-sword/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -61,10 +61,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
@@ -127,7 +123,7 @@
         <dependency>
             <groupId>xom</groupId>
             <artifactId>xom</artifactId>
-            <version>1.2.5</version>
+            <version>1.3.7</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java b/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
index 3384a4d2bf..2550d947d3 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
@@ -79,7 +79,7 @@ public class CollectionDepositor extends Depositor {
         if (!(dso instanceof Collection)) {
             throw new DSpaceSWORDException(
                 "You tried to initialise the collection depositor with something" +
-                    "other than a collection object");
+                    " other than a collection object");
         }
 
         this.collection = (Collection) dso;
diff --git a/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java b/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
index 68bae5b848..bcde6c42f6 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
@@ -57,7 +57,7 @@ public class ItemDepositor extends Depositor {
         if (!(dso instanceof Item)) {
             throw new DSpaceSWORDException(
                 "You tried to initialise the item depositor with something" +
-                    "other than an item object");
+                    " other than an item object");
         }
 
         this.item = (Item) dso;
diff --git a/dspace-sword/src/main/java/org/purl/sword/atom/Author.java b/dspace-sword/src/main/java/org/purl/sword/atom/Author.java
index 0eeba1716e..f622d94732 100644
--- a/dspace-sword/src/main/java/org/purl/sword/atom/Author.java
+++ b/dspace-sword/src/main/java/org/purl/sword/atom/Author.java
@@ -121,6 +121,7 @@ public class Author extends XmlElement implements SwordElementInterface {
      *
      * @return A XOM Element.
      */
+    @Override
     public Element marshall() {
         Element element = new Element(getQualifiedName(), xmlName.getNamespace());
 
@@ -155,8 +156,8 @@ public class Author extends XmlElement implements SwordElementInterface {
             handleIncorrectElement(author, validationProperties);
         }
 
-        ArrayList<SwordValidationInfo> validationItems = new ArrayList<SwordValidationInfo>();
-        ArrayList<SwordValidationInfo> attributeItems = new ArrayList<SwordValidationInfo>();
+        ArrayList<SwordValidationInfo> validationItems = new ArrayList<>();
+        ArrayList<SwordValidationInfo> attributeItems = new ArrayList<>();
 
         processUnexpectedAttributes(author, attributeItems);
 
@@ -194,6 +195,7 @@ public class Author extends XmlElement implements SwordElementInterface {
         return result;
     }
 
+    @Override
     public SwordValidationInfo validate(Properties validationContext) {
         return validate(null, null, validationContext);
     }
@@ -208,7 +210,7 @@ public class Author extends XmlElement implements SwordElementInterface {
                                                                SwordValidationInfo.MISSING_ELEMENT_ERROR,
                                                                SwordValidationInfoType.ERROR);
             result.addValidationInfo(info);
-        } else if (elements == null && name != null) {
+        } else if (elements == null) {
             result.addValidationInfo(name.validate(validationContext));
         }
 
@@ -230,6 +232,7 @@ public class Author extends XmlElement implements SwordElementInterface {
      *
      * @param author The element to unmarshall.
      */
+    @Override
     public void unmarshall(Element author)
         throws UnmarshallException {
         unmarshall(author, null);
diff --git a/dspace-sword/src/main/java/org/purl/sword/atom/Entry.java b/dspace-sword/src/main/java/org/purl/sword/atom/Entry.java
index 7f09d80412..69997eee8a 100644
--- a/dspace-sword/src/main/java/org/purl/sword/atom/Entry.java
+++ b/dspace-sword/src/main/java/org/purl/sword/atom/Entry.java
@@ -215,10 +215,10 @@ public class Entry extends XmlElement implements SwordElementInterface {
      *
      */
     protected void initialise() {
-        authors = new ArrayList<Author>();
-        categories = new ArrayList<Category>();
-        contributors = new ArrayList<Contributor>();
-        links = new ArrayList<Link>();
+        authors = new ArrayList<>();
+        categories = new ArrayList<>();
+        contributors = new ArrayList<>();
+        links = new ArrayList<>();
     }
 
     /**
@@ -226,6 +226,7 @@ public class Entry extends XmlElement implements SwordElementInterface {
      *
      * @return An element that holds the data associated with this object.
      */
+    @Override
     public Element marshall() {
         Element entry = new Element(getQualifiedName(), Namespaces.NS_ATOM);
         entry.addNamespaceDeclaration(Namespaces.PREFIX_SWORD, Namespaces.NS_SWORD);
@@ -297,6 +298,7 @@ public class Entry extends XmlElement implements SwordElementInterface {
      *                             element, or if there is a problem processing the element or any
      *                             subelements.
      */
+    @Override
     public void unmarshall(Element entry)
         throws UnmarshallException {
         unmarshall(entry, null);
@@ -472,8 +474,10 @@ public class Entry extends XmlElement implements SwordElementInterface {
     }
 
     /**
-     *
+     * @param validationContext FIXME: PLEASE DOCUMENT.
+     * @return SWORD validation info.
      */
+    @Override
     public SwordValidationInfo validate(Properties validationContext) {
         return validate(null, validationContext);
     }
@@ -498,7 +502,7 @@ public class Entry extends XmlElement implements SwordElementInterface {
             result.addValidationInfo(new SwordValidationInfo(Id.elementName(),
                                                              SwordValidationInfo.MISSING_ELEMENT_ERROR,
                                                              SwordValidationInfoType.ERROR));
-        } else if (id != null && validateAll) {
+        } else if (validateAll) {
             result.addValidationInfo(id.validate(validationContext));
         }
 
@@ -506,7 +510,7 @@ public class Entry extends XmlElement implements SwordElementInterface {
             result.addValidationInfo(new SwordValidationInfo(Title.elementName(),
                                                              SwordValidationInfo.MISSING_ELEMENT_ERROR,
                                                              SwordValidationInfoType.ERROR));
-        } else if (title != null && validateAll) {
+        } else if (validateAll) {
             result.addValidationInfo(title.validate(validationContext));
         }
 
@@ -514,7 +518,7 @@ public class Entry extends XmlElement implements SwordElementInterface {
             result.addValidationInfo(new SwordValidationInfo(Updated.elementName(),
                                                              SwordValidationInfo.MISSING_ELEMENT_ERROR,
                                                              SwordValidationInfoType.ERROR));
-        } else if (updated != null && validateAll) {
+        } else if (validateAll) {
             result.addValidationInfo(updated.validate(validationContext));
         }
 
@@ -543,7 +547,7 @@ public class Entry extends XmlElement implements SwordElementInterface {
                                                                  " SHOULD contain the URI and version of the server " +
                                                                  "software.",
                                                              SwordValidationInfoType.ERROR));
-        } else if (generator != null && validateAll) {
+        } else if (validateAll) {
             result.addValidationInfo(generator.validate(validationContext));
         }
 
@@ -619,7 +623,7 @@ public class Entry extends XmlElement implements SwordElementInterface {
      * @return An iterator.
      */
     public Iterator<String> getCategories() {
-        ArrayList<String> items = new ArrayList<String>();
+        ArrayList<String> items = new ArrayList<>();
         for (int i = 0; i < categories.size(); i++) {
             items.add(categories.get(i).getContent());
         }
diff --git a/dspace-sword/src/main/java/org/purl/sword/atom/Generator.java b/dspace-sword/src/main/java/org/purl/sword/atom/Generator.java
index 128d39b210..a727fd3f3d 100644
--- a/dspace-sword/src/main/java/org/purl/sword/atom/Generator.java
+++ b/dspace-sword/src/main/java/org/purl/sword/atom/Generator.java
@@ -13,6 +13,7 @@ import java.util.Properties;
 
 import nu.xom.Attribute;
 import nu.xom.Element;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.purl.sword.base.Namespaces;
 import org.purl.sword.base.SwordElementInterface;
@@ -62,7 +63,7 @@ public class Generator extends XmlElement implements SwordElementInterface {
     /**
      * The logger.
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(Generator.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * The Xml name details for the element.
@@ -94,6 +95,7 @@ public class Generator extends XmlElement implements SwordElementInterface {
      *
      * @return The element.
      */
+    @Override
     public Element marshall() {
         Element element = new Element(getQualifiedName(), xmlName.getNamespace());
 
@@ -122,6 +124,7 @@ public class Generator extends XmlElement implements SwordElementInterface {
      * @throws UnmarshallException If the specified element is not an atom:generator
      *                             element, or if there is an error accessing the data.
      */
+    @Override
     public void unmarshall(Element generator)
         throws UnmarshallException {
         unmarshall(generator, null);
@@ -133,8 +136,8 @@ public class Generator extends XmlElement implements SwordElementInterface {
             return handleIncorrectElement(generator, validationProperties);
         }
 
-        ArrayList<SwordValidationInfo> validationItems = new ArrayList<SwordValidationInfo>();
-        ArrayList<SwordValidationInfo> attributeValidationItems = new ArrayList<SwordValidationInfo>();
+        ArrayList<SwordValidationInfo> validationItems = new ArrayList<>();
+        ArrayList<SwordValidationInfo> attributeValidationItems = new ArrayList<>();
 
         try {
             initialise();
@@ -228,7 +231,7 @@ public class Generator extends XmlElement implements SwordElementInterface {
                 new SwordValidationInfo(xmlName, attributeName,
                                         SwordValidationInfo.MISSING_ATTRIBUTE_WARNING,
                                         SwordValidationInfoType.WARNING));
-        } else if (validateAll && uri != null) {
+        } else if (validateAll) {
             result.addAttributeValidationInfo(createValidAttributeInfo(ATTRIBUTE_URI, uri));
         }
 
@@ -241,7 +244,7 @@ public class Generator extends XmlElement implements SwordElementInterface {
                 new SwordValidationInfo(xmlName, attributeName,
                                         SwordValidationInfo.MISSING_ATTRIBUTE_WARNING,
                                         SwordValidationInfoType.WARNING));
-        } else if (validateAll && version != null) {
+        } else if (validateAll) {
             result.addAttributeValidationInfo(createValidAttributeInfo(ATTRIBUTE_VERSION, version));
         }
 
@@ -306,6 +309,7 @@ public class Generator extends XmlElement implements SwordElementInterface {
     /**
      * Get a string representation.
      */
+    @Override
     public String toString() {
         return "Generator - content: " + getContent() +
             " version: " + getVersion() +
diff --git a/dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java b/dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java
index dbb322d08b..622d1d8d83 100644
--- a/dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java
+++ b/dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java
@@ -76,6 +76,7 @@ public class SWORDEntry extends Entry {
         super(name);
     }
 
+    @Override
     protected void initialise() {
         super.initialise();
         swordNoOp = null;
@@ -207,6 +208,7 @@ public class SWORDEntry extends Entry {
         this.swordPackaging = new SwordPackaging(packaging);
     }
 
+    @Override
     protected void marshallElements(Element entry) {
         super.marshallElements(entry);
 
@@ -329,6 +331,7 @@ public class SWORDEntry extends Entry {
         return result;
     }
 
+    @Override
     public SwordValidationInfo unmarshall(Element entry, Properties validationProperties)
         throws UnmarshallException {
 
@@ -343,6 +346,7 @@ public class SWORDEntry extends Entry {
      * @param elementName name of element to check
      * @return true if element is checked
      */
+    @Override
     protected boolean isElementChecked(XmlName elementName) {
         if (elementName == null) {
             return false;
@@ -356,10 +360,12 @@ public class SWORDEntry extends Entry {
             super.isElementChecked(elementName);
     }
 
+    @Override
     public SwordValidationInfo validate(Properties validationContext) {
         return validate(null, validationContext);
     }
 
+    @Override
     protected SwordValidationInfo validate(SwordValidationInfo info,
                                            Properties validationContext) {
         boolean validateAll = (info == null);
@@ -379,7 +385,7 @@ public class SWORDEntry extends Entry {
                                                                          "element.",
                                                                      SwordValidationInfoType.WARNING));
             }
-        } else if (swordUserAgent != null && validateAll) {
+        } else if (validateAll) {
             swordEntry.addValidationInfo(swordUserAgent.validate(validationContext));
         }
 
@@ -392,7 +398,7 @@ public class SWORDEntry extends Entry {
                                                                      "resource has received or a URI that " +
                                                                      "dereferences to such a description.",
                                                                  SwordValidationInfoType.ERROR));
-        } else if (swordTreatment != null && validateAll) {
+        } else if (validateAll) {
             swordEntry.addValidationInfo(swordTreatment.validate(validationContext));
         }
 
@@ -408,7 +414,7 @@ public class SWORDEntry extends Entry {
                                                                          " process.",
                                                                      SwordValidationInfoType.WARNING));
             }
-        } else if (swordVerboseDescription != null && validateAll) {
+        } else if (validateAll) {
             swordEntry.addValidationInfo(swordVerboseDescription.validate(validationContext));
         }
 
@@ -427,7 +433,7 @@ public class SWORDEntry extends Entry {
                                                                          "this element to signify an error.",
                                                                      SwordValidationInfoType.WARNING));
             }
-        } else if (swordNoOp != null && validateAll) {
+        } else if (validateAll) {
             swordEntry.addValidationInfo(swordNoOp.validate(validationContext));
         }
 
@@ -439,7 +445,7 @@ public class SWORDEntry extends Entry {
                                                                      "element to declare the packaging type. If used " +
                                                                      "it SHOULD take a value from [SWORD-TYPES].",
                                                                  SwordValidationInfoType.INFO));
-        } else if (swordPackaging != null && validateAll) {
+        } else if (validateAll) {
             swordEntry.addValidationInfo(swordPackaging.validate(validationContext));
         }
 
diff --git a/dspace-sword/src/main/java/org/purl/sword/client/ClientOptions.java b/dspace-sword/src/main/java/org/purl/sword/client/ClientOptions.java
index e085baeb78..1ffbfca022 100644
--- a/dspace-sword/src/main/java/org/purl/sword/client/ClientOptions.java
+++ b/dspace-sword/src/main/java/org/purl/sword/client/ClientOptions.java
@@ -13,6 +13,12 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 /**
@@ -72,7 +78,7 @@ public class ClientOptions {
     private String filename = null;
 
     /**
-     * Filetype.
+     * File type.
      */
     private String filetype = null;
 
@@ -117,17 +123,18 @@ public class ClientOptions {
     /**
      * Logger.
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(ClientOptions.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * List of multiple destination items. Used if the mode is set to multipost.
      */
-    private List<PostDestination> multiPost = new ArrayList<PostDestination>();
+    private final List<PostDestination> multiPost = new ArrayList<>();
 
     /**
      * Pattern string to extract the data from a destination parameter in multipost mode.
      */
-    private static final Pattern multiPattern = Pattern.compile("(.*?)(\\[(.*?)\\]) {0,1}(:(.*)) {0,1}@(http://.*)");
+    private static final Pattern MULTI_PATTERN
+            = Pattern.compile("(.*?)(\\[(.*?)\\]) {0,1}(:(.*)) {0,1}@(http://.*)");
 
     /**
      * Flag that indicates if the GUI mode has been set. This is
@@ -148,128 +155,122 @@ public class ClientOptions {
      * @return True if the options were parsed successfully.
      */
     public boolean parseOptions(String[] args) {
+        Options options = new Options();
+        options.addOption(Option.builder().longOpt("md5").build())
+                .addOption(Option.builder().longOpt("noOp").build())
+                .addOption(Option.builder().longOpt("verbose").build())
+                .addOption(Option.builder().longOpt("cmd").build())
+                .addOption(Option.builder().longOpt("gui").build())
+                .addOption(Option.builder().longOpt("help").build())
+                .addOption(Option.builder().longOpt("nocapture").build());
+
+        Option option;
+
+        option = Option.builder().longOpt("host").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("port").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder("u").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder("p").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("href").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder("t").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("file").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("filetype").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("slug").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("onBehalfOf").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("formatNamespace").hasArg().build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("checksumError").build();
+        options.addOption(option);
+
+        option = Option.builder().longOpt("dest").hasArg().build();
+        options.addOption(option);
+
+        DefaultParser parser = new DefaultParser();
+        CommandLine command;
         try {
-            // iterate over the args
-            for (int i = 0; i < args.length; i++) {
-                if ("-md5".equals(args[i])) {
-                    md5 = true;
+            command = parser.parse(options, args);
+        } catch (ParseException ex) {
+            log.error(ex.getMessage());
+            return false;
+        }
+
+        if (command.hasOption("help")) {
+            return false; // force the calling code to display the usage information.
+        }
+        md5 = command.hasOption("md5");
+        noOp = command.hasOption("noOp");
+        verbose = command.hasOption("verbose");
+        if (command.hasOption("cmd")) {
+            guiMode = false;
+        }
+        if (command.hasOption("gui")) {
+            guiMode = true;
+        }
+        proxyHost = command.getOptionValue("host");
+        if (command.hasOption("port")) {
+            proxyPort = Integer.parseInt(command.getOptionValue("port"));
+        }
+        username = command.getOptionValue("u");
+        password = command.getOptionValue("p");
+        href = command.getOptionValue("href");
+        accessType = command.getOptionValue("t");
+        filename = command.getOptionValue("file");
+        filetype = command.getOptionValue("filetype");
+        slug = command.getOptionValue("slug");
+        onBehalfOf = command.getOptionValue("onBehalfOf");
+        formatNamespace = command.getOptionValue("formatNamespace");
+        checksumError = command.hasOption("checksumError");
+        noCapture = command.hasOption("nocapture");
+        if (command.hasOption("dest")) {
+            String dest = command.getOptionValue("dest");
+            Matcher m = MULTI_PATTERN.matcher(dest);
+            if (!m.matches()) {
+                log.debug("Error with dest parameter. Ignoring value: {}", dest);
+            } else {
+                int numGroups = m.groupCount();
+                for (int g = 0; g <= numGroups; g++) {
+                    log.debug("Group ({}) is: {}", g, m.group(g));
                 }
 
-                if ("-noOp".equals(args[i])) {
-                    noOp = true;
-                }
+                String group_username = m.group(1);
+                String group_onBehalfOf = m.group(3);
+                String group_password = m.group(5);
+                String group_url = m.group(6);
+                PostDestination destination = new PostDestination(group_url,
+                        group_username, group_password, group_onBehalfOf);
 
-                if ("-verbose".equals(args[i])) {
-                    verbose = true;
-                }
-
-                if ("-cmd".equals(args[i])) {
-                    guiMode = false;
-                }
-
-                if ("-gui".equals(args[i])) {
-                    guiMode = true;
-                }
-
-                if ("-host".equals(args[i])) {
-                    i++;
-                    proxyHost = args[i];
-                }
-
-                if ("-port".equals(args[i])) {
-                    i++;
-                    proxyPort = Integer.parseInt(args[i]);
-                }
-
-                if ("-u".equals(args[i])) {
-                    i++;
-                    username = args[i];
-                }
-
-                if ("-p".equals(args[i])) {
-                    i++;
-                    password = args[i];
-                }
-
-                if ("-href".equals(args[i])) {
-                    i++;
-                    href = args[i];
-                }
-
-                if ("-help".equals(args[i])) {
-                    // force the calling code to display the usage information
-                    return false;
-                }
-
-                if ("-t".equals(args[i])) {
-                    i++;
-                    accessType = args[i];
-                }
-
-                if ("-file".equals(args[i])) {
-                    i++;
-                    filename = args[i];
-                }
-
-                if ("-filetype".equals(args[i])) {
-                    i++;
-                    filetype = args[i];
-                }
-
-                if ("-slug".equals(args[i])) {
-                    i++;
-                    slug = args[i];
-                }
-
-                if ("-onBehalfOf".equals(args[i])) {
-                    i++;
-                    onBehalfOf = args[i];
-                }
-
-                if ("-formatNamespace".equals(args[i])) {
-                    i++;
-                    formatNamespace = args[i];
-                }
-
-                if ("-checksumError".equals(args[i])) {
-                    i++;
-                    checksumError = true;
-                }
-
-                if ("-dest".equals(args[i])) {
-                    i++;
-                    Matcher m = multiPattern.matcher(args[i]);
-                    if (!m.matches()) {
-                        log.debug("Error with dest parameter. Ignoring value: " + args[i]);
-                    } else {
-                        int numGroups = m.groupCount();
-                        for (int g = 0; g <= numGroups; g++) {
-                            log.debug("Group (" + g + ") is: " + m.group(g));
-                        }
-
-                        String username = m.group(1);
-                        String onBehalfOf = m.group(3);
-                        String password = m.group(5);
-                        String url = m.group(6);
-                        PostDestination destination = new PostDestination(url, username, password, onBehalfOf);
-
-                        multiPost.add(destination);
-                    }
-                }
-
-                if ("-nocapture".equals(args[i])) {
-                    i++;
-                    noCapture = true;
-                }
+                multiPost.add(destination);
             }
+        }
 
+        try {
             // apply any settings
             if (href == null && "service".equals(accessType)) {
                 log.error("No href specified.");
                 return false;
             }
 
-            if (multiPost.size() == 0 && "multipost".equals(accessType)) {
+            if (multiPost.isEmpty() && "multipost".equals(accessType)) {
                 log.error("No destinations specified");
                 return false;
             }
diff --git a/dspace-sword/src/main/java/org/purl/sword/client/SWORDComboBox.java b/dspace-sword/src/main/java/org/purl/sword/client/SWORDComboBox.java
index 0afa6cbde3..42fcc082ff 100644
--- a/dspace-sword/src/main/java/org/purl/sword/client/SWORDComboBox.java
+++ b/dspace-sword/src/main/java/org/purl/sword/client/SWORDComboBox.java
@@ -71,7 +71,7 @@ public class SWORDComboBox extends JComboBox {
     public void updateList() {
         Object s = getSelectedItem();
 
-        if (!isEditable() || s == null || (s != null && ((String) s).trim().length() == 0)) {
+        if (!isEditable() || s == null || ((String) s).trim().length() == 0) {
             // don't update with an empty item or if the combo box is not editable.
             return;
         }
diff --git a/dspace-sword/src/main/java/org/purl/sword/server/DepositServlet.java b/dspace-sword/src/main/java/org/purl/sword/server/DepositServlet.java
index c272fc95f5..d7c01a3f04 100644
--- a/dspace-sword/src/main/java/org/purl/sword/server/DepositServlet.java
+++ b/dspace-sword/src/main/java/org/purl/sword/server/DepositServlet.java
@@ -358,17 +358,14 @@ public class DepositServlet extends HttpServlet {
                                    request,
                                    response);
             return;
-        } catch (SWORDException se) {
+        } catch (SWORDException | NoSuchAlgorithmException se) {
             response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
             log.error(se.toString());
-        } catch (NoSuchAlgorithmException nsae) {
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-            log.error(nsae.toString());
         } finally {
             // Try deleting the temp file
             if (filename != null) {
                 File f = new File(filename);
-                if (f != null && !f.delete()) {
+                if (!f.delete()) {
                     log.error("Unable to delete file: " + filename);
                 }
             }
diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml
index a9a58cff06..51d5dc2df3 100644
--- a/dspace-swordv2/pom.xml
+++ b/dspace-swordv2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -135,7 +135,8 @@
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>fom-impl</artifactId>
-            <version>${axiom.version}</version>
+            <!-- CANNOT UPGRADE WITHOUT BREAKING sword2-server (see above) -->
+            <version>1.2.22</version>
             <exclusions>
                 <!-- Exclude Geronimo as it is NOT necessary when using javax.activation (which we use)
                      See: https://ws.apache.org/axiom/userguide/ch04.html#d0e732 -->
diff --git a/dspace/bin/dspace b/dspace/bin/dspace
index 7a4dbf4a53..7d5d678d0f 100644
--- a/dspace/bin/dspace
+++ b/dspace/bin/dspace
@@ -10,23 +10,23 @@
 # This is a Unix shell script for running a command-line DSpace tool.
 # It sets the CLASSPATH appropriately before invoking Java.
 
+# Assume that this script is in the bin subdirectory of the DSpace installation directory.
 BINDIR=`dirname $0`
 DSPACEDIR=`cd "$BINDIR/.." ; pwd`
 
-# Get the JARs in $DSPACEDIR/jsp/WEB-INF/lib, separated by ':'
+# Get the JARs in $DSPACEDIR/lib
 JARS="$DSPACEDIR/lib/*"
 
 # Class path for DSpace will be:
 #   Any existing classpath
-#   The JARs (WEB-INF/lib/*.jar)
-#   The WEB-INF/classes directory
+#   The JARs (lib/*.jar)
+#   The configuration directory
 if [ "$CLASSPATH" = "" ]; then
-    FULLPATH=$JARS:$DSPACEDIR/config
+  FULLPATH=$JARS:$DSPACEDIR/config
 else
-    FULLPATH=$CLASSPATH:$JARS:$DSPACEDIR/config
+  FULLPATH=$CLASSPATH:$JARS:$DSPACEDIR/config
 fi
 
-
 # If the user only wants the CLASSPATH, just give it now.
 if [ "$1" = "classpath" ]; then
   echo $FULLPATH
diff --git a/dspace/bin/start-handle-server b/dspace/bin/start-handle-server
index b9dd53fbef..6d5c9a4b44 100755
--- a/dspace/bin/start-handle-server
+++ b/dspace/bin/start-handle-server
@@ -10,7 +10,8 @@
 # Unix shell script for starting Handle server.  WARNING this assumes any
 # previously running Handle servers have been terminated.
 
-# Assume we're in the bin subdirectory of the DSpace installation directory
+# Assume that this script is in the bin subdirectory of the DSpace
+# installation directory.
 BINDIR=`dirname $0`
 
 # Read parameters from DSpace config
@@ -21,19 +22,10 @@ HANDLEDIR=`$BINDIR/dspace dsprop --property handle.dir`
 # If you want your handle server logs stored elsewhere, change this value
 LOGDIR=$DSPACEDIR/log
 
-# Get the JARs in $DSPACEDIR/jsp/WEB-INF/lib, separated by ':'
-JARS=`echo $DSPACEDIR/lib/*.jar | sed 's/ /\:/g'`
-
-# Class path for DSpace will be:
-#   Any existing classpath
-#   The JARs (WEB-INF/lib/*.jar)
-#   The WEB-INF/classes directory
-FULLPATH=$CLASSPATH:$JARS:$DSPACEDIR/config
-
 #Allow user to specify java options through JAVA_OPTS variable
 if [ "$JAVA_OPTS" = "" ]; then
-    #Default Java to use 256MB of memory
-    JAVA_OPTS=-Xmx256m
+  #Default Java to use 256MB of memory
+  JAVA_OPTS=-Xmx256m
 fi
 
 # Remove lock file, in case the old Handle server did not shut down properly
@@ -42,4 +34,8 @@ rm -f $HANDLEDIR/txns/lock
 # Start the Handle server, with a special log4j properties file.
 # We cannot simply write to the same logs, since log4j
 # does not support more than one JVM writing to the same rolling log.
-nohup java $JAVA_OPTS -classpath $FULLPATH -Ddspace.log.init.disable=true -Dlog4j.configuration=log4j-handle-plugin.properties net.handle.server.Main $HANDLEDIR </dev/null >> $LOGDIR/handle-server.log 2>&1 &
+nohup java $JAVA_OPTS -classpath `$BINDIR/dspace classpath` \
+    -Ddspace.log.init.disable=true \
+    -Dlog4j.configuration=log4j-handle-plugin.properties \
+    net.handle.server.Main $HANDLEDIR \
+    </dev/null >> $LOGDIR/handle-server.log 2>&1 &
diff --git a/dspace/bin/start-handle-server.bat b/dspace/bin/start-handle-server.bat
index 9321b20b1c..caf6ff3eef 100644
--- a/dspace/bin/start-handle-server.bat
+++ b/dspace/bin/start-handle-server.bat
@@ -31,9 +31,8 @@ REM Assume log directory is a subdirectory of DSPACEDIR.
 REM If you want your handle server logs stored elsewhere, change this value
 set LOGDIR=%DSPACEDIR%/log
 
-REM Build a CLASSPATH including all classes in oai webapp, all libraries in [dspace]/lib and the config folder.
-set DSPACE_CLASSPATH=%CLASSPATH%;%DSPACEDIR%\config;%DSPACEDIR%\webapps\oai\WEB-INF\classes\
-for %%f in (%DSPACEDIR%\lib\*.jar) DO CALL %BINDIR%\buildpath.bat %%f
+REM Build a CLASSPATH including all libraries in [dspace]/lib and the config folder.
+set DSPACE_CLASSPATH=%CLASSPATH%;%DSPACEDIR%\config;%DSPACEDIR%\lib\*
 
 REM If JAVA_OPTS specified, use those options
 REM Otherwise, default Java to using 256MB of memory
diff --git a/dspace/config/controlled-vocabularies/controlledvocabulary.xsd b/dspace/config/controlled-vocabularies/controlledvocabulary.xsd
index 7a5defefbd..5863d5d560 100644
--- a/dspace/config/controlled-vocabularies/controlledvocabulary.xsd
+++ b/dspace/config/controlled-vocabularies/controlledvocabulary.xsd
@@ -56,7 +56,7 @@ or refer to the Web site http://dspace-dev.dsi.uminho.pt.
 					</xs:complexType>
 				</xs:element>
 			</xs:all>
-			<xs:attribute name="id" type="xs:ID" use="optional"/>
+			<xs:attribute name="id" type="xs:ID" use="required"/>
 			<xs:attribute name="label" type="xs:string" use="required"/>
 			<xs:attribute name="selectable" type="xs:boolean" default="true"/>
 		</xs:complexType>
diff --git a/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-amount-currency.properties b/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-amount-currency.properties
new file mode 100644
index 0000000000..b5c287c990
--- /dev/null
+++ b/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-amount-currency.properties
@@ -0,0 +1,32 @@
+# Mapping between common amount currencies and the amount currencies supported by ORCID
+Euro = EUR
+Albanian\ lek = ALL
+Armenian\ dram = AMD
+Azerbaijan\ manat = AZN
+Belarusian\ ruble = BYR
+Bosnia\ and\ Herzegovina\ convertible\ mark = BAM
+Bulgarian\ lev = BGN
+Croatian\ kuna = HRK
+Czech\ koruna = CZK
+Danish\ krone = DKK
+Faroese\ krona = DKK
+Georgian\ lari = GEL
+Gibraltar\ pound = GIP
+Guernsey\ pound = GBP
+Hungarian\ forint = HUF
+Icelandic\ krona = ISK
+Manx\ pound = GBP
+Jersey\ pound = GBP
+Kazakhstani\ tenge = KZT
+Moldovan\ leu = MDL
+Macedonian\ denar = MKD
+Norwegian\ krone = NOK
+Polish\ zloty = PLN
+Romanian\ leu = RON
+Russian\ ruble = RUB
+Serbian\ dinar = RSD
+Swedish\ krona = SEK
+Swiss\ franc = CHF
+Turkish\ lira = TRY
+Ukrainian\ hryvnia = UAH
+Pound\ sterling = GBP
\ No newline at end of file
diff --git a/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-funding-type.properties b/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-funding-type.properties
new file mode 100644
index 0000000000..d46b39c9d3
--- /dev/null
+++ b/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-funding-type.properties
@@ -0,0 +1 @@
+# Mapping between DSpace project's types and the funding types supported by ORCID
\ No newline at end of file
diff --git a/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-language-code.properties b/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-language-code.properties
new file mode 100644
index 0000000000..4c2bac2f2f
--- /dev/null
+++ b/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-language-code.properties
@@ -0,0 +1,10 @@
+# Mapping between DSpace common iso languages and the languages supported by ORCID
+en_US = en
+en = en
+es = es
+de = de
+fr = fr
+it = it
+ja = ja
+zh = zh
+tr = tr
\ No newline at end of file
diff --git a/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-publication-type.properties b/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-publication-type.properties
new file mode 100644
index 0000000000..953ddc60ee
--- /dev/null
+++ b/dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-publication-type.properties
@@ -0,0 +1,23 @@
+# Mapping between DSpace common publication's types and the type supported by ORCID
+Animation = other
+Article = journal-article
+Book = book
+Book\ chapter = book-chapter
+Dataset = data-set
+Learning\ Object = other
+Image = other
+Image,\ 3-D = other
+Map = other
+Musical\ Score = other
+Plan\ or\ blueprint = other
+Preprint = preprint
+Presentation = other
+Recording,\ acoustical = other
+Recording,\ musical = other
+Recording,\ oral = other
+Software = software
+Technical\ Report = other
+Thesis = other
+Video = other
+Working\ Paper = working-paper
+Other = other
\ No newline at end of file
diff --git a/dspace/config/crosswalks/orcid/mapConverter-orcid-to-dspace-language-code.properties b/dspace/config/crosswalks/orcid/mapConverter-orcid-to-dspace-language-code.properties
new file mode 100644
index 0000000000..6699d5c195
--- /dev/null
+++ b/dspace/config/crosswalks/orcid/mapConverter-orcid-to-dspace-language-code.properties
@@ -0,0 +1 @@
+# Mapping between languages supported by ORCID and the DSpace common iso languages
\ No newline at end of file
diff --git a/dspace/config/crosswalks/orcid/mapConverter-orcid-to-dspace-publication-type.properties b/dspace/config/crosswalks/orcid/mapConverter-orcid-to-dspace-publication-type.properties
new file mode 100644
index 0000000000..7f41538ac9
--- /dev/null
+++ b/dspace/config/crosswalks/orcid/mapConverter-orcid-to-dspace-publication-type.properties
@@ -0,0 +1,12 @@
+# Mapping between work type supported by ORCID and the DSpace common publication's types
+website = Other
+data-set = Dataset
+book = Book
+book-chapter = Book chapter
+conference-paper = Other
+journal-article = Article
+newspaper-article = Article
+magazine-article = Article
+patent = Other
+report = Other
+book-review = Other
\ No newline at end of file
diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index 9a839d701e..55d0a61526 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -19,32 +19,44 @@
 # Windows note: Please remember to use forward slashes for all paths (e.g. C:/dspace)
 dspace.dir = /dspace
 
-# URL of DSpace backend ('server' webapp). Include port number etc.
+csvexport.dir = ${dspace.dir}/exports
+
+# Public URL of DSpace backend ('server' webapp). May require a port number if not using standard ports (80 or 443)
 # DO NOT end it with '/'.
-# This is where REST API and all enabled server modules (OAI-PMH, SWORD,
-# SWORDv2, RDF, etc) will respond.
+# This is where REST API and all enabled server modules (OAI-PMH, SWORD, SWORDv2, RDF, etc) will respond.
+# NOTE: This URL must be accessible to all DSpace users (should not use 'localhost' in Production)
+# and is usually "synced" with the "rest" section in the DSpace User Interface's config.*.yml.
+# It corresponds to the URL that you would type into your browser to access the REST API.
 dspace.server.url = http://localhost:8080/server
 
-# URL of DSpace frontend (Angular UI). Include port number etc.
+# Public URL of DSpace frontend (Angular UI). May require a port number if not using standard ports (80 or 443)
 # DO NOT end it with '/'.
-# This is used by the backend to provide links in emails, RSS feeds, Sitemaps,
-# etc.
+# This is used by the backend to provide links in emails, RSS feeds, Sitemaps, etc.
+# NOTE: this URL must be accessible to all DSpace users (should not use 'localhost' in Production).
+# It corresponds to the URL that you would type into your browser to access the User Interface.
 dspace.ui.url = http://localhost:4000
 
 # Name of the site
 dspace.name = DSpace at My University
 
-# assetstore.dir, look at DSPACE/config/spring/api/bitstore.xml for more options
-assetstore.dir = ${dspace.dir}/assetstore
+# Assetstore configurations have moved to config/modules/assetstore.cfg
+# and config/spring/api/bitstore.xml.
+# Additional storage options (e.g. Amazon S3) are available in `assetstore.cfg`
+# assetstore.dir = ${dspace.dir}/assetstore
 
 # Default language for metadata values
 default.language = en_US
 
 # Solr server/webapp.
 # DSpace uses Solr for all search/browse capability (and for usage statistics).
-# Since DSpace 7, SOLR must be installed as a stand-alone service
+# Since DSpace 7, SOLR must be installed as a stand-alone service.
 solr.server = http://localhost:8983/solr
 
+# Solr core name prefix.
+# If you connect multiple instances of DSpace to a single Solr instance, you
+# can organize them with a common core name prefix.
+solr.multicorePrefix =
+
 # Solr connection pool.
 # If you change these values, the changes are not effective until DSpace is
 # restarted.
@@ -63,21 +75,23 @@ solr.server = http://localhost:8983/solr
 
 ##### Database settings #####
 # DSpace only supports two database types: PostgreSQL or Oracle
+# PostgreSQL is highly recommended.
+# Oracle support is DEPRECATED. See https://github.com/DSpace/DSpace/issues/8214
 
 # URL for connecting to database
 #    * Postgres template: jdbc:postgresql://localhost:5432/dspace
-#    * Oracle template: jdbc:oracle:thin:@//localhost:1521/xe
+#    * Oracle template (DEPRECATED): jdbc:oracle:thin:@//localhost:1521/xe
 db.url = jdbc:postgresql://localhost:5432/dspace
 
 # JDBC Driver
 #    * For Postgres: org.postgresql.Driver
-#    * For Oracle:   oracle.jdbc.OracleDriver
+#    * For Oracle (DEPRECATED):   oracle.jdbc.OracleDriver
 db.driver = org.postgresql.Driver
 
 # Database Dialect (for Hibernate)
-#    * For Postgres: org.dspace.storage.rdbms.hibernate.postgres.DSpacePostgreSQL82Dialect
-#    * For Oracle:   org.hibernate.dialect.Oracle10gDialect
-db.dialect = org.dspace.storage.rdbms.hibernate.postgres.DSpacePostgreSQL82Dialect
+#    * For Postgres: org.hibernate.dialect.PostgreSQL94Dialect
+#    * For Oracle (DEPRECATED):   org.hibernate.dialect.Oracle10gDialect
+db.dialect = org.hibernate.dialect.PostgreSQL94Dialect
 
 # Database username and password
 db.username = dspace
@@ -85,7 +99,7 @@ db.password = dspace
 
 # Database Schema name
 #    * For Postgres, this is often "public" (default schema)
-#    * For Oracle, schema is equivalent to the username of your database account,
+#    * For Oracle (DEPRECATED), schema is equivalent to the username of your database account,
 #      so this may be set to ${db.username} in most scenarios.
 db.schema = public
 
@@ -165,12 +179,19 @@ feedback.recipient = dspace-help@myu.edu
 mail.admin = dspace-help@myu.edu
 mail.admin.name = DSpace Administrator
 
+# Helpdesk E-mail
+mail.helpdesk = ${mail.admin}
+mail.helpdesk.name = Help Desk
+
 # Recipient for server errors and alerts (defaults to mail.admin)
 alert.recipient = ${mail.admin}
 
 # Recipient for new user registration emails (defaults to unspecified)
 #registration.notify =
 
+# Enable a "welcome letter" to the newly-registered user.
+mail.welcome.enabled = false
+
 # Set the default mail character set. This may be overridden by providing a line
 # inside the email template "charset: <encoding>", otherwise this default is used.
 mail.charset = UTF-8
@@ -211,17 +232,24 @@ mail.charset = UTF-8
 mail.message.headers = subject
 mail.message.headers = charset
 
+# Helpdesk telephone.  Not email, but should be with other contact info.  Optional.
+#mail.message.helpdesk.telephone = +1 555 555 5555
+
 ##### Asset Storage (bitstreams / files) ######
 # Moved to config/spring/api/bitstore.xml
 
 ##### Logging configuration #####
 # Main logging settings can be found in config/log4j2.xml
-# below some configuration properties for the server webapp that can be modified at runtime
+# Below are some configuration properties for the server webapp that can be
+# modified at runtime.
 logging.server.include-after-request = false
-logging.server.include-payload = false
-logging.server.include-headers = false
-logging.server.include-query-string = false
 logging.server.include-client-info = false
+logging.server.include-headers = false
+logging.server.include-payload = false
+logging.server.include-query-string = false
+# include-stacktrace-for-httpcode accepts multiple values, comma-separated or by
+# repeating the assignment
+logging.server.include-stacktrace-for-httpcode = 422
 logging.server.max-payload-length = 10000
 
 ##### DOI registration agency credentials ######
@@ -235,9 +263,14 @@ logging.server.max-payload-length = 10000
 # Credentials used to authenticate against the registration agency:
 identifier.doi.user = username
 identifier.doi.password = password
+
+# URL for the DOI resolver.  This will be the stem for generated DOIs.
+#identifier.doi.resolver = https://doi.org
+
 # DOI prefix used to mint DOIs. All DOIs minted by DSpace will use this prefix.
 # The Prefix will be assigned by the registration agency.
 identifier.doi.prefix = 10.5072
+
 # If you want to, you can further separate your namespace. Should all the
 # suffixes of all DOIs minted by DSpace start with a special string to separate
 # it from other services also minting DOIs under your prefix?
@@ -297,55 +330,64 @@ handle.dir = ${dspace.dir}/handle-server
 # that repository)
 # handle.additional.prefixes = prefix1[, prefix2]
 
-# By default we hide the list handles method in the JSON endpoint as it could
-# produce heavy load for large repository
+# Whether to enable the DSpace handle resolver endpoints necessary for
+# https://github.com/DSpace/Remote-Handle-Resolver
+# Defaults to "false" which means these handle resolver endpoints are not available.
+# handle.remote-resolver.enabled = false
+
+# Whether to enable the DSpace listhandles resolver that lists all available
+# handles for this DSpace installation.
+# Defaults to "false" which means is possible to obtain the list of handles
+# of this DSpace installation, whenever the `handle.remote-resolver.enabled = true`.
 # handle.hide.listhandles = false
 
 ##### Authorization system configuration - Delegate ADMIN #####
 
 # COMMUNITY ADMIN configuration
-# subcommunities and collections
+# Authorize community administrators to create/delete subcommunties or collections
 #core.authorization.community-admin.create-subelement = true
 #core.authorization.community-admin.delete-subelement = true
-# his community
+# Authorize community administrators to manage community policies or community admin group
 #core.authorization.community-admin.policies = true
 #core.authorization.community-admin.admin-group = true
-# collections in his community
+# Authorize community administrators to manage collection settings (for collections under the community)
 #core.authorization.community-admin.collection.policies = true
 #core.authorization.community-admin.collection.template-item = true
 #core.authorization.community-admin.collection.submitters = true
 #core.authorization.community-admin.collection.workflows = true
 #core.authorization.community-admin.collection.admin-group = true
-# item owned by collections in his community
+# Authorize community administrators to manage item settings (for items owned by collections under the community)
 #core.authorization.community-admin.item.delete = true
 #core.authorization.community-admin.item.withdraw = true
 #core.authorization.community-admin.item.reinstatiate = true
 #core.authorization.community-admin.item.policies = true
-# also bundle...
+# Authorize community administrators to manage bundles/bitstreams of those items
 #core.authorization.community-admin.item.create-bitstream = true
 #core.authorization.community-admin.item.delete-bitstream = true
 #core.authorization.community-admin.item-admin.cc-license = true
 
 # COLLECTION ADMIN
+# Authorize collection administrators to manage collection settings
 #core.authorization.collection-admin.policies = true
 #core.authorization.collection-admin.template-item = true
 #core.authorization.collection-admin.submitters = true
 #core.authorization.collection-admin.workflows = true
 #core.authorization.collection-admin.admin-group = true
-# item owned by his collection
+# Authorize collection administrators to manage item settings (for items owned by the collection)
 #core.authorization.collection-admin.item.delete = true
 #core.authorization.collection-admin.item.withdraw = true
 #core.authorization.collection-admin.item.reinstatiate = true
 #core.authorization.collection-admin.item.policies = true
-# also bundle...
+# Authorize collection administrators to manage bundles/bitstreams of those items (owned by the collection)
 #core.authorization.collection-admin.item.create-bitstream = true
 #core.authorization.collection-admin.item.delete-bitstream = true
 #core.authorization.collection-admin.item-admin.cc-license = true
 
 # ITEM ADMIN
+# Authorize item administrators to manage item settings
 #core.authorization.item-admin.policies = true
 #core.authorization.installitem.inheritance-read.append-mode = false
-# also bundle...
+# Authorize item administrators to manage bundles/bitstreams of the item
 #core.authorization.item-admin.create-bitstream = true
 #core.authorization.item-admin.delete-bitstream = true
 #core.authorization.item-admin.cc-license = true
@@ -399,16 +441,19 @@ useProxies = true
 # (Requires reboot of servlet container, e.g. Tomcat, to reload)
 #proxies.trusted.include_ui_ip = true
 
+# Client IP Address Anonymization
+# Define how many parts of the client IP address to set to 0 in order to anonymize clients.
+# For example, setting it to 2 will mean that client IPs will look like 192.168.0.0.
+# Allowed values include [1, 2, 3, 4]. Any other value results in the anonymization being disabled.
+# Default value is 0, meaning the client IP is not anonymized.
+# client.ip-anonymization.parts = 0
+
 #### Media Filter / Format Filter plugins (through PluginService) ####
 # Media/Format Filters help to full-text index content or
 # perform automated format conversions
 
 #Names of the enabled MediaFilter or FormatFilter plugins
-filter.plugins = PDF Text Extractor
-filter.plugins = HTML Text Extractor
-filter.plugins = Word Text Extractor
-filter.plugins = Excel Text Extractor
-filter.plugins = PowerPoint Text Extractor
+filter.plugins = Text Extractor
 filter.plugins = JPEG Thumbnail
 filter.plugins = PDFBox JPEG Thumbnail
 
@@ -422,11 +467,7 @@ filter.plugins = PDFBox JPEG Thumbnail
 #                ImageMagick Image Thumbnail, ImageMagick PDF Thumbnail, \
 
 #Assign 'human-understandable' names to each filter
-plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.PDFFilter = PDF Text Extractor
-plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.HTMLFilter = HTML Text Extractor
-plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.PoiWordFilter = Word Text Extractor
-plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.ExcelFilter = Excel Text Extractor
-plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.PowerPointFilter = PowerPoint Text Extractor
+plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.TikaTextExtractionFilter = Text Extractor
 plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.JPEGFilter = JPEG Thumbnail
 plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.BrandedPreviewJPEGFilter = Branded Preview JPEG
 plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.PDFBoxThumbnail = PDFBox JPEG Thumbnail
@@ -434,15 +475,27 @@ plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilte
 plugin.named.org.dspace.app.mediafilter.FormatFilter = org.dspace.app.mediafilter.ImageMagickPdfThumbnailFilter = ImageMagick PDF Thumbnail
 
 #Configure each filter's input format(s)
-filter.org.dspace.app.mediafilter.PDFFilter.inputFormats = Adobe PDF
-filter.org.dspace.app.mediafilter.HTMLFilter.inputFormats = HTML, Text
-filter.org.dspace.app.mediafilter.PoiWordFilter.inputFormats = Microsoft Word, Microsoft Word XML
-filter.org.dspace.app.mediafilter.PowerPointFilter.inputFormats = Microsoft Powerpoint, Microsoft Powerpoint XML
+# NOTE: The TikaTextExtractionFilter can support any file formats that are supported by Apache Tika. So, you can easily
+# add additional formats to your DSpace Bitstream Format registry and list them here. The current list of Tika supported
+# formats is available at: https://tika.apache.org/2.3.0/formats.html
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Adobe PDF
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = CSV
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = HTML
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Microsoft Excel
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Microsoft Excel XML
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Microsoft Powerpoint
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Microsoft Powerpoint XML
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Microsoft Word
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Microsoft Word XML
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = OpenDocument Presentation
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = OpenDocument Spreadsheet
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = OpenDocument Text
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = RTF
+filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Text
 filter.org.dspace.app.mediafilter.JPEGFilter.inputFormats = BMP, GIF, JPEG, image/png
 filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormats = BMP, GIF, JPEG, image/png
 filter.org.dspace.app.mediafilter.ImageMagickImageThumbnailFilter.inputFormats = BMP, GIF, image/png, JPG, TIFF, JPEG, JPEG 2000
 filter.org.dspace.app.mediafilter.ImageMagickPdfThumbnailFilter.inputFormats = Adobe PDF
-filter.org.dspace.app.mediafilter.ExcelFilter.inputFormats = Microsoft Excel, Microsoft Excel XML
 filter.org.dspace.app.mediafilter.PDFBoxThumbnail.inputFormats = Adobe PDF
 
 #Publicly accessible thumbnails of restricted content.
@@ -450,15 +503,22 @@ filter.org.dspace.app.mediafilter.PDFBoxThumbnail.inputFormats = Adobe PDF
 #Any media filters not listed will instead inherit the permissions of the parent bitstream
 #filter.org.dspace.app.mediafilter.publicPermission = JPEGFilter
 
-#Custom settings for PDFFilter
-# If true, all PDF extractions are written to temp files as they are indexed...this
-# is slower, but helps ensure that PDFBox software DSpace uses doesn't eat up
-# all your memory
-#pdffilter.largepdfs = true
-# If true, PDFs which still result in an Out of Memory error from PDFBox
-# are skipped over...these problematic PDFs will never be indexed until
-# memory usage can be decreased in the PDFBox software
-#pdffilter.skiponmemoryexception = true
+# Custom settings for Text Extractor
+#
+# Maximum number of characters to be extracted for full text indexing
+# Default is 100,000 characters. Set to -1 for no maximum.
+# Larger values (or -1) are more likely to hit OutOfMemoryException errors when extracting text from large files.
+# In those scenarios, consider instead setting "textextractor.use-temp-file = true" below.
+# Changing this value only impacts future content added to DSpace. To modify existing content you must re-extract all
+# text ("filter-media -f" ) and then reindex your site ("index-discovery -b").
+#textextractor.max-chars = 100000
+
+# If true, all text extractions are written to temp files as they are indexed.
+# This will be slower, but helps ensure that text extraction doesn't eat up all your memory.
+# Setting this to true will also cause "textextractor.max-chars" to be ignored, and all text will be extracted.
+# Changing this value only impacts future content added to DSpace. To modify existing content you must re-extract all
+# text ("filter-media -f" ) and then reindex your site ("index-discovery -b").
+#textextractor.use-temp-file = false
 
 # Custom settigns for ImageMagick Thumbnail Filters
 # ImageMagick and GhostScript must be installed on the server, set the path to ImageMagick and GhostScript executable
@@ -487,6 +547,12 @@ filter.org.dspace.app.mediafilter.PDFBoxThumbnail.inputFormats = Adobe PDF
 # org.dspace.app.mediafilter.ImageMagickThumbnailFilter.cmyk_profile = /usr/share/ghostscript/9.18/iccprofiles/default_cmyk.icc
 # org.dspace.app.mediafilter.ImageMagickThumbnailFilter.srgb_profile = /usr/share/ghostscript/9.18/iccprofiles/default_rgb.icc
 
+# Optional: override ImageMagick's default density of 72 when creating PDF thum-
+# bnails. Greatly increases quality of resulting thumbnails, at the expense of
+# slightly longer execution times and higher memory usage. Any integer over 72
+# will help, but recommend 144 for a "2x" supersample.
+# org.dspace.app.mediafilter.ImageMagickThumbnailFilter.density = 144
+
 #### Crosswalk and Packager Plugin Settings ####
 # Crosswalks are used to translate external metadata formats into DSpace's internal format (DIM)
 # Packagers are used to ingest/export 'packages' (both content files and metadata)
@@ -714,6 +780,7 @@ event.dispatcher.default.class = org.dspace.event.BasicDispatcher
 # Adding doi here makes DSpace send metadata updates to your doi registration agency.
 # Add rdf here, if you are using dspace-rdf to export your repository content as RDF.
 # Add iiif here, if you are using dspace-iiif.
+# Add orcidqueue here, if the integration with ORCID is configured and wish to enable the synchronization queue functionality
 event.dispatcher.default.consumers = versioning, discovery, eperson
 
 # The noindex dispatcher will not create search or browse indexes (useful for batch item imports)
@@ -752,6 +819,10 @@ event.consumer.authority.filters = Item+Modify|Modify_Metadata
 event.consumer.iiif.class = org.dspace.iiif.consumer.IIIFCacheEventConsumer
 event.consumer.iiif.filters = Item+Modify:Item+Modify_Metadata:Item+Delete:Item+Remove:Bundle+ALL:Bitstream+All
 
+#orcid queue consumer
+event.consumer.orcidqueue.class = org.dspace.orcid.consumer.OrcidQueueConsumer
+event.consumer.orcidqueue.filters = Item+Install|Modify|Modify_Metadata|Delete|Remove
+
 # ...set to true to enable testConsumer messages to standard output
 #testConsumer.verbose = true
 
@@ -771,6 +842,22 @@ plugin.single.org.dspace.embargo.EmbargoSetter = org.dspace.embargo.DefaultEmbar
 # implementation of embargo lifter plugin - - replace with local implementation if applicable
 plugin.single.org.dspace.embargo.EmbargoLifter = org.dspace.embargo.DefaultEmbargoLifter
 
+# values for the forever embargo date threshold
+# This threshold date is used in the default access status helper to dermine if an item is
+# restricted or embargoed based on the start date of the primary (or first) file policies.
+# In this case, if the policy start date is inferior to the threshold date, the status will
+# be embargo, else it will be restricted.
+# You might want to change this threshold based on your needs. For example: some databases
+# doesn't accept a date superior to 31 december 9999.
+access.status.embargo.forever.year = 10000
+access.status.embargo.forever.month = 1
+access.status.embargo.forever.day = 1
+
+# implementation of access status helper plugin - replace with local implementation if applicable
+# This default access status helper provides an item status based on the policies of the primary
+# bitstream (or first bitstream in the original bundles if no primary file is specified).
+plugin.single.org.dspace.access.status.AccessStatusHelper = org.dspace.access.status.DefaultAccessStatusHelper
+
 #### Checksum Checker Settings ####
 # Default dispatcher in case none specified
 plugin.single.org.dspace.checker.BitstreamDispatcher=org.dspace.checker.SimpleDispatcher
@@ -877,6 +964,7 @@ webui.licence_bundle.show = false
 # since that usually contains email addresses which ought to be kept
 # private and is mainly of interest to administrators:
 metadata.hide.dc.description.provenance = true
+metadata.hide.person.email = true
 
 ##### Settings for Submission Process #####
 
@@ -885,6 +973,11 @@ metadata.hide.dc.description.provenance = true
 # Defaults to true; If set to 'false', submitter has option to skip upload
 #webui.submit.upload.required = true
 
+# Which field should be used for type-bind
+# Defaults to 'dc.type'; If changing this value, you must also update the related
+# dspace-angular environment configuration property submission.typeBind.field
+#submit.type-bind.field = dc.type
+
 #### Creative Commons settings ######
 
 # The url to the web service API
@@ -917,11 +1010,12 @@ cc.license.classfilter = recombo, mark
 # http://api.creativecommons.org/rest/1.5/support/jurisdictions
 # Commented out means the license is unported.
 # (e.g. nz = New Zealand, uk = England and Wales, jp = Japan)
+# or set value none for user-selected jurisdiction
 cc.license.jurisdiction = us
 
 # Locale for CC dialogs
 # A locale in the form language or language-country.
-# If no default locale is defined the CC default locale will be used
+# If no default locale is defined the current supported locale will be used
 cc.license.locale = en
 
 
@@ -1172,20 +1266,6 @@ plugin.named.org.dspace.content.license.LicenseArgumentFormatter = \
 #### Syndication Feed (RSS) Settings ######
 # TODO: UNSUPPORTED in DSpace 7.0. Will be added in a later release
 
-# enable syndication feeds - links display on community and collection home pages
-webui.feed.enable = true
-# number of DSpace items per feed (the most recent submissions)
-webui.feed.items = 4
-# maximum number of feeds in memory cache
-# value of 0 will disable caching
-webui.feed.cache.size = 100
-# number of hours to keep cached feeds before checking currency
-# value of 0 will force a check with each request
-webui.feed.cache.age = 48
-# which syndication formats to offer
-# use one or more (comma-separated) values from list:
-# rss_0.90, rss_0.91, rss_0.92, rss_0.93, rss_0.94, rss_1.0, rss_2.0
-webui.feed.formats = rss_1.0,rss_2.0,atom_1.0
 # URLs returned by the feed will point at the global handle server
 # (e.g. https://hdl.handle.net/123456789/1).  Set to true to use local server
 # URLs (i.e. https://myserver.myorg/handle/123456789/1)
@@ -1255,9 +1335,11 @@ webui.feed.item.author = dc.contributor.author
 # NB: for result data formatting, OpenSearch uses Syndication Feed Settings
 # so even if Syndication Feeds are not enabled, they must be configured
 # enable open search
-websvc.opensearch.enable = false
+websvc.opensearch.enable = true
 # context for html request URLs - change only for non-standard servlet mapping
-websvc.opensearch.uicontext = simple-search
+websvc.opensearch.uicontext = search
+# context for xml request URLs - change only for non-standard servlet mapping
+websvc.opensearch.svccontext = opensearch/search
 # present autodiscovery link in every page head
 websvc.opensearch.autolink = true
 # number of hours to retain results before recalculating
@@ -1276,8 +1358,8 @@ websvc.opensearch.samplequery = photosynthesis
 # tags used to describe search service
 websvc.opensearch.tags = IR DSpace
 # result formats offered - use 1 or more comma-separated from: html,atom,rss
-# NB: html is not supported in DSpace7, use normal search module instead
-websvc.opensearch.formats = atom,rss
+# html uses the normal search module
+websvc.opensearch.formats = html,atom,rss
 
 
 #### Content Inline Disposition Threshold ####
@@ -1344,94 +1426,6 @@ sherpa.romeo.url = https://v2.sherpa.ac.uk/cgi/retrieve
 # register for a new API key
 sherpa.romeo.apikey =
 
-#####  Authority Control Settings  #####
-#plugin.named.org.dspace.content.authority.ChoiceAuthority = \
-# org.dspace.content.authority.SampleAuthority = Sample, \
-# org.dspace.content.authority.SHERPARoMEOPublisher = SRPublisher, \
-# org.dspace.content.authority.SHERPARoMEOJournalTitle = SRJournalTitle, \
-#  org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
-
-#Uncomment to enable ORCID authority control
-#plugin.named.org.dspace.content.authority.ChoiceAuthority = \
-#    org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
-
-# URL of ORCID API
-# Defaults to using the Public API V3 (pub.orcid.org)
-orcid.api.url = https://pub.orcid.org/v3.0
-orcid.url = https://orcid.org/
-
-# ORCID Credentials
-# Your public or member API Credentials, see
-# https://orcid.org/content/register-client-application-0
-orcid.clientid =
-orcid.clientsecret =
-
-#ORCID JWT Endpoint
-orcid.oauth.url = https://orcid.org/oauth/token
-
-## The DCInputAuthority plugin is automatically configured with every
-## value-pairs element in input-forms.xml, namely:
-##   common_identifiers, common_types, common_iso_languages
-##
-## The DSpaceControlledVocabulary plugin is automatically configured
-## with every *.xml file in [dspace]/config/controlled-vocabularies,
-## and creates a plugin instance for each, using base filename as the name.
-## eg: nsi, srsc.
-## Each DSpaceControlledVocabulary plugin comes with three configuration options:
-# vocabulary.plugin._plugin_.hierarchy.store = <true|false>    # default: true
-# vocabulary.plugin._plugin_.hierarchy.suggest = <true|false>  # default: false
-# vocabulary.plugin._plugin_.delimiter = "<string>"            # default: "::"
-##
-## An example using "srsc" can be found later in this section
-
-plugin.selfnamed.org.dspace.content.authority.ChoiceAuthority = \
- org.dspace.content.authority.DCInputAuthority, \
- org.dspace.content.authority.DSpaceControlledVocabulary
-
-##
-## This sets the default lowest confidence level at which a metadata value is included
-## in an authority-controlled browse (and search) index.  It is a symbolic
-## keyword, one of the following values (listed in descending order):
-##   accepted
-##   uncertain
-##   ambiguous
-##   notfound
-##   failed
-##   rejected
-##   novalue
-##   unset
-## See manual or org.dspace.content.authority.Choices source for descriptions.
-authority.minconfidence = ambiguous
-
-# Configuration settings for ORCID based authority control, uncomment the lines below to enable configuration
-#solr.authority.server=${solr.server}/authority
-#choices.plugin.dc.contributor.author = SolrAuthorAuthority
-#choices.presentation.dc.contributor.author = authorLookup
-#authority.controlled.dc.contributor.author = true
-#authority.author.indexer.field.1=dc.contributor.author
-
-##
-## This sets the lowest confidence level at which a metadata value is included
-## in an authority-controlled browse (and search) index.  It is a symbolic
-## keyword from the same set as for the default "authority.minconfidence"
-#authority.minconfidence.dc.contributor.author = accepted
-
-## demo: subject code autocomplete, using srsc as authority
-## (DSpaceControlledVocabulary plugin must be enabled)
-## Warning: when enabling this feature any controlled vocabulary configuration in the input-forms.xml for the metadata field will be overridden.
-#vocabulary.plugin.srsc.hierarchy.store = true
-#vocabulary.plugin.srsc.hierarchy.suggest = true
-#vocabulary.plugin.srsc.delimiter = "::"
-
-# publisher name lookup through SHERPA/RoMEO:
-#choices.plugin.dc.publisher = SRPublisher
-#choices.presentation.dc.publisher = suggest
-
-## demo: journal title lookup, with ISSN as authority
-#choices.plugin.dc.title.alternative = SRJournalTitle
-#choices.presentation.dc.title.alternative = suggest
-#authority.controlled.dc.title.alternative = true
-
 ##### Google Scholar Metadata Configuration #####
 google-metadata.config = ${dspace.dir}/config/crosswalks/google-metadata.properties
 google-metadata.enable = true
@@ -1534,9 +1528,23 @@ log.report.dir = ${dspace.dir}/log
 # _uacct = "UA-XXXXXXX-X"
 # Take this key (just the UA-XXXXXX-X part) and place it here in this parameter.
 # google.analytics.key=UA-XXXXXX-X
+
 # The max number of events held in the GA buffer (default: 256)
 # google.analytics.buffer.limit=256
 
+# Define cron for how frequently events tracked in the DSpace backend will be sent to Google Analytics
+# This MUST be enabled if you wish to use `google.analytics.api-secret` to track bitstream download statistics (and similar)
+# Cron syntax is defined at https://www.quartz-scheduler.org/api/2.3.0/org/quartz/CronTrigger.html
+# Keep in mind, changing the schedule requires rebooting your servlet container, e.g. Tomcat.
+# The below example will run this task daily, every 5 minutes
+# google.analytics.cron = 0 0/5 * * * ?
+
+# Defines a Measurement Protocol API Secret to be used to track interactions which occur outside of the user's browser.
+# For example , this is required to track downloads of bitstreams. This setting is only used by Google Analytics 4.
+# For more details see https://developers.google.com/analytics/devguides/collection/protocol/ga4
+# google.analytics.api-secret =
+
+####################################################################
 #---------------------------------------------------------------#
 #----------------REQUEST ITEM CONFIGURATION---------------------#
 #---------------------------------------------------------------#
@@ -1546,12 +1554,70 @@ log.report.dir = ${dspace.dir}/log
 # logged - Login is mandatory to request an item
 # empty/commented out - request-copy not allowed
 request.item.type = all
-# Helpdesk E-mail
-mail.helpdesk = ${mail.admin}
-mail.helpdesk.name = Help Desk
 # Should all Request Copy emails go to the helpdesk instead of the item submitter?
 request.item.helpdesk.override = false
+# Should a rejection of a copy request send an email back to the requester?
+# Defaults to "true", which means a rejection email is sent back.
+# Setting it to "false" results in a silent rejection.
+request.item.reject.email = true
 
+#------------------------------------------------------------------#
+#------------------SUBMISSION CONFIGURATION------------------------#
+#------------------------------------------------------------------#
+# Field to use for type binding, default dc.type
+submit.type-bind.field = dc.type
+
+#---------------------------------------------------------------#
+#----------SOLR DATABASE RESYNC SCRIPT CONFIGURATION------------#
+#---------------------------------------------------------------#
+
+# The max amount of time allowed for an item to be present in solr with predb status without needing a reindex (in ms)
+# When unspecified or commented out, the default is 0
+solr-database-resync.time-until-reindex = 600000
+
+# Define cron for how frequently the solr search core should be resynced with items their database status
+# Cron syntax is defined at https://www.quartz-scheduler.org/api/2.3.0/org/quartz/CronTrigger.html
+# Uncomment this config and define a cron syntax to enable this scheduler.
+# The scheduler can also be disabled by setting to "-" (single dash) in local.cfg.
+# Keep in mind, changing the schedule requires rebooting your servlet container, e.g. Tomcat.
+solr-database-resync.cron = 0 15 2 * * ?
+
+#----------------------------------------------------------#
+#----------PROCESS CLEANER SCRIPT CONFIGURATION------------#
+#----------------------------------------------------------#
+# Processes older than this number of days will be deleted when the "process-cleaner" script is next run.
+# Default is 14 (i.e. processes that are two weeks or older will be deleted)
+# process-cleaner.days = 14
+
+#---------------------------------------------------------------#
+#----------------GOOGLE CAPTCHA CONFIGURATION-------------------#
+#---------------------------------------------------------------#
+# Enable CAPTCHA verification on ePerson registration
+
+registration.verification.enabled = false
+
+# version we want to use, possible values (v2 or v3)
+#google.recaptcha.version =
+
+# To start using reCAPTCHA, you need to sign up for an API key pair for your site.
+# The key pair consists of a site key and secret key.
+# Follow instructions on: http://www.google.com/recaptcha/admin
+#google.recaptcha.key.site =
+#google.recaptcha.key.secret =
+
+# site-verify contains url to be used during captcha validation
+google.recaptcha.site-verify = https://www.google.com/recaptcha/api/siteverify
+
+# reCAPTCHA v3 returns a score for each request (1.0 is very likely a human, 0.0 is very likely a bot).
+# with key.threshold we set the limit under that we consider invalid request
+#google.recaptcha.key.threshold = 0.5
+
+# for v3 we leave this property empty, because v3 allows you to verify if an interaction is legitimate without any user interaction.
+# for v2 we can choice between invisible and checkbox
+# invisible - The invisible reCAPTCHA badge does not require the user to click on a checkbox,
+#             instead it is invoked directly when the user clicks on an existing button on your site
+# checkbox - The "I'm not a robot" Checkbox requires the user to click a checkbox indicating the user is not a robot.
+#google.recaptcha.mode =
 
 #------------------------------------------------------------------#
 #-------------------MODULE CONFIGURATIONS--------------------------#
@@ -1567,6 +1633,7 @@ request.item.helpdesk.override = false
 # ${dspace.dir}/config/ directory.
 module_dir = modules
 
+
 # Load default module configs
 # ----------------------------
 # To exclude a module configuration, simply comment out its "include" statement.
@@ -1576,8 +1643,10 @@ module_dir = modules
 # PRIOR to those below (and therefore may override configs in these default
 # module configuration files).
 
+include = ${module_dir}/actuator.cfg
 include = ${module_dir}/actions.cfg
 include = ${module_dir}/altmetrics.cfg
+include = ${module_dir}/assetstore.cfg
 include = ${module_dir}/authentication.cfg
 include = ${module_dir}/authentication-ip.cfg
 include = ${module_dir}/authentication-ldap.cfg
@@ -1585,6 +1654,7 @@ include = ${module_dir}/authentication-oidc.cfg
 include = ${module_dir}/authentication-password.cfg
 include = ${module_dir}/authentication-shibboleth.cfg
 include = ${module_dir}/authentication-x509.cfg
+include = ${module_dir}/authority.cfg
 include = ${module_dir}/bulkedit.cfg
 include = ${module_dir}/citation-page.cfg
 include = ${module_dir}/clamav.cfg
@@ -1596,11 +1666,13 @@ include = ${module_dir}/healthcheck.cfg
 include = ${module_dir}/irus-statistics.cfg
 include = ${module_dir}/oai.cfg
 include = ${module_dir}/openaire-client.cfg
+include = ${module_dir}/orcid.cfg
 include = ${module_dir}/rdf.cfg
 include = ${module_dir}/rest.cfg
 include = ${module_dir}/iiif.cfg
 include = ${module_dir}/solr-statistics.cfg
 include = ${module_dir}/solrauthority.cfg
+include = ${module_dir}/researcher-profile.cfg
 include = ${module_dir}/spring.cfg
 include = ${module_dir}/submission-curation.cfg
 include = ${module_dir}/sword-client.cfg
@@ -1610,3 +1682,4 @@ include = ${module_dir}/translator.cfg
 include = ${module_dir}/usage-statistics.cfg
 include = ${module_dir}/versioning.cfg
 include = ${module_dir}/workflow.cfg
+include = ${module_dir}/external-providers.cfg
diff --git a/dspace-server-webapp/src/main/resources/iiif/cache/ehcache.xml b/dspace/config/ehcache.xml
similarity index 59%
rename from dspace-server-webapp/src/main/resources/iiif/cache/ehcache.xml
rename to dspace/config/ehcache.xml
index cc9ad164f7..41508a5fa8 100644
--- a/dspace-server-webapp/src/main/resources/iiif/cache/ehcache.xml
+++ b/dspace/config/ehcache.xml
@@ -1,22 +1,19 @@
 <!--
-
     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/
-
 -->
-<config
-        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+<config xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xmlns='http://www.ehcache.org/v3'
-        xsi:schemaLocation="
-            http://www.ehcache.org/v3
-            http://www.ehcache.org/schema/ehcache-core-3.7.xsd">
+        xsi:schemaLocation="http://www.ehcache.org/v3
+                            http://www.ehcache.org/schema/ehcache-core-3.7.xsd">
+
     <cache-template name="iiif-default">
         <listeners>
             <listener>
-                <class>org.dspace.app.rest.cache.CacheLogger</class>
+                <class>org.dspace.iiif.logger.CacheLogger</class>
                 <event-firing-mode>ASYNCHRONOUS</event-firing-mode>
                 <event-ordering-mode>UNORDERED</event-ordering-mode>
                 <events-to-fire-on>CREATED</events-to-fire-on>
@@ -33,7 +30,7 @@
     <cache-template name="iiif-canvas">
         <listeners>
             <listener>
-                <class>org.dspace.app.rest.cache.CanvasCacheLogger</class>
+                <class>org.dspace.iiif.logger.CanvasCacheLogger</class>
                 <event-firing-mode>ASYNCHRONOUS</event-firing-mode>
                 <event-ordering-mode>UNORDERED</event-ordering-mode>
                 <events-to-fire-on>CREATED</events-to-fire-on>
@@ -47,6 +44,26 @@
             <offheap unit="MB">4</offheap>
         </resources>
     </cache-template>
+    <cache-template name="sherpa-default">
+        <listeners>
+            <listener>
+                <class>org.dspace.app.sherpa.cache.SherpaCacheLogger</class>
+                <event-firing-mode>ASYNCHRONOUS</event-firing-mode>
+                <event-ordering-mode>UNORDERED</event-ordering-mode>
+                <events-to-fire-on>CREATED</events-to-fire-on>
+                <events-to-fire-on>EXPIRED</events-to-fire-on>
+                <events-to-fire-on>REMOVED</events-to-fire-on>
+                <events-to-fire-on>EVICTED</events-to-fire-on>
+            </listener>
+        </listeners>
+        <resources>
+            <heap>3000</heap>
+            <offheap unit="MB">4</offheap>
+        </resources>
+    </cache-template>
+
     <cache alias="manifests" uses-template="iiif-default"/>
     <cache alias="canvasdimensions" uses-template="iiif-canvas"/>
-</config>
+    <cache alias="sherpa.searchByJournalISSN" uses-template="sherpa-default"/>
+
+</config>
\ No newline at end of file
diff --git a/dspace/config/emails/change_password b/dspace/config/emails/change_password
index 6319d8b736..eb114feeeb 100644
--- a/dspace/config/emails/change_password
+++ b/dspace/config/emails/change_password
@@ -5,12 +5,18 @@
 ## See org.dspace.core.Email for information on the format of this file.
 ##
 #set($subject = 'Change Password Request')
+#set($phone = ${config.get('mail.message.helpdesk.telephone')})
 To change the password for your DSpace account, please click the link
 below:
 
   ${params[0]}
 
 If you need assistance with your account, please email
-${config.get("mail.admin")} or call us at xxx-555-xxxx.
+
+  ${config.get("mail.helpdesk")}
+#if( $phone )
+
+or call us at ${phone}.
+#end
 
 The DSpace Team
diff --git a/dspace/config/emails/register b/dspace/config/emails/register
index 1e60899d45..694be449a8 100644
--- a/dspace/config/emails/register
+++ b/dspace/config/emails/register
@@ -5,12 +5,18 @@
 ## See org.dspace.core.Email for information on the format of this file.
 ##
 #set($subject = "${config.get('dspace.name')} Account Registration")
+#set($phone = ${config.get('mail.message.helpdesk.telephone')})
 To complete registration for a DSpace account, please click the link
 below:
 
   ${params[0]}
 
 If you need assistance with your account, please email
-${config.get("mail.admin")} or call us at xxx-555-xxxx.
+
+  ${config.get("mail.helpdesk")}
+#if( $phone )
+
+or call us at ${phone}.
+#end
 
 The DSpace Team
diff --git a/dspace/config/emails/request_item.author b/dspace/config/emails/request_item.author
index 9166d31d78..ac79270e7f 100644
--- a/dspace/config/emails/request_item.author
+++ b/dspace/config/emails/request_item.author
@@ -1,3 +1,16 @@
+## E-mail sent to a restricted Item's author when a user requests a copy.
+##
+## Parameters: 0 requester's name
+##             1 requester's address
+##             2 name of a single bitstream, or "all"
+##             3 item Handle
+##             4 item title
+##             5 message from requester
+##             6 link back to DSpace for action
+##             7 corresponding author name
+##             8 corresponding author email
+##             9 configuration property "dspace.name"
+##             10 configuration property "mail.helpdesk"
 #set($subject = 'Request copy of document')
 
 Dear ${params[7]},
diff --git a/dspace/config/emails/request_item.to_admin b/dspace/config/emails/request_item.to_admin
deleted file mode 100644
index 244fa5647b..0000000000
--- a/dspace/config/emails/request_item.to_admin
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: Request copy of document
-
-Dear Administrator,
-
-A user of {7}, named {0} and using the email {1}, requested a copy of the file(s) associated with the document: "{4}" ({3}).
-
-This request came along with the following message:
-
-"{5}"
-
-To answer, click {6}. 
-
-PLEASE REDIRECT THIS MESSAGE TO THE AUTHOR(S).
diff --git a/dspace/config/emails/subscription b/dspace/config/emails/subscription
index 58a29c25ab..2879e57907 100644
--- a/dspace/config/emails/subscription
+++ b/dspace/config/emails/subscription
@@ -4,7 +4,7 @@
 ## Parameters: {0} is the details of the new collections and items
 ## See org.dspace.core.Email for information on the format of this file.
 ##
-$set($subject = 'DSpace Subscription')
+#set($subject = 'DSpace Subscription')
 New items are available in the collections you have subscribed to:
 
 ${params[0]}
diff --git a/dspace/config/emails/suggest b/dspace/config/emails/suggest
deleted file mode 100644
index 2f90b69ce1..0000000000
--- a/dspace/config/emails/suggest
+++ /dev/null
@@ -1,26 +0,0 @@
-## E-mail sent with the information filled out in a suggest form.
-##
-## Parameters: {0} recipient name
-##             {1} sender name
-##             {2} repository name
-##             {3} item title
-##             {4} item handle URI
-##             {5} item local URL - may be used in lieu of {4} if not using handle server
-##             {6} collection name
-##             {7} sender message
-## See org.dspace.core.Email for information on the format of this file.
-##
-#set($subject = 'An item of interest from DSpace')
-
-Hello ${params[0]}:
-
-${params[1]} requested we send you this email regarding an item available in ${params[2]}.
-
-Title: ${params[3]}
-Location: ${params[5]}
-In Collection: ${params[6]}
-Personal Message: ${params[7]}
-
-The DSpace digital repository system captures, stores, indexes, preserves, and distributes digital material.
-For more information, visit www.dspace.org
-
diff --git a/dspace/config/emails/welcome b/dspace/config/emails/welcome
new file mode 100644
index 0000000000..febc082e07
--- /dev/null
+++ b/dspace/config/emails/welcome
@@ -0,0 +1,15 @@
+## E-mail sent to a DSpace user after a new account is registered.
+##
+## See org.dspace.core.Email for information on the format of this file.
+##
+#set($subject = "Welcome new registered ${config.get('dspace.name')} user!")
+Thank you for registering an account.  Your new account can be used immediately
+to subscribe to notices of new content arriving in collections of your choice.
+
+Your new account can also be granted privileges to submit new content, or to
+edit and/or approve submissions.
+
+If you need assistance with your account, please email
+${config.get("mail.admin")}.
+
+The ${config.get('dspace.name')} Team
diff --git a/dspace/config/hibernate-ehcache-config.xml b/dspace/config/hibernate-ehcache-config.xml
index 5e1c18313b..e2edf67b60 100644
--- a/dspace/config/hibernate-ehcache-config.xml
+++ b/dspace/config/hibernate-ehcache-config.xml
@@ -8,103 +8,141 @@
     http://www.dspace.org/license/
 
 -->
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="ehcache.xsd"
-         updateCheck='false'
-         name='org.dspace.hibernate'>
+<config xmlns="http://www.ehcache.org/v3"
+        xmlns:jsr107='http://www.ehcache.org/v3/jsr107'
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.ehcache.org/v3 https://www.ehcache.org/schema/ehcache-core-3.0.xsd
+                            http://www.ehcache.org/v3/jsr107 https://www.ehcache.org/schema/ehcache-107-ext-3.0.xsd">
 
-    <diskStore path="java.io.tmpdir"/>
+    <service>
+        <jsr107:defaults default-template="default"/>
+    </service>
 
     <!--
-    Mandatory Default Cache configuration. These settings will be applied to caches
-    created programmtically using CacheManager.add(String cacheName).
-
-    The defaultCache has an implicit name "default" which is a reserved cache name.
+    Mandatory Default Cache configuration. These settings will be applied to
+    caches created programmatically using CacheManager.add(String cacheName).
     -->
-    <defaultCache
-         maxElementsInMemory="3000"
-         eternal="false"
-         timeToIdleSeconds="1"
-         timeToLiveSeconds="1200"
-         overflowToDisk="true"
-         diskSpoolBufferSizeMB="30"
-         maxElementsOnDisk="10000"
-         diskPersistent="false"
-         diskExpiryThreadIntervalSeconds="120"
-         memoryStoreEvictionPolicy="LRU">
-     </defaultCache>
+    <cache-template name="default">
+      <expiry>
+        <ttl unit='seconds'>1200</ttl>
+      </expiry>
+      <resources>
+        <heap unit='entries'>3000</heap>
+      </resources>
+    </cache-template>
 
-   <!-- this cache tracks the timestamps of the most recent updates to particular tables. 
-     It is important that the cache timeout of the underlying cache implementation be set to a 
-     higher value than the timeouts of any of the query caches. In fact, it is recommended that 
-     the the underlying cache not be configured for expiry at all. -->
-    <cache name="org.hibernate.cache.spi.UpdateTimestampsCache"
-           maxElementsInMemory="6000" eternal="true" overflowToDisk="false" />
+   <!-- This cache tracks the timestamps of the most recent updates to
+        particular tables.  It is important that the cache timeout of
+        the underlying cache implementation be set to a higher value
+        than the timeouts of any of the query caches.  In fact, it is
+        recommended that the the underlying cache not be configured
+        for expiry at all. -->
+    <cache alias='default-update-timestamps-region'>
+      <expiry>
+        <none/>
+      </expiry>
+      <heap unit='entries'>6000</heap>
+    </cache>
 
-    <!-- this cache stores the actual objects pulled out of the DB by hibernate -->
-    <cache name="org.hibernate.cache.internal.StandardQueryCache"
-           maxElementsInMemory="2000" eternal="false" timeToIdleSeconds="1800"
-           timeToLiveSeconds="600" overflowToDisk="false" diskExpiryThreadIntervalSeconds="60"
-           memoryStoreEvictionPolicy="LRU"/>
+    <!-- This cache stores the actual objects pulled out of the DB by
+         Hibernate. -->
+    <cache alias='default-query-results-region'>
+      <expiry>
+        <ttl>600</ttl>
+      </expiry>
+      <heap unit='entries'>2000</heap>
+    </cache>
 
     <!-- DSpace classes in the second level cache -->
 
-    <!-- We only have 1 site object, so it is best to cache it -->
-    <cache name="org.dspace.content.Site"
-           maxElementsInMemory="1" eternal="false" timeToIdleSeconds="86400"
-           timeToLiveSeconds="86400" overflowToDisk="false"
-           memoryStoreEvictionPolicy="LRU"/>
+    <!-- We only have 1 site object, so it is best to cache it. -->
+    <cache alias="org.dspace.content.Site">
+      <expiry>
+        <ttl>86400</ttl>
+      </expiry>
+      <heap unit='entries'>1</heap>
+    </cache>
 
-    <!-- The number of metadata schemas is limited and not updated frequently, so if we cache them
-         the likelihood of a cache hit is very high -->
-    <cache name="org.dspace.content.MetadataSchema"
-           maxElementsInMemory="100" eternal="false" timeToIdleSeconds="3600"
-           timeToLiveSeconds="3600" overflowToDisk="true" diskExpiryThreadIntervalSeconds="60"
-           memoryStoreEvictionPolicy="LRU"/>
+    <!-- The number of metadata schemas is limited and not updated frequently,
+         so if we cache them the likelihood of a cache hit is very high. -->
+    <cache alias="org.dspace.content.MetadataSchema"
+           uses-template="default">
+      <expiry>
+        <ttl>3600</ttl>
+      </expiry>
+      <heap unit='entries'>100</heap>
+    </cache>
 
-    <!-- The number of metadata fields is limited and not updated frequently, so if we cache them
-         the likelihood of a cache hit is very high -->
-    <cache name="org.dspace.content.MetadataField"
-           maxElementsInMemory="2000" eternal="false"  timeToIdleSeconds="3600"
-           timeToLiveSeconds="3600" overflowToDisk="true" diskExpiryThreadIntervalSeconds="60"
-           memoryStoreEvictionPolicy="LRU"/>
+    <!-- The number of metadata fields is limited and not updated frequently,
+         so if we cache them the likelihood of a cache hit is very high. -->
+    <cache alias="org.dspace.content.MetadataField"
+           uses-template="default">
+      <expiry>
+        <ttl>3600</ttl>
+      </expiry>
+      <heap unit='entries'>2000</heap>
+    </cache>
 
-    <!-- It is not a good idea to cache Item records. Most repositories have a large number of items
-         so the cache would have to be updated frequently. In addition there are many processes that
-         touch a lot of different items (discovery search, filter media, curation tasks...) which also makes
-         the cache less efficient. The probably of having a cache hit is thus very low and that is why Items
-         should not be cached. The same reasoning applies to Metadata values, Bundles, Bitstreams and Handles. -->
+    <!-- It is not a good idea to cache Item records. Most repositories have a
+         large number of items so the cache would have to be updated frequently.
+         In addition there are many processes that touch a lot of different
+         items (discovery search, filter media, curation tasks...) which also
+         makes the cache less efficient. The probably of having a cache hit is
+         thus very low and that is why Items should not be cached. The same
+         reasoning applies to Metadata values, Bundles, Bitstreams and Handles. -->
 
-    <!-- The number of groups in a repository can be very big, but only a small percentage of them is used
-         very frequently. So it makes sense to cache Group records because the cache hit rate is likely to be high -->
-    <cache name="org.dspace.eperson.Group"
-           maxElementsInMemory="5000" eternal="false" timeToIdleSeconds="1800"
-           timeToLiveSeconds="3600" overflowToDisk="false"
-           memoryStoreEvictionPolicy="LRU"/>
+    <!-- The number of groups in a repository can be very big, but only a small
+         percentage of them is used very frequently. So it makes sense to cache
+         Group records because the cache hit rate is likely to be high. -->
+    <cache alias="org.dspace.eperson.Group"
+           uses-template="default">
+      <expiry>
+        <ttl>3600</ttl>
+      </expiry>
+      <heap unit='entries'>5000</heap>
+    </cache>
 
-    <!-- Like items, there are too many different Resource policy records for the cache to work efficiently.
-         In addition, resource policies are the core security mechanism in DSpace so want need to be 100% we
-         do not receive a stale policy when querying them. -->
+    <!-- Like items, there are too many different Resource policy records for
+         the cache to work efficiently.  In addition, resource policies are the
+         core security mechanism in DSpace so want need to be 100% we do not
+         receive a stale policy when querying them. -->
 
-    <!-- The total number of epersons in DSpace can be very large, but the number of concurrent authenticated users is mostly
-         limited. Therefor having the authenticated users data cached will increase performance as the cache hit rate will
-         be high. -->
-    <cache name="org.dspace.eperson.EPerson"
-           maxElementsInMemory="1000" eternal="false" timeToIdleSeconds="1800"
-           timeToLiveSeconds="1800" overflowToDisk="false"
-           memoryStoreEvictionPolicy="LRU"/>
+    <!-- The total number of epersons in DSpace can be very large, but the
+         number of concurrent authenticated users is mostly limited. Therefor
+         having the authenticated users data cached will increase performance as
+         the cache hit rate will be high. -->
+    <cache alias="org.dspace.eperson.EPerson"
+           uses-template="default">
+      <expiry>
+        <ttl>1800</ttl>
+      </expiry>
+      <heap unit='entries'>1000</heap>
+    </cache>
 
-    <!-- The number of collections is mostly a fixed set in a repository which is not updated frequently. This means that
-         most queries for a collection will be able to use the cached version. So adding caching here makes sense. -->
-    <cache name="org.dspace.content.Collection"
-           maxElementsInMemory="4000" eternal="false" timeToIdleSeconds="1800"
-           timeToLiveSeconds="1800" overflowToDisk="true" diskExpiryThreadIntervalSeconds="60"
-           memoryStoreEvictionPolicy="LRU"/>
+    <!-- The number of collections is mostly a fixed set in a repository which
+         is not updated frequently. This means that most queries for a
+         collection will be able to use the cached version. So adding caching
+         here makes sense. -->
+    <cache alias="org.dspace.content.Collection"
+           uses-template="default">
+      <expiry>
+        <ttl>1800</ttl>
+      </expiry>
+      <resources>
+        <heap unit='entries'>4000</heap>
+      </resources>
+    </cache>
 
-    <!-- Like collections, the same applies to communities. So we also setup a cache for communities. -->
-    <cache name="org.dspace.content.Community"
-           maxElementsInMemory="2000" eternal="false" timeToIdleSeconds="1800"
-           timeToLiveSeconds="1800" overflowToDisk="true" diskExpiryThreadIntervalSeconds="60"
-           memoryStoreEvictionPolicy="LRU"/>
+    <!-- Like collections, the same applies to communities. So we also setup a
+         cache for communities. -->
+    <cache alias="org.dspace.content.Community"
+           uses-template="default">
+      <expiry>
+        <ttl>1800</ttl>
+      </expiry>
+      <resources>
+        <heap unit='entries'>2000</heap>
+      </resources>
+    </cache>
 
-</ehcache>
+</config>
diff --git a/dspace/config/hibernate.cfg.xml b/dspace/config/hibernate.cfg.xml
index 39f5a11378..085ed0bd6e 100644
--- a/dspace/config/hibernate.cfg.xml
+++ b/dspace/config/hibernate.cfg.xml
@@ -21,12 +21,17 @@
         <!--Second level cache configuration-->
         <property name="hibernate.cache.use_query_cache">true</property>
         <property name="hibernate.cache.use_second_level_cache">true</property>
-        <property name="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</property>
         <property name="hibernate.cache.use_structured_entries">true</property>
+        <property name="hibernate.cache.region.factory_class">
+                  org.hibernate.cache.jcache.JCacheRegionFactory
+        </property>
+        <property name="hibernate.javax.cache.provider">
+                  org.ehcache.jsr107.EhcacheCachingProvider
+        </property>
+        <!-- hibernate.javax.cache.uri is defined in
+                  config/spring/api/core-hibernate.xml so that we can use
+                  property substitution. -->
         <property name="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</property>
-        <!-- Set in config/spring/api/core-hibernate.xml -->
-        <!--<property name="net.sf.ehcache.configurationResourceName">file:${dspace.dir}/config/hibernate-ehcache-config.xml</property>-->
-
 
         <!-- Entities to be loaded by hibernate -->
         <mapping class="org.dspace.app.util.WebApp"/>
@@ -83,6 +88,10 @@
         <mapping class="org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem"/>
 
         <mapping class="org.dspace.statistics.export.OpenURLTracker"/>
+        
+        <mapping class="org.dspace.orcid.OrcidQueue" />
+        <mapping class="org.dspace.orcid.OrcidHistory" />
+        <mapping class="org.dspace.orcid.OrcidToken"/>
 
     </session-factory>
 </hibernate-configuration>
diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml
index 702af8f865..299a5fdfce 100644
--- a/dspace/config/item-submission.xml
+++ b/dspace/config/item-submission.xml
@@ -203,6 +203,12 @@
             <processing-class>org.dspace.submit.step.SampleStep</processing-class>
             <type>sample</type>
         </step-definition>
+
+        <step-definition id="sherpaPolicies" mandatory="true">
+            <heading>submit.progressbar.sherpapolicy</heading>
+            <processing-class>org.dspace.app.rest.submit.step.SherpaPolicyStep</processing-class>
+            <type>sherpaPolicy</type>
+        </step-definition>
     </step-definitions>
 
     <!-- The submission-definitions map lays out the detailed definition of -->
@@ -235,8 +241,12 @@
             <!-- Uncomment this step to allow the user to embargo or access restrict the entire item -->
             <!-- <step id="itemAccessConditions"/> -->
 
+            <!-- Uncomment this step to show when appropriate publisher policies retrieved from SHERPA/RoMEO -->
+            <!-- <step id="sherpaPolicies"/> -->
+
             <!--Step will be to Upload the item -->
             <step id="upload"/>
+
             <!-- <step id="extractionstep"/> -->
 
             <!-- Uncomment this step to allow the user to select a Creative Commons License -->
diff --git a/dspace/config/launcher.xml b/dspace/config/launcher.xml
index bb1f127193..be8564a0e6 100644
--- a/dspace/config/launcher.xml
+++ b/dspace/config/launcher.xml
@@ -89,13 +89,6 @@
             <class>org.dspace.embargo.EmbargoCLITool</class>
         </step>
     </command>
-    <command>
-        <name>export</name>
-        <description>Export items or collections</description>
-        <step>
-            <class>org.dspace.app.itemexport.ItemExportCLITool</class>
-        </step>
-    </command>
     <command>
         <name>generate-sitemaps</name>
         <description>Generate search engine and html sitemaps</description>
@@ -110,13 +103,6 @@
             <class>org.dspace.app.harvest.Harvest</class>
         </step>
     </command>
-    <command>
-        <name>import</name>
-        <description>Import items into DSpace</description>
-        <step>
-            <class>org.dspace.app.itemimport.ItemImportCLITool</class>
-        </step>
-    </command>
     <command>
         <name>index-authority</name>
         <description>Indexes all metadata fields that use solr authority</description>
diff --git a/dspace/config/local.cfg.EXAMPLE b/dspace/config/local.cfg.EXAMPLE
index bdedcfd05e..cf13a47d76 100644
--- a/dspace/config/local.cfg.EXAMPLE
+++ b/dspace/config/local.cfg.EXAMPLE
@@ -32,24 +32,28 @@
 # Windows note: Please remember to use forward slashes for all paths (e.g. C:/dspace)
 dspace.dir=/dspace
 
-# URL of DSpace backend ('server' webapp). Include port number etc.
+# Public URL of DSpace backend ('server' webapp). May require a port number if not using standard ports (80 or 443)
 # DO NOT end it with '/'.
-# This is where REST API and all enabled server modules (OAI-PMH, SWORD,
-# SWORDv2, RDF, etc) will respond.
+# This is where REST API and all enabled server modules (OAI-PMH, SWORD, SWORDv2, RDF, etc) will respond.
+# NOTE: This URL must be accessible to all DSpace users (should not use 'localhost' in Production)
+# and is usually "synced" with the "rest" section in the DSpace User Interface's config.*.yml.
+# It corresponds to the URL that you would type into your browser to access the REST API.
 dspace.server.url = http://localhost:8080/server
 
-# URL of DSpace frontend (Angular UI). Include port number etc.
+# Public URL of DSpace frontend (Angular UI). May require a port number if not using standard ports (80 or 443)
 # DO NOT end it with '/'.
-# This is used by the backend to provide links in emails, RSS feeds, Sitemaps,
-# etc.
+# This is used by the backend to provide links in emails, RSS feeds, Sitemaps, etc.
+# NOTE: this URL must be accessible to all DSpace users (should not use 'localhost' in Production).
+# It corresponds to the URL that you would type into your browser to access the User Interface.
 dspace.ui.url = http://localhost:4000
 
 # Name of the site
 dspace.name = DSpace at My University
 
-# assetstore.dir, look at DSPACE/config/spring/api/bitstore.xml for more options
-# default is ${dspace.dir}/assetstore, uncomment and modify if you need to use a different path
-#assetstore.dir = ${dspace.dir}/assetstore
+# Assetstore configurations have moved to config/modules/assetstore.cfg
+# and config/spring/api/bitstore.xml.
+# Additional storage options (e.g. Amazon S3) are available in `assetstore.cfg`
+# assetstore.dir = ${dspace.dir}/assetstore
 
 # Default language for metadata values
 #default.language = en_US
@@ -59,25 +63,32 @@ dspace.name = DSpace at My University
 # Since DSpace 7, SOLR must be installed as a stand-alone service
 #solr.server = http://localhost:8983/solr
 
+# Solr core name prefix.
+# If you connect multiple instances of DSpace to a single Solr instance, you
+# can organize them with a common core name prefix.
+#solr.multicorePrefix =
+
 ##########################
 # DATABASE CONFIGURATION #
 ##########################
 # DSpace only supports two database types: PostgreSQL or Oracle
+# PostgreSQL is highly recommended.
+# Oracle support is DEPRECATED. See https://github.com/DSpace/DSpace/issues/8214
 
 # URL for connecting to database
 #    * Postgres template: jdbc:postgresql://localhost:5432/dspace
-#    * Oracle template: jdbc:oracle:thin:@//localhost:1521/xe
+#    * Oracle template (DEPRECATED): jdbc:oracle:thin:@//localhost:1521/xe
 db.url = jdbc:postgresql://localhost:5432/dspace
 
 # JDBC Driver
 #    * For Postgres: org.postgresql.Driver
-#    * For Oracle:   oracle.jdbc.OracleDriver
+#    * For Oracle (DEPRECATED):   oracle.jdbc.OracleDriver
 db.driver = org.postgresql.Driver
 
 # Database Dialect (for Hibernate)
-#    * For Postgres: org.dspace.storage.rdbms.hibernate.postgres.DSpacePostgreSQL82Dialect
-#    * For Oracle:   org.hibernate.dialect.Oracle10gDialect
-db.dialect = org.dspace.storage.rdbms.hibernate.postgres.DSpacePostgreSQL82Dialect
+#    * For Postgres: org.hibernate.dialect.PostgreSQL94Dialect
+#    * For Oracle (DEPRECATED):   org.hibernate.dialect.Oracle10gDialect
+db.dialect = org.hibernate.dialect.PostgreSQL94Dialect
 
 # Database username and password
 db.username = dspace
@@ -85,7 +96,7 @@ db.password = dspace
 
 # Database Schema name
 #    * For Postgres, this is often "public" (default schema)
-#    * For Oracle, schema is equivalent to the username of your database account,
+#    * For Oracle (DEPRECATED), schema is equivalent to the username of your database account,
 #      so this may be set to ${db.username} in most scenarios.
 db.schema = public
 
@@ -128,6 +139,10 @@ db.schema = public
 # General site administration (Webmaster) e-mail
 #mail.admin = dspace-help@myu.edu
 
+# Helpdesk E-mail
+#mail.helpdesk = ${mail.admin}
+#mail.helpdesk.name = Help Desk
+
 # Recipient for server errors and alerts (defaults to mail.admin)
 #alert.recipient = ${mail.admin}
 
@@ -197,6 +212,9 @@ db.schema = public
 # Check also the cors settings below
 #plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.ShibAuthentication
 
+# ORCID certificate authentication.
+# plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.OrcidAuthentication
+
 # X.509 certificate authentication. See authentication-x509.cfg for default configuration.
 #plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.X509Authentication
 
@@ -232,4 +250,4 @@ db.schema = public
 #spring.servlet.multipart.max-file-size = 512MB
 
 # Maximum size of a multipart request (i.e. max total size of all files in one request)
-#spring.servlet.multipart.max-request-size = 512MB
+#spring.servlet.multipart.max-request-size = 512MB
\ No newline at end of file
diff --git a/dspace/config/modules/actuator.cfg b/dspace/config/modules/actuator.cfg
new file mode 100644
index 0000000000..a14a3f1cac
--- /dev/null
+++ b/dspace/config/modules/actuator.cfg
@@ -0,0 +1,58 @@
+
+#---------------------------------------------------------------#
+#------------SPRING BOOT ACTUATOR CONFIGURATION-----------------#
+#---------------------------------------------------------------#
+
+# Health endpoint configuration, for more details see https://docs.spring.io/spring-boot/docs/current/reference/html/actuator.html#actuator.endpoints.health
+
+## Configuration to establish when show the health status details
+management.endpoint.health.show-details = when-authorized
+## Configuration which users can see the health status details
+management.endpoint.health.roles = ADMIN
+## Configuration to establis
+management.endpoint.health.status.order= down, out-of-service, up-with-issues, up, unknown
+## Configuration that enables only health and info endpoints
+management.endpoints.web.exposure.include=health,info
+
+## Configuration to set 200 as status of health http response when it is DOWN or OUT_OF_SERVICE
+## The DSpace UI requires these be set to 200 in order to support health status reports when services are down.
+management.endpoint.health.status.http-mapping.down = 200
+management.endpoint.health.status.http-mapping.out-of-service = 200
+
+management.health.ping.enabled = false
+management.health.diskSpace.enabled = false
+
+# CORS configuration for all actuators
+management.endpoints.web.cors.allowed-origins = ${rest.cors.allowed-origins}
+management.endpoints.web.cors.allowed-methods = *
+management.endpoints.web.cors.allowed-headers = Accept, Authorization, Content-Type, Origin, X-On-Behalf-Of, X-Requested-With, X-XSRF-TOKEN, X-CORRELATION-ID, X-REFERRER
+management.endpoints.web.cors.exposed-headers = Authorization, DSPACE-XSRF-TOKEN, Location, WWW-Authenticate
+management.endpoints.web.cors.allow-credentials = true
+
+#---------------------------------------------------------------#
+#------------------------INFO ENDPOINT--------------------------#
+#---------------------------------------------------------------#
+
+# All properties under the info key will be automatically exposed by the info actuator with a json structure. Furthermore, it is possible to 
+# enrich the content of the response given by the info actuator by defining in the Spring context beans of classes that implements InfoContributor.
+
+management.info.env.enabled = true
+management.info.java.enabled = true
+
+info.app.name = ${dspace.name}
+info.app.version = ${dspace.version}
+info.app.dir = ${dspace.dir}
+info.app.url = ${dspace.server.url}
+info.app.db = ${db.url}
+info.app.solr.server = ${solr.server}
+info.app.solr.prefix = ${solr.multicorePrefix}
+info.app.mail.server = ${mail.server}
+info.app.mail.from-address = ${mail.from.address}
+info.app.mail.feedback-recipient = ${feedback.recipient}
+info.app.mail.mail-admin = ${mail.admin}
+info.app.mail.mail-helpdesk = ${mail.helpdesk}
+info.app.mail.alert-recipient = ${alert.recipient}
+
+info.app.cors.allowed-origins = ${rest.cors.allowed-origins}
+
+info.app.ui.url = ${dspace.ui.url}
diff --git a/dspace/config/modules/assetstore.cfg b/dspace/config/modules/assetstore.cfg
new file mode 100644
index 0000000000..cbee6bd2c3
--- /dev/null
+++ b/dspace/config/modules/assetstore.cfg
@@ -0,0 +1,57 @@
+#---------------------------------------------------------------#
+#-----------------STORAGE CONFIGURATIONS------------------------#
+#---------------------------------------------------------------#
+# Configuration properties used by the bitstore.xml config file #
+#                                                               #
+#---------------------------------------------------------------#
+
+# assetstore.dir, look at DSPACE/config/spring/api/bitstore.xml for more options
+assetstore.dir = ${dspace.dir}/assetstore
+
+# Configures the primary store to be local or S3.
+# This value will be used as `incoming` default store inside the `bitstore.xml`
+# Possible values are:
+#     - 0: to use the `localStore`;
+#     - 1: to use the `s3Store`. 
+# If you want to add additional assetstores, they must be added to that bitstore.xml
+# and new values should be provided as key-value pairs in the `stores` map of the
+# `bitstore.xml` configuration. 
+assetstore.index.primary = 0
+
+#---------------------------------------------------------------#
+#-------------- Amazon S3 Specific Configurations --------------#
+#---------------------------------------------------------------#
+# The below configurations are only used if the primary storename
+# is set to 's3Store' or the 's3Store' is configured as a secondary store
+# in your bitstore.xml
+
+# Enables or disables the store initialization during startup, without initialization the store won't work.
+# if changed to true, a lazy initialization will be tried on next store usage, be careful an excecption could be thrown
+assetstore.s3.enabled = false
+
+# For using a relative path (xx/xx/xx/xxx...) set to true, default it false
+# When true: it splits the path into subfolders, each of these
+# are 2-chars (2-bytes) length, the last is the filename and could have
+# at max 3-chars (3-bytes).
+# When false: is used the absolute path using full filename. 
+assetstore.s3.useRelativePath = false
+
+# S3 bucket name to store assets in. If unspecified, by default DSpace will
+# create a bucket based on the hostname of `dspace.ui.url` setting.
+assetstore.s3.bucketName =
+
+# Subfolder to organize assets within the bucket, in case this bucket
+# is shared. Optional, default is root level of bucket
+assetstore.s3.subfolder =
+
+# please don't use root credentials in production but rely on the aws credentials default
+# discovery mechanism to configure them (ENV VAR, EC2 Iam role, etc.)
+# The preferred approach for security reason is to use the IAM user credentials, but isn't always possible.
+# More information about credentials here: https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html
+# More information about IAM usage here: https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/java-dg-roles.html
+assetstore.s3.awsAccessKey =
+assetstore.s3.awsSecretKey =
+
+# If the credentials are left empty,
+# then this setting is ignored and the default AWS region will be used.
+assetstore.s3.awsRegionName =
\ No newline at end of file
diff --git a/dspace/config/modules/authentication-password.cfg b/dspace/config/modules/authentication-password.cfg
index 07aaeed14d..078da7f8d1 100644
--- a/dspace/config/modules/authentication-password.cfg
+++ b/dspace/config/modules/authentication-password.cfg
@@ -26,3 +26,24 @@
 # SHA-256, SHA-384, and SHA-512 should be available, but you may have 
 # installed others.  If not set, SHA-512 will be used.
 # authentication-password.digestAlgorithm = SHA-512
+
+###### Validate Password Robustness Configuration ######
+# (by default is enabled, to disable, either comment out this configuration or set it to an empty value)
+# This regular expression is used to validate password during creation of EPerson
+# or during the patch of password.
+# NOTE: when you configure a custom regex, you will also need to update the text of 
+# "org.dspace.app.rest.exception.PasswordNotValidException.message" in Messages.properties to describe the minimum requirements.
+#
+# The following regex applies subsequent rules: ^(?=.*?[a-z])(?=.*?[A-Z])(?=\\S*?[0-9])(?=\\S*?[!?$@#$%^&+=]).{8\,15}$
+# 1) (?=.*?[a-z])             - the password must contain at least one lowercase character
+# 2) (?=.*?[A-Z])             - the password must contain at least one uppercase character
+# 3) (?=\\S*?[0-9])           - the password must contain at least one numeric character
+# 4) (?=\\S*?[!?$@#$%^&+=])   - the password must contain at least one of the following special character: !?$@#$%^&+=
+# 5) {8\,15}                  - the password must be at least 8 and at most 15 characters long
+# REMARK: {8\,15} - the slash in this regex is an exception of the Apache library, as "," is a special character,
+#                   consequently to interpret it correctly you have to add the slash in front
+
+# By default, DSpace just requires a password of 8 or more characters.  
+# However, we recommend most sites consider either increasing the required length or complexity (see example above)
+authentication-password.regex-validation.pattern = ^.{8\,}$
+
diff --git a/dspace/config/modules/authentication.cfg b/dspace/config/modules/authentication.cfg
index df07f91533..568f871e3c 100644
--- a/dspace/config/modules/authentication.cfg
+++ b/dspace/config/modules/authentication.cfg
@@ -24,6 +24,9 @@
 #  * X.509 Certificate Authentication
 #        Plugin class: org.dspace.authenticate.X509Authentication
 #        Configuration file: authentication-x509.cfg
+#  * ORCID certificate authentication.
+#        Plugin class: org.dspace.authenticate.OrcidAuthentication
+#        Configuration file: orcid.cfg
 #  * OIDC Authentication
 #        Plugin class: org.dspace.authenticate.OidcAuthentication
 #        Configuration file: authentication-oidc.cfg
@@ -49,6 +52,9 @@
 # X.509 certificate authentication. See authentication-x509.cfg for default configuration.
 #plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.X509Authentication
 
+# ORCID certificate authentication.
+# plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.OrcidAuthentication
+
 # OIDC authentication. See authentication-oidc.cfg for default configuration.
 #plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.OidcAuthentication
 
diff --git a/dspace/config/modules/authority.cfg b/dspace/config/modules/authority.cfg
new file mode 100644
index 0000000000..cd0f689e11
--- /dev/null
+++ b/dspace/config/modules/authority.cfg
@@ -0,0 +1,88 @@
+#---------------------------------------------------------------#
+#----------------- AUTHORITY CONFIGURATIONS --------------------#
+#---------------------------------------------------------------#
+# These configs are used by the authority framework             #
+#---------------------------------------------------------------#
+
+## The DCInputAuthority plugin is automatically configured with every
+## value-pairs element in input-forms.xml, namely:
+##   common_identifiers, common_types, common_iso_languages
+##
+## The DSpaceControlledVocabulary plugin is automatically configured
+## with every *.xml file in [dspace]/config/controlled-vocabularies,
+## and creates a plugin instance for each, using base filename as the name.
+## eg: nsi, srsc.
+## Each DSpaceControlledVocabulary plugin comes with three configuration options:
+# vocabulary.plugin._plugin_.hierarchy.store = <true|false>    # default: true
+# vocabulary.plugin._plugin_.hierarchy.suggest = <true|false>  # default: false
+# vocabulary.plugin._plugin_.delimiter = "<string>"            # default: "::"
+##
+## An example using "srsc" can be found later in this section
+
+plugin.selfnamed.org.dspace.content.authority.ChoiceAuthority = \
+ org.dspace.content.authority.DCInputAuthority, \
+ org.dspace.content.authority.DSpaceControlledVocabulary
+ 
+ ##
+## This sets the default lowest confidence level at which a metadata value is included
+## in an authority-controlled browse (and search) index.  It is a symbolic
+## keyword, one of the following values (listed in descending order):
+##   accepted
+##   uncertain
+##   ambiguous
+##   notfound
+##   failed
+##   rejected
+##   novalue
+##   unset
+## See manual or org.dspace.content.authority.Choices source for descriptions.
+authority.minconfidence = ambiguous
+
+# Configuration settings for ORCID based authority control.
+# Uncomment the lines below to enable configuration
+#choices.plugin.dc.contributor.author = SolrAuthorAuthority
+#choices.presentation.dc.contributor.author = authorLookup
+#authority.controlled.dc.contributor.author = true
+#authority.author.indexer.field.1=dc.contributor.author
+
+##
+## This sets the lowest confidence level at which a metadata value is included
+## in an authority-controlled browse (and search) index.  It is a symbolic
+## keyword from the same set as for the default "authority.minconfidence"
+#authority.minconfidence.dc.contributor.author = accepted
+
+## demo: subject code autocomplete, using srsc as authority
+## (DSpaceControlledVocabulary plugin must be enabled)
+## Warning: when enabling this feature any controlled vocabulary configuration in the input-forms.xml for the metadata field will be overridden.
+#vocabulary.plugin.srsc.hierarchy.store = true
+#vocabulary.plugin.srsc.hierarchy.suggest = true
+#vocabulary.plugin.srsc.delimiter = "::"
+
+# publisher name lookup through SHERPA/RoMEO:
+#choices.plugin.dc.publisher = SRPublisher
+#choices.presentation.dc.publisher = suggest
+
+## demo: journal title lookup, with ISSN as authority
+#choices.plugin.dc.title.alternative = SRJournalTitle
+#choices.presentation.dc.title.alternative = suggest
+#authority.controlled.dc.title.alternative = true
+ 
+#####  Authority Control Settings  #####
+#plugin.named.org.dspace.content.authority.ChoiceAuthority = \
+# org.dspace.content.authority.SampleAuthority = Sample, \
+# org.dspace.content.authority.SHERPARoMEOPublisher = SRPublisher, \
+# org.dspace.content.authority.SHERPARoMEOJournalTitle = SRJournalTitle, \
+# org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
+
+#Uncomment to enable ORCID authority control
+#plugin.named.org.dspace.content.authority.ChoiceAuthority = \
+# org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
+
+plugin.named.org.dspace.content.authority.ChoiceAuthority = \
+org.dspace.content.authority.EPersonAuthority = EPersonAuthority
+
+# Configuration settings required for Researcher Profiles
+# These settings ensure "dspace.object.owner" field are indexed by Authority Control
+#choices.plugin.dspace.object.owner = EPersonAuthority
+#choices.presentation.dspace.object.owner = suggest
+#authority.controlled.dspace.object.owner = true
diff --git a/dspace/config/modules/bulkedit.cfg b/dspace/config/modules/bulkedit.cfg
index 9e6ec59372..6174af53a0 100644
--- a/dspace/config/modules/bulkedit.cfg
+++ b/dspace/config/modules/bulkedit.cfg
@@ -32,3 +32,11 @@
 # By default, only 'dspace.agreements.end-user' can be deleted in bulk, as doing so allows
 # an administrator to force all users to re-review the End User Agreement on their next login.
 bulkedit.allow-bulk-deletion = dspace.agreements.end-user
+
+### metadata import script ###
+# Set the number after which the changes should be committed while running the script
+# After too much consecutive records everything starts to slow down because too many things are being loaded into memory
+# If we commit these to the database these are cleared out of our memory and we don't lose as much performance
+# By default this is set to 100
+bulkedit.change.commit.count = 100
+
diff --git a/dspace/config/modules/curate.cfg b/dspace/config/modules/curate.cfg
index b146bc6c2f..1d7b87960d 100644
--- a/dspace/config/modules/curate.cfg
+++ b/dspace/config/modules/curate.cfg
@@ -15,6 +15,7 @@ plugin.named.org.dspace.curate.CurationTask = org.dspace.ctask.general.RequiredM
 #plugin.named.org.dspace.curate.CurationTask = org.dspace.ctask.general.MicrosoftTranslator = translate
 plugin.named.org.dspace.curate.CurationTask = org.dspace.ctask.general.MetadataValueLinkChecker = checklinks
 plugin.named.org.dspace.curate.CurationTask = org.dspace.ctask.general.RegisterDOI = registerdoi
+#plugin.named.org.dspace.curate.CurationTask = org.dspace.ctask.general.CitationPage = citationpage
 # add new tasks here (or in additional config files)
 
 ## task queue implementation
diff --git a/dspace/config/modules/discovery.cfg b/dspace/config/modules/discovery.cfg
index 121aea11ac..72088ddc49 100644
--- a/dspace/config/modules/discovery.cfg
+++ b/dspace/config/modules/discovery.cfg
@@ -5,7 +5,7 @@
 # faceted-search system.                                        #
 #---------------------------------------------------------------#
 ##### Search Indexing #####
-discovery.search.server = ${solr.server}/search
+discovery.search.server = ${solr.server}/${solr.multicorePrefix}search
 
 #Enable the url validation of the search.server setting above.
 #Defaults to true: validation is enabled
diff --git a/dspace/config/modules/external-providers.cfg b/dspace/config/modules/external-providers.cfg
new file mode 100644
index 0000000000..b7c0e120db
--- /dev/null
+++ b/dspace/config/modules/external-providers.cfg
@@ -0,0 +1,94 @@
+#---------------------------------------------------------------#
+#------------- EXTERNAL PROVIDER CONFIGURATIONS ----------------#
+#---------------------------------------------------------------#
+#  Configuration properties used solely by external providers   #
+#  as Scopus, Pubmed, CiNii and ect.                            #
+#---------------------------------------------------------------#
+
+
+#################################################################
+#----------------------   CrossRef   ---------------------------#
+#---------------------------------------------------------------#
+crossref.url = https://api.crossref.org/works
+#################################################################
+#----------------------   VuFind   -----------------------------#
+#---------------------------------------------------------------#
+vufind.url = https://vufind.org/advanced_demo/api/v1/record
+vufind.url.search = https://vufind.org/advanced_demo/api/v1/search
+#################################################################
+#----------------------   Scielo   -----------------------------#
+#---------------------------------------------------------------#
+scielo.url = https://search.scielo.org/?output=ris&q=
+#################################################################
+#----------   NASA Astrophysics Data System (ADS)  -------------#
+#---------------------------------------------------------------#
+#
+# follow link to get apikey: https://ui.adsabs.harvard.edu/help/api/
+ads.key =
+ads.url = https://api.adsabs.harvard.edu/v1/search/query
+# comma delimited set of fields to return; default is 'id'
+ads.resultFieldList = abstract,ack,aff,alternate_bibcode,alternate_title,arxiv_class,author,bibcode,bibgroup,bibstem,citation_count,copyright,database,doi,doctype,first_author,grant,id,indexstamp,issue,keyword,lang,orcid_pub,orcid_user,orcid_other,page,property,pub,pubdate,read_count,title,vizier,volume,year
+#################################################################
+#---------   European Patent Office (EPO)   --------------------#
+#---------------------------------------------------------------#
+#
+# follow link to get apikey: https://developers.epo.org/
+epo.consumerKey =
+epo.consumerSecretKey =
+
+# this URL will be used during authentication to get access token
+epo.authUrl = https://ops.epo.org/3.2/auth/accesstoken
+# this URL is used to performe specific query  by epo document id & epo document type
+epo.url = https://ops.epo.org/rest-services/published-data/publication/$(doctype)/$(id)/biblio
+# this url will be used to performe basic searching
+epo.searchUrl = https://ops.epo.org/rest-services/published-data/search
+#################################################################
+#----------------------   PubMed   -----------------------------#
+#---------------------------------------------------------------#
+pubmed.url.search = https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi
+pubmed.url.fetch = https://eutils.ncbi.nlm.nih.gov/entrez/eutils/efetch.fcgi
+#################################################################
+#----------------------   CiNii    -----------------------------#
+#---------------------------------------------------------------#
+
+# this url used to perform a specific search by id
+cinii.url = https://cir.nii.ac.jp/crid/
+# this url used to perform a generic search
+cinii.url.search = https://ci.nii.ac.jp/opensearch/search
+
+#appid stand for application ID, for more information visit https://support.nii.ac.jp/en/cinii/api/developer 
+cinii.appid =
+#################################################################
+#------------------   PubMed Europe    -------------------------#
+#---------------------------------------------------------------#
+
+pubmedeurope.url = https://www.ebi.ac.uk/europepmc/webservices/rest/search
+#################################################################
+#-----------------------   Scopus    ---------------------------#
+#---------------------------------------------------------------#
+
+scopus.url = https://api.elsevier.com/content/search/scopus
+# follow link to get apikey: https://dev.elsevier.com/
+scopus.apiKey =
+# leave empty if you don't need to use an institutional token
+scopus.instToken =
+#The view mode to be used for the scopus search endpoint.
+#For more details see https://dev.elsevier.com/documentation/ScopusSearchAPI.wadl
+# https://dev.elsevier.com/sc_search_views.html
+# by default we use standart mode, to use complete mode this variable must be valued with 'COMPLETE'
+scopus.search-api.viewMode =
+#################################################################
+#------------------- Web of Science (WOS) ----------------------#
+#---------------------------------------------------------------#
+
+# follow link to get apikey: https://developer.clarivate.com/apis/wos
+wos.apiKey =
+wos.url = https://wos-api.clarivate.com/api/wos/id/
+wos.url.search = https://wos-api.clarivate.com/api/wos/?databaseId=WOS&lang=en&usrQuery=
+#################################################################
+#------------------------- DataCite ----------------------------#
+#---------------------------------------------------------------#
+
+datacite.url = https://api.datacite.org/dois/
+datacite.timeout = 180000
+#################################################################
diff --git a/dspace/config/modules/iiif.cfg b/dspace/config/modules/iiif.cfg
index eee7702ed5..fc1e9bdf9f 100644
--- a/dspace/config/modules/iiif.cfg
+++ b/dspace/config/modules/iiif.cfg
@@ -10,7 +10,7 @@ iiif.image.server = http://localhost:8182/iiif/2/
 # Base URL of the search service used to support the (experimental) IIIF Search
 # capability. The actual path will depend on how search is being supported.
 # This example uses the solr plugin https://dbmdz.github.io/solr-ocrhighlighting/
-# iiif.search.url = ${solr.server}/word_highlighting
+# iiif.search.url = ${solr.server}/${solr.multicorePrefix}word_highlighting
 
 # The search plugin used to support (experimental) IIIF Search.
 # This is the class used with https://dbmdz.github.io/solr-ocrhighlighting/
@@ -26,12 +26,10 @@ iiif.document.viewing.hint = individuals
 # an individual or organization associated with the resource it is attached to.
 # iiif.logo.image = https://image/url/i.png
 
-# Only these origins (client URLs) can successfully communicate with the IIIF API. This
-# allows XHR requests from remote IIIF clients. Defaults to ${dspace.ui.url} if unspecified
-# (as the embedded IIIF client must have access to the API). Multiple allowed origin URLs may
-# be comma separated. Wildcard value (*) is NOT SUPPORTED. # (Requires reboot of servlet
-# container, e.g. Tomcat, to reload)
-iiif.cors.allowed-origins = ${dspace.ui.url}
+# By default the IIIF endpoint is available to all clients. This allows for sharing
+# and interoperability that are the primary goals of IIIF. You are free to restrict
+# IIIF access to ${dspace.ui.url} and specific domains if you choose to do so.
+iiif.cors.allowed-origins = *
 
 # Whether or not to allow credentials (e.g. cookies) sent by the client/browser in CORS
 # requests (in "Access-Control-Allow-Credentials" header).
@@ -85,3 +83,10 @@ iiif.document.viewing.hint = individuals
 # iiif.canvas.default-width = 2200
 # iiif.canvas.default-height = 1600
 
+# the names of Bundles that can include IIIF canvas resources WITHOUT ALSO generating
+# a nested Range (table of contents).
+# The default is to create IIIF Ranges when an Item has multiple IIIF-eligible Bundles.
+# A Range entry is created for each Bundle that contains canvas resources.
+# This setting allows you to add IIIF canvas resources to the designated Bundles
+# without also creating a nested Range. Multiple comma-separated Bundle names are allowed.
+# iiif.exclude.toc.bundle = ORIGINAL, IIIF
diff --git a/dspace/config/modules/oai.cfg b/dspace/config/modules/oai.cfg
index 79488afc29..98b10f59de 100644
--- a/dspace/config/modules/oai.cfg
+++ b/dspace/config/modules/oai.cfg
@@ -24,7 +24,7 @@ oai.storage=solr
 oai.url = ${dspace.server.url}/${oai.path}
 
 # Base solr index
-oai.solr.url=${solr.server}/oai
+oai.solr.url=${solr.server}/${solr.multicorePrefix}oai
 
 # OAI persistent identifier prefix
 # This field is used for two purposes:
diff --git a/dspace/config/modules/orcid.cfg b/dspace/config/modules/orcid.cfg
new file mode 100644
index 0000000000..cde8196774
--- /dev/null
+++ b/dspace/config/modules/orcid.cfg
@@ -0,0 +1,164 @@
+
+#------------------------------------------------------------------#
+#--------------------ORCID GENERIC CONFIGURATIONS------------------#
+#------------------------------------------------------------------#
+
+# Configuration with which it is established which user can disconnect a profile from orcid (none, only the admin, only the owner or both). 
+# Allowed values are disabled, only_admin, only_owner or admin_and_owner
+orcid.disconnection.allowed-users = admin_and_owner
+
+#------------------------------------------------------------------#
+#--------------------ORCID CLIENT CONFIGURATIONS-------------------#
+#------------------------------------------------------------------#
+
+# ORCID API (https://github.com/ORCID/ORCID-Source/tree/master/orcid-api-web#endpoints)
+orcid.domain-url= https://sandbox.orcid.org
+orcid.authorize-url = ${orcid.domain-url}/oauth/authorize
+orcid.token-url = ${orcid.domain-url}/oauth/token
+orcid.api-url = https://api.sandbox.orcid.org/v3.0
+orcid.public-url = https://pub.sandbox.orcid.org/v3.0
+orcid.redirect-url = ${dspace.server.url}/api/authn/orcid
+
+# ORCID Credentials
+# Your public or member API Credentials, see
+# https://orcid.org/content/register-client-application-0
+# https://info.orcid.org/register-a-client-application-sandbox-member-api/
+orcid.application-client-id =
+orcid.application-client-secret =
+
+# The scopes to be granted by the user during the login on ORCID (see https://info.orcid.org/faq/what-is-an-oauth-scope-and-which-scopes-does-orcid-support/)
+orcid.scope = /authenticate
+orcid.scope = /read-limited
+orcid.scope = /activities/update
+orcid.scope = /person/update
+
+#------------------------------------------------------------------#
+#--------------------ORCID MAPPING CONFIGURATIONS------------------#
+#------------------------------------------------------------------#
+
+### Property to enable or disable the synchronization between DSpace and ORCID
+orcid.synchronization-enabled = false
+
+### Work (Publication) mapping ###
+orcid.mapping.work.title = dc.title
+orcid.mapping.work.sub-title =
+
+orcid.mapping.work.short-description = dc.description.abstract
+orcid.mapping.work.publication-date = dc.date.issued
+orcid.mapping.work.language = dc.language.iso
+orcid.mapping.work.language.converter = mapConverterDSpaceToOrcidLanguageCode
+orcid.mapping.work.journal-title = dc.relation.ispartof
+orcid.mapping.work.type = dc.type
+orcid.mapping.work.type.converter = mapConverterDSpaceToOrcidPublicationType
+
+##orcid.mapping.work.contributors syntax is <metadatafield>::<role>
+orcid.mapping.work.contributors = dc.contributor.author::author
+orcid.mapping.work.contributors = dc.contributor.editor::editor
+
+##orcid.mapping.work.external-ids syntax is <metadatafield>::<type> or $simple-handle::<type>
+##The full list of available external identifiers is available here https://pub.orcid.org/v3.0/identifiers
+orcid.mapping.work.external-ids = dc.identifier.doi::doi
+orcid.mapping.work.external-ids = dc.identifier.scopus::eid
+orcid.mapping.work.external-ids = dc.identifier.pmid::pmid
+orcid.mapping.work.external-ids = $simple-handle::handle
+orcid.mapping.work.external-ids = dc.identifier.isi::wosuid
+orcid.mapping.work.external-ids = dc.identifier.issn::issn
+
+### Funding mapping ###
+orcid.mapping.funding.title = dc.title
+orcid.mapping.funding.type = 
+orcid.mapping.funding.type.converter = mapConverterDSpaceToOrcidFundingType
+##orcid.mapping.funding.external-ids syntax is <metadatafield>::<type> 
+##The full list of available external identifiers is available here https://pub.orcid.org/v3.0/identifiers
+orcid.mapping.funding.external-ids = dc.identifier::grant_number
+orcid.mapping.funding.external-ids = dc.identifier.other::other-id
+orcid.mapping.funding.description = dc.description
+orcid.mapping.funding.start-date = project.startDate
+orcid.mapping.funding.end-date = project.endDate
+##orcid.mapping.funding.contributors syntax is <metadatafield>::<type>
+orcid.mapping.funding.contributors = project.investigator::lead
+orcid.mapping.funding.organization-relationship-type = isOrgUnitOfProject
+orcid.mapping.funding.amount = project.amount
+orcid.mapping.funding.amount.currency = project.amount.currency
+orcid.mapping.funding.amount.currency.converter = mapConverterDSpaceToOrcidAmountCurrency
+
+### Other names mapping ###
+orcid.mapping.other-names = person.name.variant
+orcid.mapping.other-names = person.name.translated
+
+### Keywords mapping ###
+orcid.mapping.keywords = dc.subject
+
+### Country mapping ###
+orcid.mapping.country = person.country
+orcid.mapping.country.converter =
+
+### Person External ids mapping ###
+##orcid.mapping.person-external-ids syntax is <metadatafield>::<type>
+orcid.mapping.person-external-ids = person.identifier.scopus-author-id::SCOPUS
+orcid.mapping.person-external-ids = person.identifier.rid::RID
+
+### Researcher urls mapping ###
+orcid.mapping.researcher-urls = dc.identifier.uri
+
+### Organization mapping ###
+orcid.mapping.organization.title = organization.legalName
+orcid.mapping.organization.country = organization.address.addressCountry
+orcid.mapping.organization.city = organization.address.addressLocality
+
+##orcid.mapping.organization.identifiers syntax is <metadatafield>::<source>
+##Valid organization identifier source values are ${orcid.validation.organization.identifier-sources}
+orcid.mapping.organization.identifiers = organization.identifier.crossrefid::FUNDREF
+orcid.mapping.organization.identifiers = organization.identifier.rin::RINGGOLD
+orcid.mapping.organization.identifiers = organization.identifier.lei::LEI
+
+### Contributor mapping ###
+orcid.mapping.contributor.email = person.email
+orcid.mapping.contributor.orcid = person.identifier.orcid
+
+#------------------------------------------------------------------#
+#--------------ORCID OBJECTS VALIDATION CONFIGURATIONS-------------#
+#------------------------------------------------------------------#
+
+orcid.validation.work.enabled = true
+orcid.validation.funding.enabled = true
+
+## Supported organization identifier sources
+orcid.validation.organization.identifier-sources = RINGGOLD
+orcid.validation.organization.identifier-sources = GRID
+orcid.validation.organization.identifier-sources = FUNDREF
+orcid.validation.organization.identifier-sources = LEI
+
+#------------------------------------------------------------------#
+#---------------------ORCID BULK SYNCHRONIZATION-------------------#
+#------------------------------------------------------------------#
+
+## Configuration for max attempts during ORCID batch synchronization
+orcid.bulk-synchronization.max-attempts = 5
+
+#------------------------------------------------------------------#
+#--------------------ORCID EXTERNAL DATA MAPPING-------------------#
+#------------------------------------------------------------------#
+
+### Work (Publication) external-data.mapping ###
+orcid.external-data.mapping.publication.title = dc.title
+
+orcid.external-data.mapping.publication.description = dc.description.abstract
+orcid.external-data.mapping.publication.issued-date = dc.date.issued
+orcid.external-data.mapping.publication.language = dc.language.iso
+orcid.external-data.mapping.publication.language.converter = mapConverterOrcidToDSpaceLanguageCode
+orcid.external-data.mapping.publication.is-part-of = dc.relation.ispartof
+orcid.external-data.mapping.publication.type = dc.type
+orcid.external-data.mapping.publication.type.converter = mapConverterOrcidToDSpacePublicationType
+
+##orcid.external-data.mapping.publication.contributors syntax is <metadatafield>::<role>
+orcid.external-data.mapping.publication.contributors = dc.contributor.author::author
+orcid.external-data.mapping.publication.contributors = dc.contributor.editor::editor
+
+##orcid.external-data.mapping.publication.external-ids syntax is <metadatafield>::<type> or $simple-handle::<type>
+##The full list of available external identifiers is available here https://pub.orcid.org/v3.0/identifiers
+orcid.external-data.mapping.publication.external-ids = dc.identifier.doi::doi
+orcid.external-data.mapping.publication.external-ids = dc.identifier.scopus::eid
+orcid.external-data.mapping.publication.external-ids = dc.identifier.pmid::pmid
+orcid.external-data.mapping.publication.external-ids = dc.identifier.isi::wosuid
+orcid.external-data.mapping.publication.external-ids = dc.identifier.issn::issn
\ No newline at end of file
diff --git a/dspace/config/modules/researcher-profile.cfg b/dspace/config/modules/researcher-profile.cfg
new file mode 100644
index 0000000000..afd6606a97
--- /dev/null
+++ b/dspace/config/modules/researcher-profile.cfg
@@ -0,0 +1,18 @@
+#---------------------------------------------------------------#
+#------------------- PROFILE CONFIGURATIONS --------------------#
+#---------------------------------------------------------------#
+
+# The Entity Type to use for the Researcher Profile. Defaults to "Person" as this is the recommended Entity Type to use
+# (Requires reboot of servlet container, e.g. Tomcat, to reload)
+#researcher-profile.entity-type = Person
+
+# The UUID of the default Collection where newly created Entities will be stored. If unspecified, the first Collection which supports "entity-type" will be used.
+#researcher-profile.collection.uuid = 
+
+# Whether or not to delete the Entity (Item) when a Profile is deleted. Default value is "false" which means that when a user deletes their profile,
+# the Entity remains (retaining its data and relationships). When set to "true", the Entity (and its relationships) will be deleted if a user deletes their Profile.
+researcher-profile.hard-delete.enabled = false
+
+# Whether a newly created profile should be visible by default. Default value is "false" which means a newly created profile is not readable to 
+# anonymous users. Setting to "true" means a newly created profile is immediately readable to anonymous users.
+researcher-profile.set-new-profile-visible = false
\ No newline at end of file
diff --git a/dspace/config/modules/rest.cfg b/dspace/config/modules/rest.cfg
index 1b0895810b..a12d1a0978 100644
--- a/dspace/config/modules/rest.cfg
+++ b/dspace/config/modules/rest.cfg
@@ -32,7 +32,20 @@ rest.projection.specificLevel.maxEmbed = 5
 # (Requires reboot of servlet container, e.g. Tomcat, to reload)
 rest.properties.exposed = plugin.named.org.dspace.curate.CurationTask
 rest.properties.exposed = google.analytics.key
+rest.properties.exposed = websvc.opensearch.enable
 rest.properties.exposed = versioning.item.history.include.submitter
+rest.properties.exposed = researcher-profile.entity-type
+rest.properties.exposed = orcid.application-client-id
+rest.properties.exposed = orcid.authorize-url
+rest.properties.exposed = orcid.scope
+rest.properties.exposed = orcid.disconnection.allowed-users
+rest.properties.exposed = registration.verification.enabled
+rest.properties.exposed = websvc.opensearch.svccontext
+rest.properties.exposed = submit.type-bind.field
+rest.properties.exposed = google.recaptcha.key.site
+rest.properties.exposed = google.recaptcha.version
+rest.properties.exposed = google.recaptcha.mode
+rest.properties.exposed = cc.license.jurisdiction
 
 #---------------------------------------------------------------#
 # These configs are used by the deprecated REST (v4-6) module   #
diff --git a/dspace/config/modules/solr-statistics.cfg b/dspace/config/modules/solr-statistics.cfg
index 5b67cd4799..073850ca23 100644
--- a/dspace/config/modules/solr-statistics.cfg
+++ b/dspace/config/modules/solr-statistics.cfg
@@ -10,7 +10,7 @@
 # set this to be the port you run the dspace "solr" webapp
 # on, by default, we are assuming a test configuration with
 # tomcat still running on port 8080
-solr-statistics.server = ${solr.server}/statistics
+solr-statistics.server = ${solr.server}/${solr.multicorePrefix}statistics
 
 # A comma-separated list that contains the bundles for which the bitstreams will be displayed
 solr-statistics.query.filter.bundles=ORIGINAL
diff --git a/dspace/config/modules/solrauthority.cfg b/dspace/config/modules/solrauthority.cfg
index 9ed1855d44..afa1bdd22a 100644
--- a/dspace/config/modules/solrauthority.cfg
+++ b/dspace/config/modules/solrauthority.cfg
@@ -4,6 +4,10 @@
 # These configs are only used by the SOLR authority index       #
 #---------------------------------------------------------------#
 
+# Solr Authority index location
+# Default is ${solr.server}/authority, unless solr.multicorePrefix is specified
+solr.authority.server=${solr.server}/${solr.multicorePrefix}authority
+
 # Update item metadata displayed values (not the authority keys)
 # with the lasted cached versions when running the UpdateAuthorities index script
 #solrauthority.auto-update-items=false
diff --git a/dspace/config/modules/versioning.cfg b/dspace/config/modules/versioning.cfg
index a345294242..1690ceac4c 100644
--- a/dspace/config/modules/versioning.cfg
+++ b/dspace/config/modules/versioning.cfg
@@ -20,7 +20,3 @@ versioning.item.history.include.submitter=false
 # If you want to allow submitters to create new versions of there items, set
 # the property submitterCanCreateNewVersion true.
 # versioning.submitterCanCreateNewVersion=false
-
-# The property versioning.block.entity is used to disable versioning
-# for items with EntityType, the default value is true if it unset.
-# versioning.block.entity = true
\ No newline at end of file
diff --git a/dspace/config/registries/bitstream-formats.xml b/dspace/config/registries/bitstream-formats.xml
index 0b55bcea47..586931b376 100644
--- a/dspace/config/registries/bitstream-formats.xml
+++ b/dspace/config/registries/bitstream-formats.xml
@@ -106,6 +106,15 @@
     <extension>css</extension>
   </bitstream-type>
 
+  <bitstream-type>
+    <mimetype>text/csv</mimetype>
+    <short_description>CSV</short_description>
+    <description>Comma-Separated Values</description>
+    <support_level>1</support_level>
+    <internal>false</internal>
+    <extension>csv</extension>
+  </bitstream-type>
+
   <bitstream-type>
     <mimetype>application/msword</mimetype>
     <short_description>Microsoft Word</short_description>
diff --git a/dspace/config/registries/dspace-types.xml b/dspace/config/registries/dspace-types.xml
index ab0c1bc40f..fcdbc9b2af 100644
--- a/dspace/config/registries/dspace-types.xml
+++ b/dspace/config/registries/dspace-types.xml
@@ -43,4 +43,54 @@
         <qualifier>enabled</qualifier>
         <scope_note>Stores a boolean text value (true or false) to indicate if the iiif feature is enabled or not for the dspace object. If absent the value is derived from the parent dspace object</scope_note>
     </dc-type>
+
+    <dc-type>
+        <schema>dspace</schema>
+        <element>object</element>
+        <qualifier>owner</qualifier>
+        <scope_note>Used to support researcher profiles</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>dspace</schema>
+        <element>orcid</element>
+        <qualifier>scope</qualifier>
+        <scope_note>Stores the scopes/authorizations granted by the user during authentication on ORCID</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>dspace</schema>
+        <element>orcid</element>
+        <qualifier>sync-mode</qualifier>
+        <scope_note>Stores the synchronization with ORCID mode chosen by the user</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>dspace</schema>
+        <element>orcid</element>
+        <qualifier>sync-publications</qualifier>
+        <scope_note>Stores the publication synchronization with ORCID preference chosen by the user</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>dspace</schema>
+        <element>orcid</element>
+        <qualifier>sync-fundings</qualifier>
+        <scope_note>Stores the funding synchronization with ORCID preference chosen by the user</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>dspace</schema>
+        <element>orcid</element>
+        <qualifier>sync-profile</qualifier>
+        <scope_note>Stores the profile synchronization with ORCID preference chosen by the user</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>dspace</schema>
+        <element>orcid</element>
+        <qualifier>authenticated</qualifier>
+        <scope_note>Stores the timestamp related to the user authentication on ORCID</scope_note>
+    </dc-type>
+
 </dspace-dc-types>
diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml
index 50e79b0d61..d0f340f89c 100644
--- a/dspace/config/registries/dublin-core-types.xml
+++ b/dspace/config/registries/dublin-core-types.xml
@@ -260,6 +260,19 @@
     <qualifier>other</qualifier>
     <scope_note>A known identifier type common to a local collection.</scope_note>
   </dc-type>
+  
+  <dc-type>
+    <schema>dc</schema>
+    <element>identifier</element>
+    <qualifier>doi</qualifier>
+  </dc-type>
+  
+  <dc-type>
+    <schema>dc</schema>
+    <element>identifier</element>
+    <qualifier>scopus</qualifier>
+    <scope_note>The scopus identifier</scope_note>
+  </dc-type>
 
   <!-- Used by system: do not remove -->
   <dc-type>
diff --git a/dspace/config/registries/eperson-types.xml b/dspace/config/registries/eperson-types.xml
index 1aa73a271f..70880f046a 100644
--- a/dspace/config/registries/eperson-types.xml
+++ b/dspace/config/registries/eperson-types.xml
@@ -38,4 +38,17 @@
         <scope_note>Metadata field used for the language</scope_note>
     </dc-type>
 
+    <dc-type>
+        <schema>eperson</schema>
+        <element>orcid</element>
+        <scope_note>Metadata field used for the ORCID id</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>eperson</schema>
+        <element>orcid</element>
+        <qualifier>scope</qualifier>
+        <scope_note>Metadata field used for the granted ORCID scopes</scope_note>
+    </dc-type>
+
 </dspace-dc-types>
diff --git a/dspace/config/registries/relationship-formats.xml b/dspace/config/registries/relationship-formats.xml
index 8996e58a44..f2f50182fa 100644
--- a/dspace/config/registries/relationship-formats.xml
+++ b/dspace/config/registries/relationship-formats.xml
@@ -12,127 +12,279 @@
     <dc-type>
         <schema>relation</schema>
         <element>isAuthorOfPublication</element>
-        <scope_note></scope_note>
+        <scope_note>Contains all uuids of the "latest" AUTHORS that the current PUBLICATION links to via a relationship. In other words, this stores all relationships pointing from the current PUBLICATION to any AUTHOR where the AUTHOR is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+    <dc-type>
+        <schema>relation</schema>
+        <element>isAuthorOfPublication</element>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of AUTHORS which link to the current PUBLICATION via a "latest" relationship. In other words, this stores all relationships pointing to the current PUBLICATION from an AUTHOR, implying that the PUBLICATION is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
 
     <dc-type>
         <schema>relation</schema>
         <element>isPublicationOfAuthor</element>
-        <scope_note></scope_note>
+        <scope_note>Contains all uuids of the "latest" PUBLICATIONS that the current AUTHOR links to via a relationship. In other words, this stores all relationships pointing from the current AUTHOR to any PUBLICATION where the PUBLICATION is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+    <dc-type>
+        <schema>relation</schema>
+        <element>isPublicationOfAuthor</element>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PUBLICATIONS which link to the current AUTHOR via a "latest" relationship. In other words, this stores all relationships pointing to the current AUTHOR from any PUBLICATION, implying that the AUTHOR is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isProjectOfPublication</element>
+        <scope_note>Contains all uuids of the "latest" PROJECTS that the current PUBLICATION links to via a relationship. In other words, this stores all relationships pointing from the current PUBLICATION to any PROJECT where the PROJECT is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isProjectOfPublication</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PROJECTS which link to the current PUBLICATION via a "latest" relationship. In other words, this stores all relationships pointing to the current PUBLICATION from any PROJECT, implying that the PUBLICATION is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isPublicationOfProject</element>
+        <scope_note>Contains all uuids of the "latest" PUBLICATIONS that the current PROJECT links to via a relationship. In other words, this stores all relationships pointing from the current PROJECT to any PUBLICATION where the PUBLICATION is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isPublicationOfProject</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PUBLICATIONS which link to the current PROJECT via a "latest" relationship. In other words, this stores all relationships pointing to the current PROJECT from any PUBLICATION, implying that the PROJECT is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isOrgUnitOfPublication</element>
+        <scope_note>Contains all uuids of the "latest" ORGANISATIONAL UNITS that the current PUBLICATION links to via a relationship. In other words, this stores all relationships pointing from the current PUBLICATION to any ORGANISATIONAL UNIT where the ORGANISATIONAL UNIT is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isOrgUnitOfPublication</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of ORGANISATIONAL UNITSS which link to the current PUBLICATION via a "latest" relationship. In other words, this stores all relationships pointing to the current PUBLICATION from any ORGANISATIONAL UNITS, implying that the PUBLICATION is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isPublicationOfOrgUnit</element>
+        <scope_note>Contains all uuids of the "latest" PUBLICATIONS that the current ORGANISATIONAL UNIT links to via a relationship. In other words, this stores all relationships pointing from the current ORGANISATIONAL UNIT to any PUBLICATION where the PUBLICATION is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isPublicationOfOrgUnit</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PUBLICATIONS which link to the current ORGANISATIONAL UNIT via a "latest" relationship. In other words, this stores all relationships pointing to the current ORGANISATIONAL UNIT from any PUBLICATION, implying that the ORGANISATIONAL UNIT is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isProjectOfPerson</element>
+        <scope_note>Contains all uuids of the "latest" PROJECTS that the current PERSON links to via a relationship. In other words, this stores all relationships pointing from the current PERSON to any PROJECT where the PROJECT is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isProjectOfPerson</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PROJECTS which link to the current PERSON via a "latest" relationship. In other words, this stores all relationships pointing to the current PERSON from any PROJECT, implying that the PERSON is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isPersonOfProject</element>
+        <scope_note>Contains all uuids of the "latest" PERSONS that the current PROJECT links to via a relationship. In other words, this stores all relationships pointing from the current PROJECT to any PERSON where the PERSON is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isPersonOfProject</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PERSONS which link to the current PROJECT via a "latest" relationship. In other words, this stores all relationships pointing to the current PROJECT from any PERSON, implying that the PROJECT is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isOrgUnitOfPerson</element>
+        <scope_note>Contains all uuids of the "latest" ORGANISATIONAL UNITS that the current PERSON links to via a relationship. In other words, this stores all relationships pointing from the current PERSON to any ORGANISATIONAL UNIT where the ORGANISATIONAL UNIT is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isOrgUnitOfPerson</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of ORGANISATIONAL UNITS which link to the current PERSON via a "latest" relationship. In other words, this stores all relationships pointing to the current PERSON from any ORGANISATIONAL UNIT, implying that the PERSON is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isPersonOfOrgUnit</element>
+        <scope_note>Contains all uuids of the "latest" PERSONS that the current ORGANISATIONAL UNIT links to via a relationship. In other words, this stores all relationships pointing from the current ORGANISATIONAL UNIT to any PERSON where the PERSON is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isPersonOfOrgUnit</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PERSONS which link to the current ORGANISATIONAL UNIT via a "latest" relationship. In other words, this stores all relationships pointing to the current ORGANISATIONAL UNIT from any PERSON, implying that the ORGANISATIONAL UNIT is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isOrgUnitOfProject</element>
+        <scope_note>Contains all uuids of the "latest" ORGANISATIONAL UNITS that the current PROJECT links to via a relationship. In other words, this stores all relationships pointing from the current PROJECT to any ORGANISATIONAL UNIT where the ORGANISATIONAL UNIT is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isOrgUnitOfProject</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of ORGANISATIONAL UNITS which link to the current PROJECT via a "latest" relationship. In other words, this stores all relationships pointing to the current PROJECT from any ORGANISATIONAL UNIT, implying that the PROJECT is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isProjectOfOrgUnit</element>
+        <scope_note>Contains all uuids of the "latest" PROJECTS that the current ORGANISATIONAL UNIT links to via a relationship. In other words, this stores all relationships pointing from the current ORGANISATIONAL UNIT to any PROJECT where the PROJECT is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isProjectOfOrgUnit</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PROEJCTS which link to the current ORGANISATIONAL UNIT via a "latest" relationship. In other words, this stores all relationships pointing to the current ORGANISATIONAL UNIT from any PROEJCT, implying that the ORGANISATIONAL UNIT is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
 
-
     <dc-type>
         <schema>relation</schema>
         <element>isVolumeOfJournal</element>
-        <scope_note></scope_note>
+        <scope_note>Contains all uuids of the "latest" VOLUMES that the current JOURNAL links to via a relationship. In other words, this stores all relationships pointing from the current JOURNAL to any VOLUME where the VOLUME is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+    <dc-type>
+        <schema>relation</schema>
+        <element>isVolumeOfJournal</element>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of VOLUMES which link to the current JOURNAL via a "latest" relationship. In other words, this stores all relationships pointing to the current JOURNAL from any VOLUME, implying that the JOURNAL is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isJournalOfVolume</element>
+        <scope_note>Contains all uuids of the "latest" JOURNALS that the current VOLUME links to via a relationship. In other words, this stores all relationships pointing from the current VOLUME to any JOURNAL where the JOURNAL is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isJournalOfVolume</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of JOURNALS which link to the current VOLUME via a "latest" relationship. In other words, this stores all relationships pointing to the current VOLUME from any JOURNAL, implying that the VOLUME is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isIssueOfJournalVolume</element>
+        <scope_note>Contains all uuids of the "latest" ISSUES that the current VOLUME links to via a relationship. In other words, this stores all relationships pointing from the current VOLUME to any ISSUE where the ISSUE is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isIssueOfJournalVolume</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of ISSUES which link to the current VOLUME via a "latest" relationship. In other words, this stores all relationships pointing to the current VOLUME from any ISSUE, implying that the VOLUME is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isJournalVolumeOfIssue</element>
+        <scope_note>Contains all uuids of the "latest" VOLUMES that the current ISSUE links to via a relationship. In other words, this stores all relationships pointing from the current ISSUE to any VOLUME where the VOLUME is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isJournalVolumeOfIssue</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of VOLUMES which link to the current ISSUE via a "latest" relationship. In other words, this stores all relationships pointing to the current ISSUE from any VOLUME, implying that the ISSUE is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isJournalOfPublication</element>
+        <scope_note>Contains all uuids of the "latest" JOURNALS that the current PUBLICATION links to via a relationship. In other words, this stores all relationships pointing from the current PUBLICATION to any JOURNAL where the JOURNAL is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isJournalOfPublication</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of JOURNALS which link to the current PUBLICATION via a "latest" relationship. In other words, this stores all relationships pointing to the current PUBLICATION from any JOURNAL, implying that the PUBLICATION is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
 
     <dc-type>
         <schema>relation</schema>
         <element>isJournalIssueOfPublication</element>
-        <scope_note></scope_note>
+        <scope_note>Contains all uuids of the "latest" ISSUES that the current PUBLICATION links to via a relationship. In other words, this stores all relationships pointing from the current PUBLICATION to any ISSUE where the ISSUE is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+    <dc-type>
+        <schema>relation</schema>
+        <element>isJournalIssueOfPublication</element>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of ISSUES which link to the current PUBLICATION via a "latest" relationship. In other words, this stores all relationships pointing to the current PUBLICATION from any ISSUE, implying that the PUBLICATION is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
-
 
     <dc-type>
         <schema>relation</schema>
         <element>isPublicationOfJournalIssue</element>
-        <scope_note></scope_note>
+        <scope_note>Contains all uuids of the "latest" PUBLICATIONS that the current ISSUE links to via a relationship. In other words, this stores all relationships pointing from the current ISSUE to any PUBLICATION where the PUBLICATION is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+    <dc-type>
+        <schema>relation</schema>
+        <element>isPublicationOfJournalIssue</element>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PUBLICATIONS which link to the current ISSUE via a "latest" relationship. In other words, this stores all relationships pointing to the current ISSUE from any PUBLICATION, implying that the ISSUE is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
 
-    <!--
-      OpenAIRE4 Guidelines
-      required relationships -->
+    <!-- OpenAIRE4 Guidelines - required relationships -->
+
     <dc-type>
         <schema>relation</schema>
         <element>isContributorOfPublication</element>
-        <scope_note></scope_note>
+        <scope_note>Contains all uuids of the "latest" CONTRIBUTORS that the current PUBLICATION links to via a relationship. In other words, this stores all relationships pointing from the current PUBLICATION to any CONTRIBUTOR where the CONTRIBUTOR is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+    <dc-type>
+        <schema>relation</schema>
+        <element>isContributorOfPublication</element>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of CONTRIBUTORS which link to the current PUBLICATION via a "latest" relationship. In other words, this stores all relationships pointing to the current PUBLICATION from any CONTRIBUTOR, implying that the PUBLICATION is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isPublicationOfContributor</element>
+        <scope_note>Contains all uuids of the "latest" PUBLICATIONS that the current CONTRIBUTOR links to via a relationship. In other words, this stores all relationships pointing from the current CONTRIBUTOR to any PUBLICATION where the PUBLICATION is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isPublicationOfContributor</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PUBLICATIONS which link to the current CONTRIBUTOR via a "latest" relationship. In other words, this stores all relationships pointing to the current CONTRIBUTOR from any PUBLICATION, implying that the CONTRIBUTOR is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isFundingAgencyOfProject</element>
+        <scope_note>Contains all uuids of the "latest" FUNDING AGENCIES that the current PROJECT links to via a relationship. In other words, this stores all relationships pointing from the current PROJECT to any FUNDING AGENCY where the FUNDING AGENCY is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isFundingAgencyOfProject</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of FUNDING AGENCIES which link to the current PROJECT via a "latest" relationship. In other words, this stores all relationships pointing to the current PROJECT from any FUNDING AGENCY, implying that the PROJECT is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>relation</schema>
+        <element>isProjectOfFundingAgency</element>
+        <scope_note>Contains all uuids of the "latest" PROJECTS that the current FUNDING AGENCY links to via a relationship. In other words, this stores all relationships pointing from the current FUNDING AGENCY to any PROJECT where the PROJECT is marked as "latest". Internally used by DSpace. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
     <dc-type>
         <schema>relation</schema>
         <element>isProjectOfFundingAgency</element>
-        <scope_note></scope_note>
+        <qualifier>latestForDiscovery</qualifier>
+        <scope_note>Contains all uuids of PROJECTS which link to the current FUNDING AGENCY via a "latest" relationship. In other words, this stores all relationships pointing to the current FUNDING AGENCY from any PROJECT, implying that the FUNDING AGENCY is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
 
 </dspace-dc-types>
diff --git a/dspace/config/registries/schema-organization-types.xml b/dspace/config/registries/schema-organization-types.xml
index 07ff54eb0e..91ee203ae9 100644
--- a/dspace/config/registries/schema-organization-types.xml
+++ b/dspace/config/registries/schema-organization-types.xml
@@ -73,5 +73,13 @@
         <qualifier>ror</qualifier>
         <scope_note>Research Organization Registry</scope_note>
     </dc-type>
+  
+    <dc-type>
+        <schema>organization</schema>
+        <element>identifier</element>
+        <qualifier>crossrefid</qualifier>
+        <scope_note>Crossref identifier</scope_note>
+    </dc-type>
+    
 
 </dspace-dc-types>
diff --git a/dspace/config/registries/schema-person-types.xml b/dspace/config/registries/schema-person-types.xml
index aa975b9132..3a8f79732d 100644
--- a/dspace/config/registries/schema-person-types.xml
+++ b/dspace/config/registries/schema-person-types.xml
@@ -135,5 +135,25 @@
         <qualifier>isni</qualifier>
         <scope_note>International Standard Name Identifier</scope_note>
     </dc-type>
+    
+    <dc-type>
+        <schema>person</schema>
+        <element>country</element>
+        <scope_note>Country in which person lives</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>person</schema>
+        <element>name</element>
+        <qualifier>translated</qualifier>
+        <scope_note>Full name translation</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>person</schema>
+        <element>name</element>
+        <qualifier>variant</qualifier>
+        <scope_note>Full name variant</scope_note>
+    </dc-type>
 
 </dspace-dc-types>
\ No newline at end of file
diff --git a/dspace/config/registries/schema-project-types.xml b/dspace/config/registries/schema-project-types.xml
index df284d709c..c2f844d2b2 100644
--- a/dspace/config/registries/schema-project-types.xml
+++ b/dspace/config/registries/schema-project-types.xml
@@ -39,5 +39,37 @@
         <qualifier>identifier</qualifier>
         <scope_note>Unique identifier of the funding entity.</scope_note>
     </dc-type>
+    
+    <dc-type>
+        <schema>project</schema>
+        <element>investigator</element>
+        <scope_note>Project investigator</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>project</schema>
+        <element>startDate</element>
+        <scope_note>The project start date</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>project</schema>
+        <element>endDate</element>
+        <scope_note>The project end date</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>project</schema>
+        <element>amount</element>
+        <scope_note>The project amount</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>project</schema>
+        <element>amount</element>
+        <qualifier>currency</qualifier>
+        <scope_note>The project amount currency</scope_note>
+    </dc-type>
+    
 
 </dspace-dc-types>
\ No newline at end of file
diff --git a/dspace/config/spring/api/access-conditions.xml b/dspace/config/spring/api/access-conditions.xml
index cd1550f389..828b31d425 100644
--- a/dspace/config/spring/api/access-conditions.xml
+++ b/dspace/config/spring/api/access-conditions.xml
@@ -3,10 +3,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-	
+
 	<bean id="uploadConfigurationDefault" class="org.dspace.submit.model.UploadConfiguration">
-		<property name="name" value="upload"></property>
-		<property name="configurationService" ref="org.dspace.services.ConfigurationService"/>
+		<property name="name" value="upload"/>
 		<property name="metadata" value="bitstream-metadata" />
         <property name="options">
             <list>
@@ -18,7 +17,7 @@
             </list>
         </property>
     </bean>
-  
+
     <bean id="openAccess" class="org.dspace.submit.model.AccessConditionOption">
         <property name="groupName" value="Anonymous"/>
         <property name="name" value="openaccess"/>
@@ -31,26 +30,25 @@
         <property name="hasStartDate" value="false"/>
         <property name="hasEndDate" value="true"/>
         <property name="endDateLimit" value="+6MONTHS"/>
-    </bean> 
+    </bean>
     <bean id="embargoed" class="org.dspace.submit.model.AccessConditionOption">
         <property name="groupName" value="Anonymous"/>
         <property name="name" value="embargo"/>
         <property name="hasStartDate" value="true"/>
         <property name="startDateLimit" value="+36MONTHS"/>
         <property name="hasEndDate" value="false"/>
-        
-    </bean> 
+    </bean>
     <bean id="administrator" class="org.dspace.submit.model.AccessConditionOption">
         <property name="groupName" value="Administrator"/>
         <property name="name" value="administrator"/>
         <property name="hasStartDate" value="false"/>
-        <property name="hasEndDate" value="false"/>       
+        <property name="hasEndDate" value="false"/>
     </bean>
 <!--     <bean id="networkAdministration" class="org.dspace.submit.model.AccessConditionOption">
     	<property name="groupName" value="INSTITUTIONAL_NETWORK"/>
         <property name="name" value="networkAdministration"/>
         <property name="hasStartDate" value="false"/>
-        <property name="hasEndDate" value="false"/>                
+        <property name="hasEndDate" value="false"/>
     </bean> -->
 
     <bean id="uploadConfigurationService" class="org.dspace.submit.model.UploadConfigurationService">
diff --git a/dspace/config/spring/api/ads-integration.xml b/dspace/config/spring/api/ads-integration.xml
new file mode 100644
index 0000000000..11bdc7cda2
--- /dev/null
+++ b/dspace/config/spring/api/ads-integration.xml
@@ -0,0 +1,116 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="adsMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="ads.abstract" value-ref="adsAbstractContrib"/>
+        <entry key-ref="ads.author" value-ref="adsAuthorContrib"/>
+        <entry key-ref="ads.doi" value-ref="adsDoiContrib"/>
+        <entry key-ref="ads.type" value-ref="adsTypeContrib"/>
+        <entry key-ref="ads.id" value-ref="adsIdContrib"/>
+        <entry key-ref="ads.issue" value-ref="adsIssueContrib"/>
+        <entry key-ref="ads.keywrd" value-ref="adsKeywordContrib"/>
+        <entry key-ref="ads.lang" value-ref="adsLangContrib"/>
+        <entry key-ref="ads.source" value-ref="adsSourceContrib"/>
+        <entry key-ref="ads.title" value-ref="adsTitleContrib"/>
+    </util:map>
+
+    <bean id="adsTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.title"/>
+        <property name="query" value="/title"/>
+    </bean>
+    <bean id="ads.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="adsSourceContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.source"/>
+        <property name="query" value="/pub"/>
+    </bean>
+    <bean id="ads.source" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.source"/>
+    </bean>
+
+    <bean id="adsLangContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.lang"/>
+        <property name="query" value="/lang"/>
+    </bean>
+    <bean id="ads.lang" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.language.iso"/>
+    </bean>
+
+    <bean id="adsKeywordContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.keywrd"/>
+        <property name="query" value="/keyword"/>
+    </bean>
+    <bean id="ads.keywrd" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+
+    <bean id="adsIssueContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.issue"/>
+        <property name="query" value="/year"/>
+    </bean>
+    <bean id="ads.issue" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="adsIdContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.id"/>
+        <property name="query" value="/bibcode"/>
+    </bean>
+    <bean id="ads.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+    <bean id="adsTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.type"/>
+        <property name="query" value="/doctype"/>
+    </bean>
+    <bean id="ads.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
+    </bean>
+
+    <bean id="adsDoiContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.doi"/>
+        <property name="query" value="/doi"/>
+    </bean>
+    <bean id="ads.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.doi"/>
+    </bean>
+
+    <bean id="adsAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.author"/>
+        <property name="query" value="/author"/>
+    </bean>
+    <bean id="ads.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="adsAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ads.abstract"/>
+        <property name="query" value="/abstract"/>
+    </bean>
+    <bean id="ads.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean class="java.lang.Integer" id="maxRetry">
+        <constructor-arg value="3"/>
+    </bean>
+
+</beans>
diff --git a/dspace/config/spring/api/bibtex-integration.xml b/dspace/config/spring/api/bibtex-integration.xml
index eeabace1c7..bc5adf5886 100644
--- a/dspace/config/spring/api/bibtex-integration.xml
+++ b/dspace/config/spring/api/bibtex-integration.xml
@@ -17,6 +17,7 @@
             only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
             what metadatafield is generated.
         </description>
+        <entry key-ref="dcType" value-ref="bibtexTypeContrib" />
         <entry key-ref="dcTitle" value-ref="bibtexTitleContrib" />
         <entry key-ref="dcAuthors" value-ref="bibtexAuthorsContrib" />
         <entry key-ref="dcJournal" value-ref="bibtexJournalContrib" />
@@ -39,14 +40,24 @@
         <property name="key" value="journal" />
     </bean>
     
-    <bean id="bibtexAuthorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcAuthors"/>
-        <property name="key" value="author" />
+    <bean id="bibtexAuthorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SplitMetadataContributor">
+        <constructor-arg name="innerContributor">
+            <bean class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
+                <property name="field" ref="dcAuthors"/>
+                <property name="key" value="author" />
+            </bean>
+        </constructor-arg>
+        <constructor-arg name="regex" value="\sand\s"/>
     </bean>
     
     <bean id="bibtexTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
         <property name="field" ref="dcTitle"/>
         <property name="key" value="title" />
     </bean>
-    
-</beans>
\ No newline at end of file
+
+    <bean id="bibtexTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
+        <property name="field" ref="dcType"/>
+        <property name="key" value="type" />
+    </bean>
+
+</beans>
diff --git a/dspace/config/spring/api/bitstore.xml b/dspace/config/spring/api/bitstore.xml
index d60f2e5ff3..15bb3ef158 100644
--- a/dspace/config/spring/api/bitstore.xml
+++ b/dspace/config/spring/api/bitstore.xml
@@ -4,11 +4,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-lazy-init="true">
 
     <bean name="org.dspace.storage.bitstore.BitstreamStorageService" class="org.dspace.storage.bitstore.BitstreamStorageServiceImpl">
-        <property name="incoming" value="0"/>
+        <property name="incoming" value="${assetstore.index.primary}"/>
         <property name="stores">
             <map>
                 <entry key="0" value-ref="localStore"/>
-                <!--<entry key="1" value-ref="s3Store"/>-->
+                <entry key="1" value-ref="s3Store"/>
             </map>
         </property>
     </bean>
@@ -17,21 +17,23 @@
         <property name="baseDir" value="${assetstore.dir}"/>
     </bean>
 
-    <bean name="s3Store" class="org.dspace.storage.bitstore.S3BitStoreService" scope="singleton">
+    <bean name="s3Store" class="org.dspace.storage.bitstore.S3BitStoreService" scope="singleton" lazy-init="true">
+        <property name="enabled" value="${assetstore.s3.enabled}"/>
         <!-- AWS Security credentials, with policies for specified bucket -->
-        <property name="awsAccessKey" value=""/>
-        <property name="awsSecretKey" value=""/>
+        <property name="awsAccessKey" value="${assetstore.s3.awsAccessKey}"/>
+        <property name="awsSecretKey" value="${assetstore.s3.awsSecretKey}"/>
+        <property name="useRelativePath" value="${assetstore.s3.useRelativePath}"/>
 
         <!-- S3 bucket name to store assets in. example: longsight-dspace-auk -->
-        <property name="bucketName" value=""/>
+        <property name="bucketName" value="${assetstore.s3.bucketName}"/>
 
         <!-- AWS S3 Region to use: {us-east-1, us-west-1, eu-west-1, eu-central-1, ap-southeast-1, ... } -->
         <!-- Optional, sdk default is us-east-1 -->
-        <property name="awsRegionName" value=""/>
+        <property name="awsRegionName" value="${assetstore.s3.awsRegionName}"/>
 
         <!-- Subfolder to organize assets within the bucket, in case this bucket is shared  -->
         <!-- Optional, default is root level of bucket -->
-        <property name="subfolder" value=""/>
+        <property name="subfolder" value="${assetstore.s3.subfolder}"/>
     </bean>
 
     <!-- <bean name="localStore2 ... -->
diff --git a/dspace/config/spring/api/cache.xml b/dspace/config/spring/api/cache.xml
new file mode 100644
index 0000000000..6e755ebd3f
--- /dev/null
+++ b/dspace/config/spring/api/cache.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:cache="http://www.springframework.org/schema/cache"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/cache
+                           http://www.springframework.org/schema/cache/spring-cache.xsd">
+
+    <cache:annotation-driven />
+    <bean id="cacheManager" class="org.springframework.cache.jcache.JCacheCacheManager">
+        <property name="cacheManager">
+            <bean class="org.springframework.cache.jcache.JCacheManagerFactoryBean">
+               <property name="cacheManagerUri" value="file:${dspace.dir}/config/ehcache.xml"/>
+            </bean>
+        </property>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/cinii-integration.xml b/dspace/config/spring/api/cinii-integration.xml
new file mode 100644
index 0000000000..7b9904567a
--- /dev/null
+++ b/dspace/config/spring/api/cinii-integration.xml
@@ -0,0 +1,109 @@
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <!-- 
+         <entry key="subjects" value="dc.subject" />
+         <entry key="authors" value="dc.contributor.author" />
+         <entry key="publisher" value="dc.publisher" />
+    -->
+    <util:map id="ciniiMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="cinii.title" value-ref="ciniiTitleContrib"/>
+        <entry key-ref="cinii.issn" value-ref="ciniiISSNContrib"/>
+        <entry key-ref="cinii.journal" value-ref="ciniiJournalContrib"/>
+        <entry key-ref="cinii.issued" value-ref="ciniiIssuedContrib"/>
+        <entry key-ref="cinii.language" value-ref="ciniiLanguageContrib"/>
+        <entry key-ref="cinii.description" value-ref="ciniiDescriptionContrib"/>
+    </util:map>
+
+    <bean id="ciniiDescriptionContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="cinii.description"/>
+        <property name="query" value="dc:description"/>
+        <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="cinii.description" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean id="ciniiLanguageContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="cinii.language"/>
+        <property name="query" value="dc:language"/>
+        <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="cinii.language" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.language.iso"/>
+    </bean>
+
+    <bean id="ciniiIssuedContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="cinii.issued"/>
+        <property name="query" value="prism:publicationDate"/>
+        <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="cinii.issued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="ciniiJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="cinii.journal"/>
+        <property name="query" value="prism:publicationName"/>
+        <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="cinii.journal" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.source"/>
+    </bean>
+
+    <bean id="ciniiISSNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="cinii.issn"/>
+        <property name="query" value="prism:issn"/>
+        <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="cinii.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.issn"/>
+    </bean>
+
+	<!--  alternative authors, titles, etc (based on languages) isn't used at the moment, 
+          org.dspace.importer.external.metadatamapping.contributor.CiniiMetadataContributor
+          could be useful to implements metadata remapping.
+    -->
+    <bean id="ciniiTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="cinii.title"/>
+        <property name="query" value="dc:title"/>
+        <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="cinii.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+	<util:map id="ciniiPrefixToNamespaceMapping" map-class="java.util.HashMap">
+		<entry key="http://www.w3.org/1999/02/22-rdf-syntax-ns#" value="rdf" />
+		<entry key="http://purl.org/ontology/bibo/" value="bibo" />
+		<entry key="https://ci.nii.ac.jp/ns/1.0/" value="cinii" />
+		<entry key="http://www.w3.org/2000/10/swap/pim/contact#" value="con" />
+		<entry key="http://purl.org/dc/elements/1.1/" value="dc" />
+		<entry key="http://purl.org/dc/terms/" value="dcterms" />
+		<entry key="http://xmlns.com/foaf/0.1/" value="foaf" />
+		<entry key="http://prismstandard.org/namespaces/basic/2.0/" value="prism" />
+		<entry key="http://www.w3.org/2000/01/rdf-schema#" value="rdfs" />
+	</util:map>
+
+    <bean class="java.lang.Integer" id="maxRetry">
+        <constructor-arg value="3"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/core-dao-services.xml b/dspace/config/spring/api/core-dao-services.xml
index c534b0075c..ae4b5e6e3b 100644
--- a/dspace/config/spring/api/core-dao-services.xml
+++ b/dspace/config/spring/api/core-dao-services.xml
@@ -60,7 +60,9 @@
     <bean class="org.dspace.xmlworkflow.storedcomponents.dao.impl.WorkflowItemRoleDAOImpl"/>
     <bean class="org.dspace.xmlworkflow.storedcomponents.dao.impl.XmlWorkflowItemDAOImpl"/>
     <bean class="org.dspace.statistics.export.dao.impl.OpenURLTrackerDAOImpl"/>
-
+ 	
+    <bean class="org.dspace.orcid.dao.impl.OrcidQueueDAOImpl" />
+    <bean class="org.dspace.orcid.dao.impl.OrcidHistoryDAOImpl" />
 
 
 </beans>
diff --git a/dspace/config/spring/api/core-factory-services.xml b/dspace/config/spring/api/core-factory-services.xml
index 2712ad21d0..20e5297b6c 100644
--- a/dspace/config/spring/api/core-factory-services.xml
+++ b/dspace/config/spring/api/core-factory-services.xml
@@ -27,6 +27,7 @@
     <bean id="coreServiceFactory" class="org.dspace.core.factory.CoreServiceFactoryImpl"/>
 
 
+    <bean id="accessStatusServiceFactory" class="org.dspace.access.status.factory.AccessStatusServiceFactoryImpl"/>
     <bean id="disseminateServiceFactory" class="org.dspace.disseminate.factory.DisseminateServiceFactoryImpl"/>
     <bean id="embargoServiceFactory" class="org.dspace.embargo.factory.EmbargoServiceFactoryImpl"/>
     <bean id="ePersonServiceFactory" class="org.dspace.eperson.factory.EPersonServiceFactoryImpl"/>
@@ -43,11 +44,15 @@
 
     <bean id="versionServiceFactory" class="org.dspace.versioning.factory.VersionServiceFactoryImpl"/>
 
+    <bean id="validationPasswordFactory" class="org.dspace.passwordvalidation.factory.PasswordValidationFactoryImpl"/>
+
     <!--Configurable workflow services -->
     <bean id="workflowServiceFactory" class="org.dspace.xmlworkflow.factory.XmlWorkflowServiceFactoryImpl"/>
 
     <bean id="indexObjectFactoryFactory" class="org.dspace.discovery.indexobject.factory.IndexObjectFactoryFactoryImpl"/>
 
     <bean id="openURLTrackerLoggerServiceFactory" class="org.dspace.statistics.export.factory.OpenURLTrackerLoggerServiceFactoryImpl"/>
+    
+    <bean id="orcidServiceFactory" class="org.dspace.orcid.factory.OrcidServiceFactoryImpl"/>
 
 </beans>
diff --git a/dspace/config/spring/api/core-hibernate.xml b/dspace/config/spring/api/core-hibernate.xml
index 76d7b5b1ad..45f7d15dc5 100644
--- a/dspace/config/spring/api/core-hibernate.xml
+++ b/dspace/config/spring/api/core-hibernate.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-lazy-init="true">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+       default-lazy-init="true">
 
     <!-- Hibernate 4 Configuration -->
     <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean" lazy-init="true">
@@ -17,7 +18,7 @@
             <props>
                 <prop key="hibernate.dialect">${db.dialect}</prop>
                 <prop key="hibernate.default_schema">${db.schema}</prop>
-                <prop key='net.sf.ehcache.configurationResourceName'>
+                <prop key='hibernate.javax.cache.uri'>
                     file:${dspace.dir}/config/hibernate-ehcache-config.xml
                 </prop>
             </props>
diff --git a/dspace/config/spring/api/core-services.xml b/dspace/config/spring/api/core-services.xml
index 591a4ef3f4..a124ec830f 100644
--- a/dspace/config/spring/api/core-services.xml
+++ b/dspace/config/spring/api/core-services.xml
@@ -63,6 +63,12 @@
     <bean class="org.dspace.content.authority.ChoiceAuthorityServiceImpl"/>
     <bean class="org.dspace.content.authority.MetadataAuthorityServiceImpl" lazy-init="true"/>
 
+    <bean class="org.dspace.profile.ResearcherProfileServiceImpl"/>
+
+    <bean class="org.dspace.profile.OrcidMetadataCopyingAction"/>
+
+    <bean class="org.dspace.handle.hdlresolver.HdlResolverServiceImpl"/>
+
     <bean class='org.dspace.service.impl.HttpConnectionPoolService'
           id='solrHttpConnectionPoolService'
           scope='singleton'
@@ -86,8 +92,9 @@
 
     <bean class="org.dspace.disseminate.CitationDocumentServiceImpl"/>
 
-    <!-- Ensure EmbargoService is initialized properly via init() method -->
+    <!-- Ensure EmbargoService and AccessStatusService are initialized properly via init() method -->
     <bean class="org.dspace.embargo.EmbargoServiceImpl" init-method="init"/>
+    <bean class="org.dspace.access.status.AccessStatusServiceImpl" init-method="init"/>
 
     <bean class="org.dspace.eperson.AccountServiceImpl"/>
     <bean class="org.dspace.eperson.EPersonServiceImpl"/>
@@ -95,7 +102,7 @@
     <bean class="org.dspace.eperson.RegistrationDataServiceImpl"/>
     <bean class="org.dspace.eperson.SubscribeServiceImpl"/>
     <bean class="org.dspace.eperson.SupervisorServiceImpl"/>
-
+    <bean class="org.dspace.eperson.CaptchaServiceImpl"/>
     <bean class="org.dspace.event.EventServiceImpl"/>
 
     <bean class="org.dspace.handle.HandleServiceImpl"/>
@@ -138,5 +145,8 @@
     <bean class="org.dspace.authenticate.OidcAuthenticationBean" id="oidcAuthentication"/>
     <bean class="org.dspace.authenticate.oidc.impl.OidcClientImpl" />
 
+    <bean class="org.dspace.authorize.ValidatePasswordServiceImpl"/>
+    <bean class="org.dspace.authorize.RegexPasswordValidator" />
+
 </beans>
 
diff --git a/dspace/config/spring/api/crossref-integration.xml b/dspace/config/spring/api/crossref-integration.xml
new file mode 100644
index 0000000000..e01b613833
--- /dev/null
+++ b/dspace/config/spring/api/crossref-integration.xml
@@ -0,0 +1,141 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="crossrefMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="crossref.title" value-ref="crossrefTitleContrib"/>
+        <entry key-ref="crossref.authors" value-ref="crossrefAuthorContrib"/>
+        <entry key-ref="crossref.isbn" value-ref="crossrefISBNContrib"/>
+        <entry key-ref="crossref.year" value-ref="crossrefYearContrib"/>
+        <entry key-ref="crossref.editors" value-ref="crossrefEditorsContrib"/>
+        <entry key-ref="crossref.type" value-ref="crossrefDoiTypeContrib"/>
+        <entry key-ref="crossref.journal" value-ref="crossrefJournalContrib"/>
+        <entry key-ref="crossref.id" value-ref="crossrefIDContrib"/>
+        <entry key-ref="crossref.issn" value-ref="crossrefIdentifierISSN" />
+        <entry key-ref="crossref.volume" value-ref="crossrefVolume" />
+        <entry key-ref="crossref.issue" value-ref="crossrefIssue" />
+        <entry key-ref="crossref.abstract" value-ref="crossrefAbstract" />
+    </util:map>
+
+    <bean id="crossrefIDContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.id"/>
+        <property name="query" value="/DOI"/>
+    </bean>
+    <bean id="crossref.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.doi"/>
+    </bean>
+
+    <bean id="crossrefJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.journal"/>
+        <property name="query" value="/container-title"/>
+    </bean>
+    <bean id="crossref.journal" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.relation.ispartof"/>
+    </bean>
+
+    <bean id="crossrefDoiTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.type"/>
+        <property name="query" value="/type"/>
+    </bean>
+    <bean id="crossref.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
+    </bean>
+
+    <bean id="crossrefEditorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.editors"/>
+        <property name="metadataProcessor" ref="crossrefEditorMetadataProcessor"></property>
+    </bean>
+    <bean name="crossrefEditorMetadataProcessor" class="org.dspace.importer.external.crossref.CrossRefAuthorMetadataProcessor">
+        <property name="pathToArray" value="/editor"></property>
+	</bean>
+    <bean id="crossref.editors" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.editor"/>
+    </bean>
+
+    <bean id="crossrefYearContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.year"/>
+        <property name="query" value="/issued/date-parts/0/0"/>
+    </bean>
+    <bean id="crossref.year" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="crossrefISBNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.isbn"/>
+        <property name="query" value="/ISBN"/>
+    </bean>
+    <bean id="crossref.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.isbn"/>
+    </bean>
+
+    <bean id="crossrefAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.authors"/>
+        <property name="metadataProcessor" ref="crossrefAuthorMetadataProcessor"></property>
+    </bean>
+	<bean name="crossrefAuthorMetadataProcessor" class="org.dspace.importer.external.crossref.CrossRefAuthorMetadataProcessor">
+	    <property name="pathToArray" value="/author"></property>
+	</bean>
+    <bean id="crossref.authors" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="crossrefTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.title"/>
+        <property name="query" value="/title"/>
+    </bean>
+    <bean id="crossref.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="crossrefIdentifierISSN" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.issn"/>
+        <property name="query" value="/ISSN"/>
+    </bean>
+    <bean id="crossref.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.issn"/>
+    </bean>
+
+    <bean id="crossrefVolume" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.volume"/>
+        <property name="query" value="/volume"/>
+    </bean>
+    <bean id="crossref.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.volume"/>
+    </bean>
+
+    <bean id="crossrefIssue" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.issue"/>
+        <property name="query" value="/journal-issue/issue"/>
+    </bean>
+    <bean id="crossref.issue" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.issue"/>
+    </bean>
+
+    <bean id="crossrefAbstract" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="crossref.abstract"/>
+        <property name="query" value="/abstract"/>
+    </bean>
+    <bean id="crossref.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean class="java.lang.Integer" id="maxRetry">
+        <constructor-arg value="3"/>
+    </bean>
+
+</beans>
diff --git a/dspace/config/spring/api/datacite-integration.xml b/dspace/config/spring/api/datacite-integration.xml
new file mode 100644
index 0000000000..236ec0a3bd
--- /dev/null
+++ b/dspace/config/spring/api/datacite-integration.xml
@@ -0,0 +1,62 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="dataciteMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="datacite.title" value-ref="dataciteTitleContrib"/>
+        <entry key-ref="datacite.id" value-ref="dataciteIDContrib"/>
+        <entry key-ref="datacite.author" value-ref="dataciteAuthorContrib"/>
+        <!-- TODO: Further Mappings here! querys are applied among the data.attributes object containing the informations -->
+    </util:map>
+
+    <bean id="dataciteAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="metadataProcessor">
+            <bean class="org.dspace.importer.external.metadatamapping.contributor.ArrayElementAttributeProcessor">
+                <property name="pathToArray" value="/creators"/>
+                <property name="elementAttribute" value="/name"/>
+            </bean>
+        </property>
+        <property name="field" ref="datacite.author"/>
+    </bean>
+    <bean id="datacite.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="dataciteTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="metadataProcessor">
+            <bean class="org.dspace.importer.external.metadatamapping.contributor.ArrayElementAttributeProcessor">
+                <property name="pathToArray" value="/titles"/>
+                <property name="elementAttribute" value="/title"/>
+            </bean>
+        </property>
+        <property name="field" ref="datacite.title"/>
+    </bean>
+    <bean id="datacite.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <!-- must be present to be imported, since it's used as the recordId-->
+    <bean id="dataciteIDContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="datacite.id"/>
+        <property name="query" value="/doi"/>
+    </bean>
+    <bean id="datacite.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.doi"/>
+    </bean>
+
+</beans>
diff --git a/dspace/config/spring/api/discovery-solr.xml b/dspace/config/spring/api/discovery-solr.xml
index 120e3b9eb2..b2dbcb6b14 100644
--- a/dspace/config/spring/api/discovery-solr.xml
+++ b/dspace/config/spring/api/discovery-solr.xml
@@ -9,6 +9,8 @@
 
     <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
 
+    <bean class="org.dspace.discovery.utils.DiscoverQueryBuilder"/>
+
     <bean name='org.dspace.util.MultiFormatDateParser'
           class='org.dspace.util.MultiFormatDateParser'>
         <property name='patterns'>
diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 4392e02cb3..57f4c07aee 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -48,15 +48,18 @@
                     the key is used to refer to the page (the "site" or a community/collection handle)
                     the value-ref is a reference to an identifier of the DiscoveryConfiguration format
                     -->
-                <!--The default entry, DO NOT REMOVE the system requires this-->
-               <entry key="default" value-ref="defaultConfiguration" />
+                <!-- The default entry, DO NOT REMOVE the system requires this -->
+                <entry key="default" value-ref="defaultConfiguration" />
+                <!-- Same as the "default" configuration, but does NOT filter out older versions of items -->
+                <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
+                <entry key="default-relationships" value-ref="defaultRelationshipsConfiguration" />
 
-               <!--Use site to override the default configuration for the home page & default discovery page-->
-               <entry key="site" value-ref="homepageConfiguration" />
-               <!--<entry key="123456789/7621" value-ref="defaultConfiguration"/>-->
-               <!-- Used to show filters and results on MyDSpace -->
-               <!-- Do not change the id of special entries or else they won't work -->
-               <!-- "workspace" is a special entry to search for your own workspace items -->
+                <!--Use site to override the default configuration for the home page & default discovery page-->
+                <entry key="site" value-ref="homepageConfiguration" />
+                <!--<entry key="123456789/7621" value-ref="defaultConfiguration"/>-->
+                <!-- Used to show filters and results on MyDSpace -->
+                <!-- Do not change the id of special entries or else they won't work -->
+                <!-- "workspace" is a special entry to search for your own workspace items -->
                 <entry key="workspace" value-ref="workspaceConfiguration" />
                 <!-- "workflow" is a special entry to search for your own workflow tasks -->
                 <entry key="workflow" value-ref="workflowConfiguration" />
@@ -64,17 +67,47 @@
                 <entry key="workflowAdmin" value-ref="workflowAdminConfiguration" />
                 <entry key="undiscoverable" value-ref="unDiscoverableItems" />
                 <entry key="administrativeView" value-ref="administrativeView" />
+
                 <entry key="publication" value-ref="publication"/>
+                <!-- Same as the "publication" configuration, but does NOT filter out older versions of items -->
+                <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
+                <entry key="publication-relationships" value-ref="publicationRelationships"/>
+
                 <entry key="person" value-ref="person"/>
+                <!-- Same as the "person" configuration, but does NOT filter out older versions of items -->
+                <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
+                <entry key="person-relationships" value-ref="personRelationships"/>
+
                 <entry key="orgunit" value-ref="orgUnit"/>
+                <!-- Same as the "orgunit" configuration, but does NOT filter out older versions of items -->
+                <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
+                <entry key="orgunit-relationships" value-ref="orgUnitRelationships"/>
+
                 <entry key="journalissue" value-ref="journalIssue"/>
+                <!-- Same as the "journalissue" configuration, but does NOT filter out older versions of items -->
+                <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
+                <entry key="journalissue-relationships" value-ref="journalIssueRelationships"/>
+
                 <entry key="journalvolume" value-ref="journalVolume"/>
+                <!-- Same as the "journalvolume" configuration, but does NOT filter out older versions of items -->
+                <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
+                <entry key="journalvolume-relationships" value-ref="journalVolumeRelationships"/>
+
                 <entry key="journal" value-ref="journal"/>
+                <!-- Same as the "journal" configuration, but does NOT filter out older versions of items -->
+                <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
+                <entry key="journal-relationships" value-ref="journalRelationships"/>
+
                 <entry key="project" value-ref="project"/>
+                <!-- Same as the "project" configuration, but does NOT filter out older versions of items -->
+                <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
+                <entry key="project-relationships" value-ref="projectRelationships"/>
+
                 <!-- search for an entity that can be a Person or an OrgUnit -->
                 <entry key="personOrOrgunit" value-ref="personOrOrgunit"/>
                 <!-- OpenAIRE4 guidelines - search for an OrgUnit that have a specific dc.type=FundingOrganization -->
                 <entry key="openAIREFundingAgency" value-ref="openAIREFundingAgency"/>
+                <entry key="eperson_claims" value-ref="eperson_claims"/>
             </map>
         </property>
         <property name="toIgnoreMetadataFields">
@@ -169,7 +202,145 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
+                <value>(search.resourcetype:Item AND latestVersion:true) OR search.resourcetype:Collection OR search.resourcetype:Community</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--The configuration for the recent submissions-->
+        <property name="recentSubmissionConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryRecentSubmissionsConfiguration">
+                <property name="metadataSortField" value="dc.date.accessioned" />
+                <property name="type" value="date"/>
+                <property name="max" value="20"/>
+                <!-- If enabled the collection home page will not display metadata but show a pageable list of recent submissions -->
+                <property name="useAsHomePage" value="false"/>
+            </bean>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10" />
+        <property name="hitHighlightingConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightingConfiguration">
+                <property name="metadataFields">
+                    <list>
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="dc.contributor.author"/>
+                            <property name="snippets" value="5"/>
+                        </bean>
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="dspace.entity.type"/>
+                            <property name="snippets" value="5"/>
+                        </bean>
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="person.identifier.jobtitle"/>
+                            <property name="snippets" value="5"/>
+                        </bean>
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="project.identifier.name"/>
+                            <property name="snippets" value="5"/>
+                        </bean>
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="dc.description.abstract"/>
+                            <property name="maxSize" value="250"/>
+                            <property name="snippets" value="2"/>
+                        </bean>
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="dc.title"/>
+                            <property name="snippets" value="5"/>
+                        </bean>
+                        <!-- By default, full text snippets are disabled, as snippets of embargoed/restricted bitstreams
+                             may appear in search results when the Item is public. See DS-3498
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="project.identifier.status"/>
+                            <property name="snippets" value="5"/>
+                        </bean>
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="orgunit.identifier.name"/>
+                            <property name="snippets" value="5"/>
+                        </bean>
+                        <bean class="org.dspace.discovery.configuration.DiscoveryHitHighlightFieldConfiguration">
+                            <property name="field" value="orgunit.identifier.description"/>
+                            <property name="maxSize" value="250"/>
+                            <property name="snippets" value="5"/>
+                        </bean>
+                        -->
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <property name="moreLikeThisConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryMoreLikeThisConfiguration">
+                <property name="similarityMetadataFields">
+                    <list>
+                        <value>dc.title</value>
+                        <value>dc.contributor.author</value>
+                        <value>dc.creator</value>
+                        <value>dc.subject</value>
+                    </list>
+                </property>
+                <!--The minimum number of matching terms across the metadata fields above before an item is found as related -->
+                <property name="minTermFrequency" value="5"/>
+                <!--The maximum number of related items displayed-->
+                <property name="max" value="3"/>
+                <!--The minimum word length below which words will be ignored-->
+                <property name="minWordLength" value="5"/>
+            </bean>
+        </property>
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="true"/>
+    </bean>
+
+    <bean id="defaultRelationshipsConfiguration" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype">
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterAuthor" />
+                <ref bean="searchFilterSubject" />
+                <ref bean="searchFilterIssued" />
+                <ref bean="searchFilterContentInOriginalBundle"/>
+                <ref bean="searchFilterEntityType"/>
+            </list>
+        </property>
+        <!-- Set TagCloud configuration per discovery configuration -->
+        <property name="tagCloudFacetConfiguration" ref="defaultTagCloudFacetConfiguration"/>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterTitle" />
+                <ref bean="searchFilterAuthor" />
+                <ref bean="searchFilterSubject" />
+                <ref bean="searchFilterIssued" />
+                <ref bean="searchFilterContentInOriginalBundle"/>
+                <ref bean="searchFilterFileNameInOriginalBundle" />
+                <ref bean="searchFilterFileDescriptionInOriginalBundle" />
+                <ref bean="searchFilterEntityType"/>
+                <ref bean="searchFilterIsAuthorOfPublicationRelation"/>
+                <ref bean="searchFilterIsProjectOfPublicationRelation"/>
+                <ref bean="searchFilterIsOrgUnitOfPublicationRelation"/>
+                <ref bean="searchFilterIsPublicationOfJournalIssueRelation"/>
+                <ref bean="searchFilterIsJournalOfPublicationRelation"/>
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortScore" />
+                        <ref bean="sortTitle" />
+                        <ref bean="sortDateIssued" />
+                        <ref bean="sortDateAccessioned"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items, communities and collections-->
+                <!-- NOTE: NOT filtered on latestVersion = true -->
                 <value>search.resourcetype:Item OR search.resourcetype:Collection OR search.resourcetype:Community</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--The configuration for the recent submissions-->
@@ -306,7 +477,7 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items-->
-                <value>search.resourcetype:Item</value>
+                <value>search.resourcetype:Item AND latestVersion:true</value>
                 <!-- Only find withdrawn or undiscoverable-->
                 <value>withdrawn:true OR discoverable:false</value>
             </list>
@@ -448,7 +619,7 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items-->
-                <value>search.resourcetype:Item</value>
+                <value>search.resourcetype:Item AND latestVersion:true</value>
             </list>
         </property>
         <!--The configuration for the recent submissions-->
@@ -584,7 +755,8 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
-                <value>search.resourcetype:Item OR search.resourcetype:Collection OR search.resourcetype:Community</value>
+                <value>(search.resourcetype:Item AND latestVersion:true) OR search.resourcetype:Collection OR search.resourcetype:Community</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!-- Limit recent submissions on homepage to only 5 (default is 20) -->
@@ -687,7 +859,7 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, workspace and accepted for workflow -->
-                <value>search.resourcetype:Item OR search.resourcetype:WorkspaceItem OR search.resourcetype:XmlWorkflowItem</value>
+                <value>(search.resourcetype:Item AND latestVersion:true) OR search.resourcetype:WorkspaceItem OR search.resourcetype:XmlWorkflowItem</value>
             </list>
         </property>
         <!--Default result per page  -->
@@ -922,7 +1094,79 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
+                <value>search.resourcetype:Item AND latestVersion:true AND entityType_keyword:Publication</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--The configuration for the recent submissions-->
+        <property name="recentSubmissionConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryRecentSubmissionsConfiguration">
+                <property name="metadataSortField" value="dc.date.accessioned" />
+                <property name="type" value="date"/>
+                <property name="max" value="20"/>
+                <!-- If enabled the collection home page will not display metadata but show a pageable list of recent submissions -->
+                <property name="useAsHomePage" value="false"/>
+            </bean>
+        </property>
+
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="true"/>
+    </bean>
+
+    <bean id="publicationRelationships" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype">
+        <property name="id" value="publication"/>
+        <property name="indexAlways" value="true"/>
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterAuthor" />
+                <ref bean="searchFilterSubject" />
+                <ref bean="searchFilterIssued" />
+                <ref bean="searchFilterContentInOriginalBundle"/>
+                <ref bean="searchFilterEntityType"/>
+            </list>
+        </property>
+        <!-- Set TagCloud configuration per discovery configuration -->
+        <property name="tagCloudFacetConfiguration" ref="defaultTagCloudFacetConfiguration"/>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterTitle" />
+                <ref bean="searchFilterAuthor" />
+                <ref bean="searchFilterSubject" />
+                <ref bean="searchFilterIssued" />
+                <ref bean="searchFilterContentInOriginalBundle"/>
+                <ref bean="searchFilterFileNameInOriginalBundle" />
+                <ref bean="searchFilterFileDescriptionInOriginalBundle" />
+                <ref bean="searchFilterEntityType"/>
+                <ref bean="searchFilterIsAuthorOfPublicationRelation"/>
+                <ref bean="searchFilterIsProjectOfPublicationRelation"/>
+                <ref bean="searchFilterIsOrgUnitOfPublicationRelation"/>
+                <ref bean="searchFilterIsPublicationOfJournalIssueRelation"/>
+                <ref bean="searchFilterIsJournalOfPublicationRelation"/>
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortScore" />
+                        <ref bean="sortTitle" />
+                        <ref bean="sortDateIssued" />
+                        <ref bean="sortDateAccessioned"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items, communities and collections-->
+                <!-- NOTE: NOT filtered on latestVersion = true -->
                 <value>search.resourcetype:Item AND entityType_keyword:Publication</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--The configuration for the recent submissions-->
@@ -983,7 +1227,71 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
+                <value>search.resourcetype:Item AND latestVersion:true AND entityType_keyword:Person</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10"/>
+        <property name="recentSubmissionConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryRecentSubmissionsConfiguration">
+                <property name="metadataSortField" value="dc.date.accessioned"/>
+                <property name="type" value="date"/>
+                <property name="max" value="5"/>
+                <property name="useAsHomePage" value="false"/>
+            </bean>
+        </property>
+
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="true"/>
+    </bean>
+
+    <bean id="personRelationships" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype">
+        <property name="id" value="person"/>
+        <property name="indexAlways" value="true"/>
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterJobtitle"/>
+                <ref bean="searchFilterKnowsLanguage"/>
+                <ref bean="searchFilterBirthdate"/>
+            </list>
+        </property>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterFamilyName"/>
+                <ref bean="searchFilterGivenName"/>
+                <ref bean="searchFilterJobtitle"/>
+                <ref bean="searchFilterKnowsLanguage"/>
+                <ref bean="searchFilterBirthdate"/>
+                <ref bean="searchFilterIsOrgUnitOfPersonRelation"/>
+                <ref bean="searchFilterIsProjectOfPersonRelation"/>
+                <ref bean="searchFilterIsPublicationOfAuthorRelation"/>
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortScore" />
+                        <ref bean="sortFamilyName"/>
+                        <ref bean="sortGivenName"/>
+                        <ref bean="sortBirthDate"/>
+                        <ref bean="sortDateAccessioned"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items, communities and collections-->
+                <!-- NOTE: NOT filtered on latestVersion = true -->
                 <value>search.resourcetype:Item AND entityType_keyword:Person</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--Default result per page  -->
@@ -1036,7 +1344,63 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
+                <value>search.resourcetype:Item AND latestVersion:true AND entityType_keyword:Project</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10"/>
+        <property name="recentSubmissionConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryRecentSubmissionsConfiguration">
+                <property name="metadataSortField" value="dc.date.accessioned"/>
+                <property name="type" value="date"/>
+                <property name="max" value="5"/>
+                <property name="useAsHomePage" value="false"/>
+            </bean>
+        </property>
+
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="true"/>
+    </bean>
+
+    <bean id="projectRelationships" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype">
+        <property name="id" value="project"/>
+        <property name="indexAlways" value="true"/>
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterSubject"/>
+            </list>
+        </property>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterSubject"/>
+                <ref bean="searchFilterIdentifier"/>
+                <ref bean="searchFilterIsOrgUnitOfProjectRelation"/>
+                <ref bean="searchFilterIsPersonOfProjectRelation"/>
+                <ref bean="searchFilterIsPublicationOfProjectRelation"/>
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortScore" />
+                        <ref bean="sortTitle"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items, communities and collections-->
+                <!-- NOTE: NOT filtered on latestVersion = true -->
                 <value>search.resourcetype:Item AND entityType_keyword:Project</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--Default result per page  -->
@@ -1098,7 +1462,73 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
+                <value>search.resourcetype:Item AND latestVersion:true AND entityType_keyword:OrgUnit</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--The configuration for the recent submissions-->
+        <property name="recentSubmissionConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryRecentSubmissionsConfiguration">
+                <property name="metadataSortField" value="dc.date.accessioned"/>
+                <property name="type" value="date"/>
+                <property name="max" value="20"/>
+                <!-- If enabled the collection home page will not display metadata but show a pageable list of recent submissions -->
+                <property name="useAsHomePage" value="false"/>
+            </bean>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10"/>
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="true"/>
+    </bean>
+
+    <bean id="orgUnitRelationships" class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+          scope="prototype">
+        <property name="id" value="orgUnit"/>
+        <property name="indexAlways" value="true"/>
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterOrganizationAddressCountry"/>
+                <ref bean="searchFilterOrganizationAddressLocality"/>
+                <ref bean="searchFilterOrganizationFoundingDate"/>
+            </list>
+        </property>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterOrganizationLegalName"/>
+                <ref bean="searchFilterOrganizationAddressCountry"/>
+                <ref bean="searchFilterOrganizationAddressLocality"/>
+                <ref bean="searchFilterOrganizationFoundingDate"/>
+                <ref bean="searchFilterIsPersonOfOrgUnitRelation"/>
+                <ref bean="searchFilterIsProjectOfOrgUnitRelation"/>
+                <ref bean="searchFilterIsPublicationOfOrgUnitRelation"/>
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortScore" />
+                        <ref bean="sortOrganizationLegalName"/>
+                        <ref bean="sortOrganizationAddressCountry"/>
+                        <ref bean="sortOrganizationAddressLocality"/>
+                        <ref bean="sortOrganizationFoundingDate"/>
+                        <ref bean="sortDateAccessioned"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items, communities and collections-->
+                <!-- NOTE: NOT filtered on latestVersion = true -->
                 <value>search.resourcetype:Item AND entityType_keyword:OrgUnit</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--The configuration for the recent submissions-->
@@ -1157,7 +1587,69 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
+                <value>search.resourcetype:Item AND latestVersion:true AND entityType_keyword:JournalIssue</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--The configuration for the recent submissions-->
+        <property name="recentSubmissionConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryRecentSubmissionsConfiguration">
+                <property name="metadataSortField" value="dc.date.accessioned"/>
+                <property name="type" value="date"/>
+                <property name="max" value="20"/>
+                <!-- If enabled the collection home page will not display metadata but show a pageable list of recent submissions -->
+                <property name="useAsHomePage" value="false"/>
+            </bean>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10"/>
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="true"/>
+    </bean>
+
+    <bean id="journalIssueRelationships" class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+          scope="prototype">
+        <property name="id" value="journalIssue"/>
+        <property name="indexAlways" value="true"/>
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterCreativeWorkKeywords"/>
+                <ref bean="searchFilterCreativeWorkDatePublished"/>
+            </list>
+        </property>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterTitle"/>
+                <ref bean="searchFilterPublicationIssueNumber"/>
+                <ref bean="searchFilterCreativeWorkKeywords"/>
+                <ref bean="searchFilterCreativeWorkDatePublished"/>
+                <ref bean="searchFilterIsPublicationOfJournalIssueRelation"/>
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortScore" />
+                        <ref bean="sortPublicationIssueNumber"/>
+                        <ref bean="sortTitle"/>
+                        <ref bean="sortCreativeWorkDatePublished"/>
+                        <ref bean="sortDateAccessioned"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items, communities and collections-->
+                <!-- NOTE: NOT filtered on latestVersion = true -->
                 <value>search.resourcetype:Item AND entityType_keyword:JournalIssue</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--The configuration for the recent submissions-->
@@ -1215,7 +1707,68 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
+                <value>search.resourcetype:Item AND latestVersion:true AND entityType_keyword:JournalVolume</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--The configuration for the recent submissions-->
+        <property name="recentSubmissionConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryRecentSubmissionsConfiguration">
+                <property name="metadataSortField" value="dc.date.accessioned"/>
+                <property name="type" value="date"/>
+                <property name="max" value="20"/>
+                <!-- If enabled the collection home page will not display metadata but show a pageable list of recent submissions -->
+                <property name="useAsHomePage" value="false"/>
+            </bean>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10"/>
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="true"/>
+    </bean>
+
+    <bean id="journalVolumeRelationships" class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+          scope="prototype">
+        <property name="id" value="journalVolume"/>
+        <property name="indexAlways" value="true"/>
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterCreativeWorkDatePublished"/>
+            </list>
+        </property>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterTitle"/>
+                <ref bean="searchFilterPublicationVolumeNumber"/>
+                <ref bean="searchFilterCreativeWorkDatePublished"/>
+                <ref bean="searchFilterIsIssueOfJournalVolumeRelation"/>
+                <ref bean="searchFilterIsJournalVolumeRelation"/>
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortScore" />
+                        <ref bean="sortPublicationVolumeNumber"/>
+                        <ref bean="sortTitle"/>
+                        <ref bean="sortCreativeWorkDatePublished"/>
+                        <ref bean="sortDateAccessioned"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items, communities and collections-->
+                <!-- NOTE: NOT filtered on latestVersion = true -->
                 <value>search.resourcetype:Item AND entityType_keyword:JournalVolume</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--The configuration for the recent submissions-->
@@ -1273,7 +1826,68 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, communities and collections-->
+                <value>search.resourcetype:Item AND latestVersion:true AND entityType_keyword:Journal</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--The configuration for the recent submissions-->
+        <property name="recentSubmissionConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoveryRecentSubmissionsConfiguration">
+                <property name="metadataSortField" value="dc.date.accessioned"/>
+                <property name="type" value="date"/>
+                <property name="max" value="20"/>
+                <!-- If enabled the collection home page will not display metadata but show a pageable list of recent submissions -->
+                <property name="useAsHomePage" value="false"/>
+            </bean>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10"/>
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="true"/>
+    </bean>
+
+    <bean id="journalRelationships" class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+          scope="prototype">
+        <property name="id" value="journal"/>
+        <property name="indexAlways" value="true"/>
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterCreativeWorkPublisher"/>
+                <ref bean="searchFilterCreativeWorkEditor"/>
+            </list>
+        </property>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterTitle"/>
+                <ref bean="searchFilterCreativeWorkPublisher"/>
+                <ref bean="searchFilterCreativeWorkEditor"/>
+                <ref bean="searchFilterIsIssueOfJournalVolumeRelation"/>
+                <ref bean="searchFilterIsVolumeOfJournalRelation"/>
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortScore" />
+                        <ref bean="sortTitle"/>
+                        <ref bean="sortCreativeWorkDatePublished"/>
+                        <ref bean="sortDateAccessioned"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items, communities and collections-->
+                <!-- NOTE: NOT filtered on latestVersion = true -->
                 <value>search.resourcetype:Item AND entityType_keyword:Journal</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--The configuration for the recent submissions-->
@@ -1346,7 +1960,8 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items, and orgunits or persons-->
-                <value>search.resourcetype:Item AND (entityType_keyword:OrgUnit OR entityType_keyword:Person)</value>
+                <value>search.resourcetype:Item AND latestVersion:true AND (entityType_keyword:OrgUnit OR entityType_keyword:Person)</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
 
@@ -1401,7 +2016,8 @@
         <property name="defaultFilterQueries">
             <list>
                 <!--Only find items that have a entityType=OrgUnit and a dc.type=FundingOrganization -->
-                <value>search.resourcetype:Item AND entityType_keyword:OrgUnit AND dc.type:FundingOrganization</value>
+                <value>search.resourcetype:Item AND latestVersion:true AND entityType_keyword:OrgUnit AND dc.type:FundingOrganization</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
             </list>
         </property>
         <!--Default result per page  -->
@@ -1410,6 +2026,43 @@
         <property name="spellCheckEnabled" value="true"/>
     </bean>
 
+    <bean id="eperson_claims" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype">
+        <property name="id" value="eperson_claims"/>
+        <property name="indexAlways" value="true"/>
+        <!--Which sidebar facets are to be displayed-->
+        <property name="sidebarFacets">
+            <list/>
+        </property>
+        <!--The search filters which can be used on the discovery search page-->
+        <property name="searchFilters">
+            <list/>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortTitle"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find items into claimable collection defined in cfg-->
+                <value>search.resourcetype:Item</value>
+                <value>search.entitytype:${researcher-profile.entity-type:Person}</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="100"/>
+        <!-- When true a "did you mean" example will be displayed, value can be true or false -->
+        <property name="spellCheckEnabled" value="false"/>
+    </bean>
+
 
     <!--TagCloud configuration bean for homepage discovery configuration-->
     <bean id="homepageTagCloudFacetConfiguration" class="org.dspace.discovery.configuration.TagCloudFacetConfiguration">
@@ -1541,7 +2194,7 @@
         <property name="indexFieldName" value="isAuthorOfPublication"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isAuthorOfPublication</value>
+                <value>relation.isAuthorOfPublication.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1552,7 +2205,7 @@
         <property name="indexFieldName" value="isProjectOfPublication"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isProjectOfPublication</value>
+                <value>relation.isProjectOfPublication.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1564,7 +2217,7 @@
         <property name="indexFieldName" value="isOrgUnitOfPublication"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isOrgUnitOfPublication</value>
+                <value>relation.isOrgUnitOfPublication.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1575,7 +2228,7 @@
         <property name="indexFieldName" value="isPublicationOfJournalIssue"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isPublicationOfJournalIssue</value>
+                <value>relation.isPublicationOfJournalIssue.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1586,7 +2239,7 @@
         <property name="indexFieldName" value="isJournalOfPublication"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isJournalOfPublication</value>
+                <value>relation.isJournalOfPublication.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1792,7 +2445,7 @@
         <property name="indexFieldName" value="isOrgUnitOfPerson"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isOrgUnitOfPerson</value>
+                <value>relation.isOrgUnitOfPerson.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1803,7 +2456,7 @@
         <property name="indexFieldName" value="isProjectOfPerson"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isProjectOfPerson</value>
+                <value>relation.isProjectOfPerson.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1815,7 +2468,7 @@
         <property name="indexFieldName" value="isPublicationOfAuthor"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isPublicationOfAuthor</value>
+                <value>relation.isPublicationOfAuthor.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1887,7 +2540,7 @@
         <property name="indexFieldName" value="isPersonOfOrgUnit"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isPersonOfOrgUnit</value>
+                <value>relation.isPersonOfOrgUnit.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1898,7 +2551,7 @@
         <property name="indexFieldName" value="isProjectOfOrgUnit"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isProjectOfOrgUnit</value>
+                <value>relation.isProjectOfOrgUnit.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1910,7 +2563,7 @@
         <property name="indexFieldName" value="isPublicationOfOrgUnit"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isPublicationOfOrgUnit</value>
+                <value>relation.isPublicationOfOrgUnit.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1964,7 +2617,7 @@
         <property name="indexFieldName" value="isPublicationOfJournalIssue"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isPublicationOfJournalIssue</value>
+                <value>relation.isPublicationOfJournalIssue.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1987,7 +2640,7 @@
         <property name="indexFieldName" value="isIssueOfJournalVolumeRelation"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isIssueOfJournalVolume</value>
+                <value>relation.isIssueOfJournalVolume.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -1998,7 +2651,7 @@
         <property name="indexFieldName" value="isJournalVolumeRelation"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isJournalOfVolume</value>
+                <value>relation.isJournalOfVolume.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -2039,7 +2692,7 @@
         <property name="indexFieldName" value="isVolumeOfJournalRelation"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isVolumeOfJournal</value>
+                <value>relation.isVolumeOfJournal.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -2064,7 +2717,7 @@
         <property name="indexFieldName" value="isOrgUnitOfProject"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isOrgUnitOfProject</value>
+                <value>relation.isOrgUnitOfProject.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -2076,7 +2729,7 @@
         <property name="indexFieldName" value="isPersonOfProject"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isPersonOfProject</value>
+                <value>relation.isPersonOfProject.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -2088,7 +2741,7 @@
         <property name="indexFieldName" value="isPublicationOfProject"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isPublicationOfProject</value>
+                <value>relation.isPublicationOfProject.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -2099,7 +2752,7 @@
         <property name="indexFieldName" value="isContributorOfPublication"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isContributorOfPublication</value>
+                <value>relation.isContributorOfPublication.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -2110,7 +2763,7 @@
         <property name="indexFieldName" value="isPublicationOfContributor"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isPublicationOfContributor</value>
+                <value>relation.isPublicationOfContributor.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -2121,7 +2774,7 @@
         <property name="indexFieldName" value="isFundingAgencyOfProject"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isFundingAgencyOfProject</value>
+                <value>relation.isFundingAgencyOfProject.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
@@ -2132,7 +2785,7 @@
         <property name="indexFieldName" value="isProjectOfFundingAgency"/>
         <property name="metadataFields">
             <list>
-                <value>relation.isProjectOfFundingAgency</value>
+                <value>relation.isProjectOfFundingAgency.latestForDiscovery</value>
             </list>
         </property>
         <property name="isOpenByDefault" value="false"/>
diff --git a/dspace/config/spring/api/dublicore-metadata-mapper.xml b/dspace/config/spring/api/dublicore-metadata-mapper.xml
index bb52e99b82..82c0dd47dd 100644
--- a/dspace/config/spring/api/dublicore-metadata-mapper.xml
+++ b/dspace/config/spring/api/dublicore-metadata-mapper.xml
@@ -25,6 +25,9 @@
     </bean>
  	<bean id="dcTitle" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
         <constructor-arg value="dc.title"/>
+    </bean>
+    <bean id="dcType" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
     </bean>
  	<bean id="dcAuthors" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
         <constructor-arg value="dc.contributor.author"/>
diff --git a/dspace/config/spring/api/epo-integration.xml b/dspace/config/spring/api/epo-integration.xml
new file mode 100644
index 0000000000..2509478706
--- /dev/null
+++ b/dspace/config/spring/api/epo-integration.xml
@@ -0,0 +1,136 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="epoMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="epo.identifier.other" value-ref="epoIDContrib"/>
+        <entry key-ref="epo.dc.identifier" value-ref="epoApplicationNumberContrib"/>
+        <entry key-ref="epo.dc.date.issued" value-ref="epoDateContrib"/>
+        <entry key-ref="epo.dc.date.filed" value-ref="epoDateFiledContrib"/>
+        <entry key-ref="epo.dc.contributor" value-ref="epoApplicantContrib"/>
+        <entry key-ref="epo.dc.contributor.author" value-ref="epoInventorContrib"/>
+        <entry key-ref="epo.dc.title" value-ref="epoInventionTitleContrib"/>
+        <entry key-ref="epo.dc.subject" value-ref="epoIpcContrib"/>
+        <entry key-ref="epo.dc.description.abstract" value-ref="epoAbstractContrib"/>
+    </util:map>
+        
+    <bean id="epoIpcContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="epo.dc.subject"/>
+        <property name="query" value="//ns:classification-ipcr/ns:text"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="epo.dc.subject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+    
+    <bean id="epoAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="epo.dc.description.abstract"/>
+        <property name="query" value="//ns:abstract"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="epo.dc.description.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+    
+    <bean id="epoIDContrib" class="org.dspace.importer.external.metadatamapping.contributor.EpoIdMetadataContributor">
+        <property name="field" ref="epo.identifier.other"/>
+        <property name="query" value="//ns:publication-reference"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+        <property name="needType" value="true"></property>
+    </bean>
+    <bean id="epo.identifier.other" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+    <bean id="epoInventionTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="epo.dc.title"/>
+        <property name="query" value="//ns:invention-title"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="epo.dc.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="epoInventorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="epo.dc.contributor.author"/>
+        <property name="query" value="//ns:inventor-name/ns:name"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="epo.dc.contributor.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="epoApplicantContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="epo.dc.contributor"/>
+        <property name="query" value="//ns:applicant-name/ns:name"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="epo.dc.contributor" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor"/>
+    </bean>
+
+    <bean id="epoApplicationNumberContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="epo.dc.identifier"/>
+        <property name="query" value="//ns:application-reference/ns:document-id[@document-id-type=&quot;original&quot;]/ns:doc-number"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="epo.dc.identifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier"/>
+    </bean>
+
+    <bean id="epoDateContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathDateFormatMetadataContributor">
+        <property name="field" ref="epo.dc.date.issued"/>
+        <property name="query" value="//ns:publication-reference/ns:document-id[@document-id-type=&quot;epodoc&quot;]/ns:date"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+        <property name="dateFormatFrom" value="yyyymmdd"/>
+        <property name="dateFormatTo" value="yyyy-MM-dd"></property>
+    </bean>
+    <bean id="epo.dc.date.issued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>        
+    
+    <bean id="epoDateFiledContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathDateFormatMetadataContributor">
+        <property name="field" ref="epo.dc.date.filed"/>
+        <property name="query" value="//ns:application-reference/ns:document-id/ns:date"/>
+        <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
+        <property name="dateFormatFrom" value="yyyymmdd"/>
+        <property name="dateFormatTo" value="yyyy-MM-dd"></property>
+    </bean>
+    <bean id="epo.dc.date.filed" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.submitted"/>
+    </bean>
+    
+    <util:map id="xlinkEpoPrefixToNamespaceMapping" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="http://www.w3.org/1999/xlink" value="xlink" />
+    </util:map>
+
+    <util:map id="opsEpoPrefixToNamespaceMapping" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="http://ops.epo.org" value="ops" />
+    </util:map>
+
+    <util:map id="nsEpoPrefixToNamespaceMapping" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="http://www.epo.org/exchange" value="ns" />
+    </util:map>
+
+    <bean class="java.lang.Integer" id="maxRetry">
+        <constructor-arg value="3"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/external-openaire.xml b/dspace/config/spring/api/external-openaire.xml
index f483ce7210..25a23a1739 100644
--- a/dspace/config/spring/api/external-openaire.xml
+++ b/dspace/config/spring/api/external-openaire.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util
+                           http://www.springframework.org/schema/util/spring-util.xsd"
        default-lazy-init="true">
 
     <bean id="openAIRERestConnector" class="org.dspace.external.OpenAIRERestConnector">
@@ -10,17 +14,65 @@
 		<property name="clientId" value="${openaire.token.clientId}"/>
 		<property name="clientSecret" value="${openaire.token.clientSecret}"/>
     </bean>
-	<bean
-		class="org.dspace.external.provider.impl.OpenAIREFundingDataProvider"
-		init-method="init">
+
+	<bean class="org.dspace.external.provider.impl.OpenAIREFundingDataProvider" init-method="init">
 		<property name="sourceIdentifier" value="openAIREFunding" />
 		<property name="connector" ref="openAIRERestConnector" />
+		<property name="metadataFields" ref="mapOfmetadata"/>
 		<property name="supportedEntityTypes">
 			<list>
 				<value>Project</value>
 			</list>
 		</property>
 	</bean>
-	
-</beans>
 
+    <util:map id="mapOfmetadata"
+        map-class="java.util.HashMap" key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <entry key="awardNumber" value-ref="openaireAwardNumber" />
+        <entry key="fundingStream" value-ref="openaireFundingStream" />
+        <entry key="awardURI" value-ref="openaireAwardURI" />
+        <entry key="funderName" value-ref="openaireFunderName" />
+        <entry key="funderIdentifier" value-ref="openaireFunderIdentifier" />
+        <entry key="dcTitle" value-ref="openaireTitle" />
+        <entry key="titleAlternative" value-ref="openaireTitleAlternative" />
+        <entry key="coverageSpatial" value-ref="openaireSpatial" />
+        <entry key="dcSubject" value-ref="openaireSubject" />
+    </util:map>
+
+    <bean id="openaireAwardNumber" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.awardNumber"/>
+    </bean>
+
+    <bean id="openaireFundingStream" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.fundingStream"/>
+    </bean>
+    
+    <bean id="openaireAwardURI" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.awardURI"/>
+    </bean>
+
+    <bean id="openaireFunderName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="project.funder.name"/>
+    </bean>
+
+    <bean id="openaireFunderIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="project.funder.identifier"/>
+    </bean>
+
+    <bean id="openaireTitle" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="openaireTitleAlternative" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title.alternative"/>
+    </bean>
+
+    <bean id="openaireSpatial" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.coverage.spatial"/>
+    </bean>
+
+    <bean id="openaireSubject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/external-services.xml b/dspace/config/spring/api/external-services.xml
index 9e28e5d559..6d7d50c39f 100644
--- a/dspace/config/spring/api/external-services.xml
+++ b/dspace/config/spring/api/external-services.xml
@@ -5,6 +5,8 @@
 
     <bean class="org.dspace.external.service.impl.ExternalDataServiceImpl"/>
 
+    <bean class="org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl"/>
+
     <bean class="org.dspace.external.provider.impl.SHERPAv2JournalISSNDataProvider" init-method="init">
         <property name="sherpaService">
             <bean class="org.dspace.app.sherpa.SHERPAService">
@@ -52,10 +54,10 @@
     </bean>
     <bean class="org.dspace.external.provider.impl.OrcidV3AuthorDataProvider" init-method="init">
         <property name="sourceIdentifier" value="orcid"/>
-        <property name="orcidUrl" value="${orcid.url}" />
-        <property name="clientId" value="${orcid.clientid}" />
-        <property name="clientSecret" value="${orcid.clientsecret}" />
-        <property name="OAUTHUrl" value="${orcid.oauth.url}" />
+        <property name="orcidUrl" value="${orcid.domain-url}" />
+        <property name="clientId" value="${orcid.application-client-id}" />
+        <property name="clientSecret" value="${orcid.application-client-secret}" />
+        <property name="OAUTHUrl" value="${orcid.token-url}" />
         <property name="orcidRestConnector" ref="orcidRestConnector"/>
         <property name="supportedEntityTypes">
             <list>
@@ -65,7 +67,7 @@
     </bean>
 
     <bean id="orcidRestConnector" class="org.dspace.external.OrcidRestConnector">
-        <constructor-arg value="${orcid.api.url}"/>
+        <constructor-arg value="${orcid.api-url}"/>
     </bean>
 
     <bean id="pubmedLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
@@ -91,6 +93,134 @@
             </list>
         </property>
     </bean>
+    
+    <bean id="orcidPublicationDataProvider" class="org.dspace.external.provider.impl.OrcidPublicationDataProvider">
+        <property name="sourceIdentifier" value="orcidWorks"/>
+        <property name="fieldMapping" ref="orcidPublicationDataProviderFieldMapping"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+            </list>
+        </property>
+    </bean>
 
+    <bean id="crossRefLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="CrossRefImportService"/>
+        <property name="sourceIdentifier" value="crossref"/>
+        <property name="recordIdMetadata" value="dc.identifier.doi"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="scopusLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="ScopusImportService"/>
+        <property name="sourceIdentifier" value="scopus"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="pubmedEULiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="PubmedEuropeImportService"/>
+        <property name="sourceIdentifier" value="pubmedeu"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="ciniiLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="CiniiImportService"/>
+        <property name="sourceIdentifier" value="cinii"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="epoLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="EpoImportService"/>
+        <property name="sourceIdentifier" value="epo"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="vufindLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="vufindImportService"/>
+        <property name="sourceIdentifier" value="vufind"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="adsLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="ADSImportService"/>
+        <property name="sourceIdentifier" value="ads"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="scieloLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="ScieloImportService"/>
+        <property name="sourceIdentifier" value="scielo"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="wosLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="WosImportService"/>
+        <property name="sourceIdentifier" value="wos"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="dataciteLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="DataCiteImportService"/>
+        <property name="sourceIdentifier" value="datacite"/>
+        <property name="recordIdMetadata" value="dc.identifier.doi"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
 </beans>
-
diff --git a/dspace/config/spring/api/orcid-authority-services.xml b/dspace/config/spring/api/orcid-authority-services.xml
index 1c75173cf1..c641b1cf88 100644
--- a/dspace/config/spring/api/orcid-authority-services.xml
+++ b/dspace/config/spring/api/orcid-authority-services.xml
@@ -18,9 +18,9 @@
 <!--
     <alias name="OrcidSource" alias="AuthoritySource"/>
     <bean name="OrcidSource" class="org.dspace.authority.orcid.Orcidv3SolrAuthorityImpl">
-        <property name="clientId" value="${orcid.clientid}" />
-        <property name="clientSecret" value="${orcid.clientsecret}" />
-        <property name="OAUTHUrl" value="${orcid.oauth.url}" />
+        <property name="clientId" value="${orcid.application-client-id}" />
+        <property name="clientSecret" value="${orcid.application-client-secret}" />
+        <property name="OAUTHUrl" value="${orcid.token-url}" />
         <property name="orcidRestConnector" ref="orcidRestConnector"/>
     </bean>
  -->
diff --git a/dspace/config/spring/api/orcid-services.xml b/dspace/config/spring/api/orcid-services.xml
new file mode 100644
index 0000000000..e5fb002c31
--- /dev/null
+++ b/dspace/config/spring/api/orcid-services.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
+
+    <bean class="org.dspace.orcid.service.impl.OrcidQueueServiceImpl" />
+    <bean class="org.dspace.orcid.service.impl.OrcidHistoryServiceImpl" />
+    
+    <bean class="org.dspace.orcid.service.impl.OrcidSynchronizationServiceImpl"/>
+    
+    <bean class="org.dspace.orcid.dao.impl.OrcidTokenDAOImpl"/>
+    
+    <bean id="org.dspace.orcid.service.OrcidTokenService" class="org.dspace.orcid.service.impl.OrcidTokenServiceImpl"/>
+    
+    <bean class="org.dspace.authenticate.OrcidAuthenticationBean" id="orcidAuthentication"/>
+    
+    <bean class="org.dspace.orcid.client.OrcidConfiguration">
+    	<property name="apiUrl" value="${orcid.api-url}" />
+    	<property name="publicUrl" value="${orcid.public-url}" />
+    	<property name="domainUrl" value="${orcid.domain-url}" />
+    	<property name="redirectUrl" value="${orcid.redirect-url}" />
+    	<property name="clientId" value="${orcid.application-client-id}" />
+    	<property name="clientSecret" value="${orcid.application-client-secret}" />
+    	<property name="tokenEndpointUrl" value="${orcid.token-url}" />
+    	<property name="authorizeEndpointUrl" value="${orcid.authorize-url}" />
+    	<property name="scopes" value="${orcid.scope}" />
+    </bean>
+    
+    <bean class="org.dspace.orcid.client.OrcidClientImpl" />
+    <bean id="metadataSignatureGenerator" class="org.dspace.orcid.service.impl.PlainMetadataSignatureGeneratorImpl" />
+    
+    <bean class="org.dspace.orcid.model.validator.impl.OrcidValidatorImpl" />
+    
+    <bean class="org.dspace.orcid.service.impl.OrcidEntityFactoryServiceImpl">
+    	<constructor-arg name="itemService" ref="org.dspace.content.ItemServiceImpl" />
+    	<constructor-arg name="entityFactories">
+    		<list>
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidWorkFactory">
+    				<property name="fieldMapping" ref="orcidWorkFactoryFieldMapping" />
+    			</bean>
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidFundingFactory">
+    				<property name="fieldMapping" ref="orcidFundingFactoryFieldMapping" />
+    			</bean>
+    		</list>
+   		</constructor-arg>
+	</bean>
+	
+	<bean id="orcidWorkFactoryFieldMapping" class="org.dspace.orcid.model.OrcidWorkFieldMapping" >
+		<property name="contributorFields" value="${orcid.mapping.work.contributors}" />
+		<property name="externalIdentifierFields" value="${orcid.mapping.work.external-ids}" />
+		<property name="publicationDateField" value="${orcid.mapping.work.publication-date}" />
+		<property name="titleField" value="${orcid.mapping.work.title}" />
+		<property name="journalTitleField" value="${orcid.mapping.work.journal-title}" />
+		<property name="shortDescriptionField" value="${orcid.mapping.work.short-description}" />
+		<property name="subTitleField" value="${orcid.mapping.work.sub-title}" />
+		<property name="languageField" value="${orcid.mapping.work.language}" />
+		<property name="languageConverter" ref="${orcid.mapping.work.language.converter}" />
+		<property name="typeField" value="${orcid.mapping.work.type}" />
+		<property name="typeConverter" ref="${orcid.mapping.work.type.converter}" />
+	</bean>
+	
+	<bean id="orcidFundingFactoryFieldMapping" class="org.dspace.orcid.model.OrcidFundingFieldMapping" >
+		<property name="contributorFields" value="${orcid.mapping.funding.contributors}" />
+		<property name="externalIdentifierFields" value="${orcid.mapping.funding.external-ids}" />
+		<property name="titleField" value="${orcid.mapping.funding.title}" />
+		<property name="typeField" value="${orcid.mapping.funding.type}" />
+		<property name="typeConverter" ref="${orcid.mapping.funding.type.converter}" />
+		<property name="amountField" value="${orcid.mapping.funding.amount}" />
+		<property name="amountCurrencyField" value="${orcid.mapping.funding.amount.currency}" />
+		<property name="amountCurrencyConverter" ref="${orcid.mapping.funding.amount.currency.converter}" />
+		<property name="descriptionField" value="${orcid.mapping.funding.description}" />
+		<property name="startDateField" value="${orcid.mapping.funding.start-date}" />
+		<property name="endDateField" value="${orcid.mapping.funding.end-date}" />
+		<property name="organizationRelationshipType" value="${orcid.mapping.funding.organization-relationship-type}" />
+	</bean>
+    
+    <bean class="org.dspace.orcid.model.factory.impl.OrcidCommonObjectFactoryImpl">
+    	<property name="contributorEmailField" value="${orcid.mapping.contributor.email}" />
+    	<property name="contributorOrcidField" value="${orcid.mapping.contributor.orcid}" />
+        <property name="organizationTitleField" value="${orcid.mapping.organization.title}" />
+    	<property name="organizationCityField" value="${orcid.mapping.organization.city}" />
+    	<property name="organizationCountryField" value="${orcid.mapping.organization.country}" />
+    	<property name="disambiguatedOrganizationIdentifierFields" value="${orcid.mapping.organization.identifiers}" />
+    </bean>
+    
+    <!-- Configuration of ORCID profile sections factory. 
+    Each entry of sectionFactories must be an implementation of OrcidProfileSectionFactory.-->
+    <bean class="org.dspace.orcid.service.impl.OrcidProfileSectionFactoryServiceImpl">
+    	<constructor-arg name="sectionFactories">
+    		<list>
+    		
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
+					<constructor-arg name="sectionType" value="OTHER_NAMES" />
+					<constructor-arg name="preference" value="BIOGRAPHICAL" />
+					<property name="metadataFields" value="${orcid.mapping.other-names}" />
+				</bean>
+				
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
+					<constructor-arg name="sectionType" value="KEYWORDS" />
+					<constructor-arg name="preference" value="BIOGRAPHICAL" />
+					<property name="metadataFields" value="${orcid.mapping.keywords}" />
+				</bean>
+				
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
+					<constructor-arg name="sectionType" value="COUNTRY" />
+					<constructor-arg name="preference" value="BIOGRAPHICAL" />
+					<property name="metadataFields" value="${orcid.mapping.country}" />
+				</bean>
+				
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidPersonExternalIdentifierFactory">
+					<constructor-arg name="sectionType" value="EXTERNAL_IDS" />
+					<constructor-arg name="preference" value="IDENTIFIERS" />
+					<property name="externalIds" value="${orcid.mapping.person-external-ids}" />
+				</bean>
+				
+    			<bean class="org.dspace.orcid.model.factory.impl.OrcidSimpleValueObjectFactory">
+					<constructor-arg name="sectionType" value="RESEARCHER_URLS" />
+					<constructor-arg name="preference" value="IDENTIFIERS" />
+					<property name="metadataFields" value="${orcid.mapping.researcher-urls}" />
+				</bean>
+				
+    		</list>
+    	</constructor-arg>
+    </bean>
+    
+    <bean name="mapConverterDSpaceToOrcidPublicationType" class="org.dspace.util.SimpleMapConverter" init-method="init">
+		<property name="converterNameFile" value="orcid/mapConverter-dspace-to-orcid-publication-type.properties" />
+		<property name="configurationService" ref="org.dspace.services.ConfigurationService" />
+		<property name="defaultValue" value="other"/>
+	</bean>
+    
+    <bean name="mapConverterDSpaceToOrcidLanguageCode" class="org.dspace.util.SimpleMapConverter" init-method="init">
+		<property name="converterNameFile" value="orcid/mapConverter-dspace-to-orcid-language-code.properties" />
+		<property name="configurationService" ref="org.dspace.services.ConfigurationService" />
+		<property name="defaultValue" value=""/>
+	</bean>
+    
+    <bean name="mapConverterDSpaceToOrcidFundingType" class="org.dspace.util.SimpleMapConverter" init-method="init">
+		<property name="converterNameFile" value="orcid/mapConverter-dspace-to-orcid-funding-type.properties" />
+		<property name="configurationService" ref="org.dspace.services.ConfigurationService" />
+		<property name="defaultValue" value=""/>
+	</bean>
+	
+	
+	<bean id="orcidPublicationDataProviderFieldMapping" class="org.dspace.orcid.model.OrcidWorkFieldMapping" >
+		<property name="contributorFields" value="${orcid.external-data.mapping.publication.contributors}" />
+		<property name="externalIdentifierFields" value="${orcid.external-data.mapping.publication.external-ids}" />
+		<property name="publicationDateField" value="${orcid.external-data.mapping.publication.issued-date}" />
+		<property name="titleField" value="${orcid.external-data.mapping.publication.title}" />
+		<property name="journalTitleField" value="${orcid.external-data.mapping.publication.is-part-of}" />
+		<property name="shortDescriptionField" value="${orcid.external-data.mapping.publication.description}" />
+		<property name="languageField" value="${orcid.external-data.mapping.publication.language}" />
+		<property name="languageConverter" ref="${orcid.external-data.mapping.publication.language.converter}" />
+		<property name="typeField" value="${orcid.external-data.mapping.publication.type}" />
+		<property name="typeConverter" ref="${orcid.external-data.mapping.publication.type.converter}" />
+	</bean>
+    
+    <bean name="mapConverterDSpaceToOrcidAmountCurrency" class="org.dspace.util.SimpleMapConverter" init-method="init">
+		<property name="converterNameFile" value="orcid/mapConverter-dspace-to-orcid-amount-currency.properties" />
+		<property name="configurationService" ref="org.dspace.services.ConfigurationService" />
+		<property name="defaultValue" value=""/>
+	</bean>
+    
+    <bean name="mapConverterOrcidToDSpacePublicationType" class="org.dspace.util.SimpleMapConverter" init-method="init">
+        <property name="converterNameFile" value="orcid/mapConverter-orcid-to-dspace-publication-type.properties" />
+        <property name="configurationService" ref="org.dspace.services.ConfigurationService" />
+        <property name="defaultValue" value="Other"/>
+    </bean>
+    
+    <bean name="mapConverterOrcidToDSpaceLanguageCode" class="org.dspace.util.SimpleMapConverter" init-method="init">
+        <property name="converterNameFile" value="orcid/mapConverter-orcid-to-dspace-language-code.properties" />
+        <property name="configurationService" ref="org.dspace.services.ConfigurationService" />
+        <property name="defaultValue" value=""/>
+    </bean>
+
+</beans>
diff --git a/dspace/config/spring/api/pubmedeurope-integration.xml b/dspace/config/spring/api/pubmedeurope-integration.xml
new file mode 100644
index 0000000000..3eda7f77e3
--- /dev/null
+++ b/dspace/config/spring/api/pubmedeurope-integration.xml
@@ -0,0 +1,163 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="pubmedEuropeMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="pubeu.doi" value-ref="pubEuDoiContrib"/>
+        <entry key-ref="pubeu.title" value-ref="pubEuTitleContrib"/>
+        <entry key-ref="pubeu.author" value-ref="pubEuAuthorContrib"/>
+        <entry key-ref="pubeu.journal" value-ref="pubEuJournalContrib"/>
+        <entry key-ref="pubeu.date" value-ref="pubEuDateContrib"/>
+        <entry key-ref="pubeu.lang" value-ref="pubEuLangContrib"/>
+        <entry key-ref="pubeu.type" value-ref="pubEuTypeContrib"/>
+        <entry key-ref="pubeu.keyword" value-ref="pubEuKeywordContrib"/>
+        <entry key-ref="pubeu.abstract" value-ref="pubEuAbstractContrib"/>
+        <entry key-ref="pubeu.sissn" value-ref="pubEuISSNContrib"/>
+        <entry key-ref="pubeu.isbn" value-ref="pubEuISBNContrib"/>
+        <entry key-ref="pubeu.publisher" value-ref="pubEuPublisherContrib"/>
+        <entry key-ref="pubeu.other" value-ref="pubEuOtherContrib"/>
+    </util:map>
+
+    <bean id="pubEuOtherContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.other"/>
+        <property name="query" value="id"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="pubeu.other" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+    <bean id="pubEuISSNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.sissn"/>
+        <property name="query" value="journalInfo/journal/ISSN"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>    
+    <bean id="pubeu.sissn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.issn"/>
+    </bean>
+    
+    <bean id="pubEuISBNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.isbn"/>
+        <property name="query" value="seriesISSN"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>    
+    <bean id="pubeu.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.isbn"/>
+    </bean>
+
+    <bean id="pubEuPublisherContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.publisher"/>
+        <property name="query" value="publisher"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>    
+    <bean id="pubeu.publisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.publisher"/>
+    </bean>
+        
+    <bean id="pubEuAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.abstract"/>
+        <property name="query" value="abstractText"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>    
+    <bean id="pubeu.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean id="pubEuKeywordContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.type"/>
+        <property name="query" value="keywordList/keyword"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>        
+    <bean id="pubeu.keyword" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+    
+    <bean id="pubEuTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.type"/>
+        <property name="query" value="pubTypeList/pubType"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>    
+     <bean id="pubeu.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
+    </bean>
+
+    <bean id="pubEuLangContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.lang"/>
+        <property name="query" value="language"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>    
+     <bean id="pubeu.lang" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.language.iso"/>
+    </bean>
+
+    <bean id="pubEuDateContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.date"/>
+        <property name="query" value="journalInfo/yearOfPublication"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>    
+     <bean id="pubeu.date" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+    
+    <bean id="pubEuJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.journal"/>
+        <property name="query" value="journalInfo/journal/title"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>    
+    <bean id="pubeu.journal" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.source"/>
+    </bean>
+
+    <bean id="pubEuAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.author"/>
+        <property name="query" value="authorList/author/fullName"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="pubeu.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="pubEuTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.title"/>
+        <property name="query" value="title"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>
+     <bean id="pubeu.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="pubEuDoiContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="pubeu.doi"/>
+        <property name="query" value="doi"/>
+        <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
+    </bean>
+     <bean id="pubeu.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier"/>
+    </bean>
+	
+
+    <util:map id="pubEuPrefixToNamespaceMapping" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="https://www.europepmc.org/data" value="epmc" />
+    	<entry key="http://www.scholix.org" value="slx" />
+    </util:map>
+   
+    <bean class="java.lang.Integer" id="maxRetry">
+        <constructor-arg value="3"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/requestitem.xml b/dspace/config/spring/api/requestitem.xml
index cc18c7916f..90c49156d5 100644
--- a/dspace/config/spring/api/requestitem.xml
+++ b/dspace/config/spring/api/requestitem.xml
@@ -8,25 +8,65 @@
            http://www.springframework.org/schema/context/spring-context-2.5.xsd"
     default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
 
+    <description>
+        Strategies for determining who receives Request Copy emails.
+        A copy request "strategy" class produces a list of addresses to which a
+        request email should be sent.  Each strategy gets its addresses from a
+        different source.  Select the one that meets your need, or use the
+        CombiningRequestItemStrategy to meld the lists from two or more other
+        strategies.
+    </description>
+
     <context:annotation-config /> <!-- allows us to use Spring annotations in beans -->
 
-    <bean class="org.dspace.app.requestitem.RequestItemMetadataStrategy"
-          id="org.dspace.app.requestitem.RequestItemAuthorExtractor"
-          autowire-candidate='true'>
-    <!--
-        Uncomment these properties if you want lookup in metadata the email and
-        the name of the author to contact for request copy.
-        If you don't configure that or if the requested item doesn't have these
-        metadata, the submitter data are used as fail over.
+    <!-- Select the implementation to be used. -->
+    <alias alias='org.dspace.app.requestitem.RequestItemAuthorExtractor'
+           name='org.dspace.app.requestitem.RequestItemMetadataStrategy'/>
 
-        <property name="emailMetadata" value="schema.element.qualifier" />
-        <property name="fullNameMetadata" value="schema.element.qualifier" />
-    -->
+    <!-- Get recipients from an item metadata field. -->
+    <bean class="org.dspace.app.requestitem.RequestItemMetadataStrategy"
+          id="org.dspace.app.requestitem.RequestItemMetadataStrategy"
+          autowire-candidate="true">
+        <!-- 
+            Uncomment these properties if you want lookup in metadata the email
+            and the name of the author to contact for request copy.
+            If you don't configure that or if the requested item doesn't have
+            these metadata, the submitter data are used as fail over.
+        -->
+        <!--
+
+            <property name="emailMetadata"
+                      value="schema.element.qualifier" />
+            <property name="fullNameMetadata"
+                      value="schema.element.qualifier" />
+        -->
     </bean>
 
     <!-- HelpDesk to instead get RequestItem emails-->
-    <!--<bean class="org.dspace.app.requestitem.RequestItemHelpdeskStrategy"
-        id="org.dspace.app.requestitem.RequestItemAuthorExtractor"
-        autowire-candidate='true'></bean>-->
+    <!--
+    <bean class="org.dspace.app.requestitem.RequestItemHelpdeskStrategy"
+          id="org.dspace.app.requestitem.RequestItemHelpdeskStrategy"/>
+    -->
 
+    <!-- Send request emails to administrators of an Item's owning Collection. -->
+    <!--
+    <bean class='org.dspace.app.requestitem.CollectionAdministratorsRequestItemStrategy'
+          id='org.dspace.app.requestitem.CollectionAdministratorsRequestItemStrategy'/>
+    -->
+
+    <!-- Execute multiple strategies and concatenate their lists of recipients.
+         Mail will go to all members of the combined list. -->
+    <!--
+    <bean class='org.dspace.app.requestitem.CombiningRequestItemStrategy'
+          id='org.dspace.app.requestitem.CombiningRequestItemStrategy'
+          autowire='no'>
+        <constructor-arg>
+            <description>A list of references to RequestItemAuthorExtractor beans</description>
+            <list>
+                <ref bean='org.dspace.app.requestitem.RequestItemMetadataStrategy'/>
+                <ref bean='org.dspace.app.requestitem.CollectionAdministratorsRequestItemStrategy'/>
+            </list>
+        </constructor-arg>
+    </bean>
+    -->
 </beans>
diff --git a/dspace/config/spring/api/scielo-integration.xml b/dspace/config/spring/api/scielo-integration.xml
new file mode 100644
index 0000000000..05ee62c9c1
--- /dev/null
+++ b/dspace/config/spring/api/scielo-integration.xml
@@ -0,0 +1,109 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                           http://www.springframework.org/schema/context
+                           http://www.springframework.org/schema/context/spring-context-2.5.xsd
+                           http://www.springframework.org/schema/util
+                           http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="scieloMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="scielo.doi" value-ref="scieloSimpleContrib"/>
+        <entry key-ref="scielo.abstract" value-ref="scieloAbstractContrib"/>
+    </util:map>
+
+    <bean id="scieloAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleRisToMetadataConcatContributor">
+        <property name="tag" value="AB"/>
+        <property name="metadata" ref="scielo.abstract"/>
+    </bean>
+
+    <bean id="scielo.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean id="scieloSimpleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleRisToMetadataContributor">
+        <property name="fieldToMetadata" ref="tag2metadata"/>
+    </bean>
+
+    <util:map id="tag2metadata" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <entry key="DO" value-ref="scielo.doi"/>
+        <entry key="AU" value-ref="scielo.author"/>
+        <entry key="TI" value-ref="scielo.title"/>
+        <entry key="SN" value-ref="scielo.issn"/>
+        <entry key="VL" value-ref="scielo.volume"/>
+        <entry key="IS" value-ref="scielo.issueIdentifier"/>
+        <entry key="ID" value-ref="scielo.id"/>
+        <entry key="SP" value-ref="scielo.startPage"/>
+        <entry key="EP" value-ref="scielo.endPage"/>
+        <entry key="KW" value-ref="scielo.keywords"/>
+        <entry key="TY" value-ref="scielo.type"/>
+        <entry key="PY" value-ref="scielo.publicationYear"/>
+        <entry key="JO" value-ref="scielo.isPartOf"/>
+    </util:map>
+
+    <bean id="scielo.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.doi"/>
+    </bean>
+
+    <bean id="scielo.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="scielo.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="scielo.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.issn"/>
+    </bean>
+
+    <bean id="scielo.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.volume"/>
+    </bean>
+
+    <bean id="scielo.issueIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.issue"/>
+    </bean>
+
+    <bean id="scielo.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+    <bean id="scielo.startPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.startPage"/>
+    </bean>
+    	
+    <bean id="scielo.endPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.endPage"/>
+    </bean>
+
+    <bean id="scielo.keywords" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+
+    <bean id="scielo.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
+    </bean>
+
+    <bean id="scielo.publicationYear" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="scielo.isPartOf" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.relation.ispartof"/>
+    </bean>
+
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/scopus-integration.xml b/dspace/config/spring/api/scopus-integration.xml
new file mode 100644
index 0000000000..47c5a4fbb9
--- /dev/null
+++ b/dspace/config/spring/api/scopus-integration.xml
@@ -0,0 +1,267 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="scopusMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="scopus.doi" value-ref="scopusDoiContrib"/>
+        <entry key-ref="scopus.title" value-ref="scopusTitleContrib"/>
+        <entry key-ref="scopus.type" value-ref="scopusTypeContrib"/>
+        <entry key-ref="scopus.isbn" value-ref="scopusIsbnContrib"/>
+        <entry key-ref="scopus.issn" value-ref="scopusIssnContrib"/>
+        <entry key-ref="scopus.date" value-ref="scopusDateContrib"/>
+        <entry key-ref="scopus.eid" value-ref="scopusEidContrib"/>
+        <entry key-ref="scopus.volume" value-ref="scopusVolumeContrib"/>
+        <entry key-ref="scopus.issueIdentifier" value-ref="scopusIssueIdentifierContrib"/>
+        <entry key-ref="scopus.authkeywords" value-ref="scopusAuthkeywordsContrib"/>        
+        <entry key-ref="scopus.creator" value-ref="scopusCreatorContrib"/>
+        <entry key-ref="scopus.openaccessFlag" value-ref="scopusOpenaccessFlagContrib"/>
+        <entry key-ref="scopus.ispartof" value-ref="scopusIspartofContrib"/>
+        <entry key-ref="scopus.ispartofseries" value-ref="scopusIspartofseriesContrib"/>
+        <entry key-ref="scopus.authname" value-ref="scopusAuthorMetadataContrib"/>
+        <!--   <entry key-ref="scopus.source" value-ref="scopusSourceContrib"/>            -->
+        <!--   <entry key-ref="scopus.abstract" value-ref="scopusAbstractContrib"/>        -->
+        <!--   <entry key-ref="scopus.author" value-ref="scopusAuthorsContrib"/>           -->
+    </util:map>
+    
+    <bean id="scopusOpenaccessFlagContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.openaccessFlag"/>
+        <property name="query" value="ns:openaccessFlag"/>
+        <property name="prefixToNamespaceMapping" ref="scopusNs"/>
+    </bean>
+    <bean id="scopus.openaccessFlag" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.rights"/>
+    </bean>
+
+    <bean id="scopusAuthorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.author"/>
+        <property name="query" value="ns:author/ns:authname"/>
+        <property name="prefixToNamespaceMapping" ref="scopusNs"/>
+    </bean>
+    <bean id="scopus.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+
+    <bean id="scopusAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.abstract"/>
+        <property name="query" value="dc:description"/>
+        <property name="prefixToNamespaceMapping" ref="scopusDc"/>
+    </bean>
+    <bean id="scopus.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean id="scopusDateContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.date"/>
+        <property name="query" value="prism:coverDate"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+    <bean id="scopus.date" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="scopusIssnContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.issn"/>
+        <property name="query" value="prism:issn"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+    <bean id="scopus.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.issn"/>
+    </bean>
+
+    <bean id="scopusIsbnContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.isbn"/>
+        <property name="query" value="prism:isbn"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+    <bean id="scopus.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.isbn"/>
+    </bean>
+
+
+    <bean id="scopusSourceContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.source"/>
+        <property name="query" value="prism:publicationName"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+
+    <bean id="scopus.source" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.source"/>
+    </bean>
+
+    <bean id="scopusTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.type"/>
+        <property name="query" value="prism:aggregationType"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+
+    <bean id="scopus.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
+    </bean>
+
+    <bean id="scopusTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.title"/>
+        <property name="query" value="dc:title"/>
+        <property name="prefixToNamespaceMapping" ref="scopusDc"/>
+    </bean>
+    <bean id="scopus.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="scopusDoiContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.doi"/>
+        <property name="query" value="prism:doi"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+    <bean id="scopus.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier"/>
+    </bean>
+
+    <bean id="scopusVolumeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.volume"/>
+        <property name="query" value="prism:volume"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+
+    <bean id="scopus.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.volume"/>
+    </bean>
+
+    <bean id="scopusIssueIdentifierContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.issueIdentifier"/>
+        <property name="query" value="prism:issueIdentifier"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+
+    <bean id="scopus.issueIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.issue"/>
+    </bean>
+
+    <bean id="scopusEidContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.eid"/>
+        <property name="query" value="ns:eid"/>
+        <property name="prefixToNamespaceMapping" ref="scopusNs"/>
+    </bean>
+
+    <bean id="scopus.eid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+    <bean id="scopusAuthkeywordsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.authkeywords"/>
+        <property name="query" value="ns:authkeywords"/>
+        <property name="prefixToNamespaceMapping" ref="scopusNs"/>
+    </bean>
+
+    <bean id="scopus.authkeywords" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+
+    <bean id="scopusCreatorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.creator"/>
+        <property name="query" value="dc:creator"/>
+        <property name="prefixToNamespaceMapping" ref="scopusDc"/>
+    </bean>
+
+    <bean id="scopus.creator" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="scopus.startPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.startPage"/>
+    </bean>
+    
+    <bean id="scopus.endPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.endPage"/>
+    </bean>
+
+    <bean id="scopusIspartofContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.ispartof"/>
+        <property name="query" value="prism:publicationName"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+
+    <bean id="scopus.ispartof" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.relation.ispartof"/>
+    </bean>
+
+    <bean id="scopusIspartofseriesContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="scopus.ispartofseries"/>
+        <property name="query" value="prism:publicationName"/>
+        <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
+    </bean>
+
+    <bean id="scopus.ispartofseries" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.relation.ispartofseries"/>
+    </bean>
+
+    <bean id="scopusAuthorMetadataContrib" class="org.dspace.importer.external.metadatamapping.contributor.AuthorMetadataContributor">
+        <property name="field" ref="scopus.authname"/>
+        <property name="authname" ref="scopus.authname"/>
+        <property name="orcid" ref="scopus.orcid"/>
+        <property name="scopusId" ref="scopus.scopusId"/>
+        <property name="affiliation" ref="scopus.affiliation"/>
+        <property name="query" value=""/>
+        <property name="prefixToNamespaceMapping" ref="scopusNs"/>
+    </bean>
+
+    <bean id="scopus.authname" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="scopus.orcid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.identifier.orcid"/>
+    </bean>
+    
+    <bean id="scopus.scopusId" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.identifier.scopus-author-id"/>
+    </bean>
+
+    <bean id="scopus.affiliation" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.affiliation.name"/>
+    </bean>
+
+    <util:map id="scopusAtom" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="http://www.w3.org/2005/Atom" value="atom" />
+    </util:map>
+
+    <util:map id="scopusPrism" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="http://prismstandard.org/namespaces/basic/2.0/" value="prism" />
+    </util:map>
+
+    <util:map id="scopusOpenSearch" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="http://a9.com/-/spec/opensearch/1.1/" value="opensearch" />
+    </util:map>
+
+    <util:map id="scopusDc" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="http://purl.org/dc/elements/1.1/" value="dc" />
+    </util:map>
+
+    <util:map id="scopusNs" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    	<entry key="http://www.w3.org/2005/Atom" value="ns" />
+    </util:map>
+
+    <bean class="java.lang.Integer" id="maxRetry">
+        <constructor-arg value="3"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/scripts.xml b/dspace/config/spring/api/scripts.xml
index e7c55549c7..f76cbe88c6 100644
--- a/dspace/config/spring/api/scripts.xml
+++ b/dspace/config/spring/api/scripts.xml
@@ -18,6 +18,11 @@
         <property name="dspaceRunnableClass" value="org.dspace.app.bulkedit.MetadataExportCli"/>
     </bean>
 
+    <bean name="metadata-export-search" class="org.dspace.app.bulkedit.MetadataExportSearchCliScriptConfiguration">
+        <property name="description" value="export metadata from a discovery search" />
+        <property name="dspaceRunnableClass" value="org.dspace.app.bulkedit.MetadataExportSearchCli" />
+    </bean>
+    
     <bean id="retry-tracker" class="org.dspace.statistics.export.RetryFailedOpenUrlTrackerScriptConfiguration" scope="prototype">
         <property name="description" value="Retry all failed commits to the OpenURLTracker"/>
         <property name="dspaceRunnableClass" value="org.dspace.statistics.export.RetryFailedOpenUrlTracker"/>
@@ -45,9 +50,34 @@
         <property name="description" value="Manage the OAI-PMH harvesting of external collections"/>
         <property name="dspaceRunnableClass" value="org.dspace.app.harvest.HarvestCli"/>
     </bean>
+        
+    <bean id="process-cleaner" class="org.dspace.administer.ProcessCleanerCliConfiguration">
+        <property name="description" value="Cleanup all the old processes in the specified state"/>
+        <property name="dspaceRunnableClass" value="org.dspace.administer.ProcessCleanerCli"/>
+    </bean>
 
     <bean id="filter-media" class="org.dspace.app.mediafilter.MediaFilterScriptConfiguration">
         <property name="description" value="Perform the media filtering to extract full text from documents and to create thumbnails"/>
         <property name="dspaceRunnableClass" value="org.dspace.app.mediafilter.MediaFilterScript"/>
     </bean>
+    
+    <bean id="orcid-bulk-push" class="org.dspace.orcid.script.OrcidBulkPushScriptConfiguration">
+        <property name="description" value="Perform the bulk synchronization of all the BATCH configured ORCID entities placed in the ORCID queue"/>
+        <property name="dspaceRunnableClass" value="org.dspace.orcid.script.OrcidBulkPush"/>
+    </bean>
+    
+    <bean id="solr-database-resync" class="org.dspace.app.solrdatabaseresync.SolrDatabaseResyncCliScriptConfiguration">
+        <property name="description" value="Update the database status of Items in solr"/>
+        <property name="dspaceRunnableClass" value="org.dspace.app.solrdatabaseresync.SolrDatabaseResyncCli"/>
+    </bean>
+
+    <bean id="import" class="org.dspace.app.itemimport.ItemImportCLIScriptConfiguration" primary="true">
+        <property name="description" value="Batch Import from Simple Archive Format (SAF)" />
+        <property name="dspaceRunnableClass" value="org.dspace.app.itemimport.ItemImportCLI"/>
+    </bean>
+
+    <bean id="export" class="org.dspace.app.itemexport.ItemExportCLIScriptConfiguration" primary="true">
+        <property name="description" value="Batch Export to Simple Archive Format (SAF)"/>
+        <property name="dspaceRunnableClass" value="org.dspace.app.itemexport.ItemExportCLI"/>
+    </bean>
 </beans>
diff --git a/dspace/config/spring/api/sherpa.xml b/dspace/config/spring/api/sherpa.xml
index fb9e31b9a0..0414f3f8e4 100644
--- a/dspace/config/spring/api/sherpa.xml
+++ b/dspace/config/spring/api/sherpa.xml
@@ -33,4 +33,16 @@
 		</property>	
 	</bean>
 
+    <bean class="org.dspace.app.sherpa.SHERPAService" id="org.dspace.app.sherpa.SHERPAService">
+        <property name="maxNumberOfTries" value="3"/>
+        <!-- the value of this property is in milliseconds -->
+        <property name="sleepBetweenTimeouts" value="2000"/>
+        <!-- the value of this property is in milliseconds -->
+        <property name="timeout" value="5000"/>
+    </bean>
+
+    <bean class="org.dspace.app.sherpa.cache.SherpaCacheEvictService">
+         <property name="sherpaSubmitService"
+                   ref="org.dspace.app.sherpa.submit.SHERPASubmitService"/>
+    </bean>
 </beans>
diff --git a/dspace/config/spring/api/solr-services.xml b/dspace/config/spring/api/solr-services.xml
index 698a824184..80e9449d4c 100644
--- a/dspace/config/spring/api/solr-services.xml
+++ b/dspace/config/spring/api/solr-services.xml
@@ -31,5 +31,7 @@
     <bean id="solrLoggerService" class="org.dspace.statistics.SolrLoggerServiceImpl" lazy-init="true"/>
 
     <bean class="org.dspace.statistics.SolrStatisticsCore" autowire-candidate="true"/>
+    
+    <bean class="org.dspace.statistics.GeoIpService" autowire-candidate="true"/>
 
 </beans>
diff --git a/dspace/config/spring/api/versioning-service.xml b/dspace/config/spring/api/versioning-service.xml
index ac80c15bed..69dacbcbe0 100644
--- a/dspace/config/spring/api/versioning-service.xml
+++ b/dspace/config/spring/api/versioning-service.xml
@@ -30,4 +30,6 @@
 
     </bean>
 
+    <bean class="org.dspace.versioning.utils.RelationshipVersioningUtils"/>
+
 </beans>
diff --git a/dspace/config/spring/api/vufind-integration.xml b/dspace/config/spring/api/vufind-integration.xml
new file mode 100644
index 0000000000..bc6c5def84
--- /dev/null
+++ b/dspace/config/spring/api/vufind-integration.xml
@@ -0,0 +1,165 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="vufindMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="vufind.id" value-ref="vufindIDContrib"/>
+        <entry key-ref="vufind.dc.language.iso" value-ref="vufindLanguages"/>
+        <entry key-ref="vufind.dc.publisher" value-ref="vufindPublisher"/>
+        <entry key-ref="vufind.dc.title" value-ref="vufindTitle"/>
+        <entry key-ref="vufind.dc.identifier" value-ref="vufindIdentifier"/>
+        <entry key-ref="vufind.dc.contributor.author" value-ref="vufindAuthors"/>
+        <entry key-ref="vufind.dc.subject" value-ref="vufindSubject"/>
+        <entry key-ref="vufind.dc.description.abstract" value-ref="vufindAbstract"/>
+        <entry key-ref="vufind.dc.titlealternative" value-ref="vufindTitleAlternative"/>
+        <entry key-ref="vufind.dc.contributor.editor" value-ref="vufindContributorEditor"/>
+        <entry key-ref="vufind.dc.date.issued" value-ref="vufindDateIssued"/>
+        <entry key-ref="vufind.dc.identifier.doi" value-ref="vufindIdentifierDoi"/>
+        <entry key-ref="vufind.dc.identifier.isbn" value-ref="vufindIdentifierIsbn"/>
+    </util:map>
+
+    <bean id="vufindIDContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.id"/>
+        <property name="query" value="/id"/>
+    </bean>
+    <bean id="vufind.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+    <bean id="vufindLanguages" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.language.iso"/>
+        <property name="query" value="/languages"/>
+    </bean>
+    <bean id="vufind.dc.language.iso" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.language.iso"/>
+    </bean>
+
+    <bean id="vufindTitle" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.title"/>
+        <property name="query" value="/title"/>
+    </bean>
+    <bean id="vufind.dc.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="vufindIdentifier" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.identifier"/>
+        <property name="metadataProcessor" ref="vufindUriProcessor"></property>
+    </bean>
+    <bean name="vufindUriProcessor" class="org.dspace.importer.external.metadatamapping.contributor.ArrayElementAttributeProcessor">
+        <property name="pathToArray" value="/urls"></property>
+        <property name="elementAttribute" value="/url"></property>
+	</bean>
+    <bean id="vufind.dc.identifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier"/>
+    </bean>
+
+    <bean id="vufindSubject" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.subject"/>
+        <property name="metadataProcessor" ref="vufindSubjectsProcessor"></property>
+    </bean>
+    <bean name="vufindSubjectsProcessor" class="org.dspace.importer.external.metadatamapping.contributor.MatrixElementProcessor">
+        <property name="pathToMatrix" value="/subjects"></property>
+	</bean>
+    <bean id="vufind.dc.subject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+
+    <bean id="vufindAuthors" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.contributor.author"/>
+        <property name="query" value="/dcContributorAuthor"/>
+    </bean>
+
+	<util:list id="vufindAuthorsList">
+	    <bean id="vufindPrimaryAuthors" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+	        <property name="field" ref="vufind.dc.contributor.author"/>
+	        <property name="query" value="/authors/primary" />
+	    </bean>
+	    <bean id="vufindSecondaryAuthors" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+	        <property name="field" ref="vufind.dc.contributor.author"/>
+	        <property name="query" value="/authors/secondary" />
+	    </bean>
+	</util:list>
+
+    <bean id="vufind.dc.contributor.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean class="java.lang.Integer" id="maxRetry">
+        <constructor-arg value="3"/>
+    </bean>
+
+    <!-- Below there are other mapping that apply to an extended configuration in use for instance at the vuFind installation
+         of ALICIA https://alicia.concytec.gob.pe/vufind/Search/Results?type=AllFields -->
+
+    <bean id="vufindIdentifierIsbn" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.identifier.isbn"/>
+        <property name="query" value="/dcIdentifierIsbn"/>
+    </bean>
+    <bean id="vufind.dc.identifier.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.isbn"/>
+    </bean>
+
+    <bean id="vufindIdentifierDoi" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.identifier.doi"/>
+        <property name="query" value="/dcIdentifierDoi"/>
+    </bean>
+    <bean id="vufind.dc.identifier.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.doi"/>
+    </bean>
+
+    <bean id="vufindDateIssued" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.date.issued"/>
+        <property name="query" value="/dcDateIssued"/>
+    </bean>
+    <bean id="vufind.dc.date.issued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="vufindContributorEditor" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.contributor.editor"/>
+        <property name="query" value="/dcContributorEditor"/>
+    </bean>
+    <bean id="vufind.dc.contributor.editor" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.editor"/>
+    </bean>
+
+    <bean id="vufindTitleAlternative" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.titlealternative"/>
+        <property name="query" value="/dcTitleAlternative"/>
+    </bean>
+    <bean id="vufind.dc.titlealternative" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title.alternative"/>
+    </bean>
+
+    <bean id="vufindAbstract" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.description.abstract"/>
+        <property name="query" value="/dcDescriptionAbstract"/>
+    </bean>
+    <bean id="vufind.dc.description.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean id="vufindPublisher" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="vufind.dc.publisher"/>
+        <property name="query" value="/dcPublisher"/>
+    </bean>
+    <bean id="vufind.dc.publisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.publisher"/>
+    </bean>
+
+</beans>
diff --git a/dspace/config/spring/api/wos-integration.xml b/dspace/config/spring/api/wos-integration.xml
new file mode 100644
index 0000000000..17bd53c04a
--- /dev/null
+++ b/dspace/config/spring/api/wos-integration.xml
@@ -0,0 +1,291 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                           http://www.springframework.org/schema/context
+                           http://www.springframework.org/schema/context/spring-context-2.5.xsd
+                           http://www.springframework.org/schema/util
+                           http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="wosMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="wos.citationEdition" value-ref="wosCitationEditionContrib"/>
+        <entry key-ref="wos.pubyear" value-ref="wosPubyearContrib"/>
+        <entry key-ref="wos.startPage" value-ref="wosStartPageContrib"/>
+        <entry key-ref="wos.endPage" value-ref="wosEndPageContrib"/>
+        <entry key-ref="wos.type" value-ref="wosTypeContrib"/>
+        <entry key-ref="wos.volume" value-ref="wosVolumeContrib"/>
+        <entry key-ref="wos.ispartof" value-ref="wosIspartofContrib"/>
+        <entry key-ref="wos.ispartofseries" value-ref="wosIspartofseriesContrib"/>
+        <entry key-ref="wos.title" value-ref="wosTitleContrib"/>
+        <entry key-ref="wos.doi" value-ref="wosIdentifierContrib"/>
+        <entry key-ref="wos.issue" value-ref="wosIssueContrib"/>
+        <entry key-ref="wos.abstract" value-ref="wosAbstractContrib"/>
+        <entry key-ref="wos.languageIso" value-ref="wosLanguageIsoContrib"/>
+        <entry key-ref="wos.fullName" value-ref="wosFullNameContrib"/>
+        <entry key-ref="wos.subject" value-ref="wosSubjectContrib"/>
+        <entry key-ref="wos.orcid" value-ref="wosOrcidContrib"/>
+        <entry key-ref="wos.contributorEditor" value-ref="wosContributorEditorContrib"/>
+        <entry key-ref="wos.wosId" value-ref="wosIdContrib"/>
+        <entry key-ref="wos.rid" value-ref="wosRidContrib"/>
+    </util:map>
+ 
+    <bean id="wosCitationEditionContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.citationEdition"/>
+        <property name="query" value="static_data/summary/EWUID/edition/@value"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.citationEdition" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.edition"/>
+    </bean>
+
+    <bean id="wosPubyearContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.pubyear"/>
+        <property name="query" value="static_data/summary/pub_info/@pubyear"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.pubyear" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="wosStartPageContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.startPage"/>
+        <property name="query" value="static_data/summary/pub_info/page/@begin"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.startPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.startPage"/>
+    </bean>
+
+    <bean id="wosEndPageContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.endPage"/>
+        <property name="query" value="static_data/summary/pub_info/page/@end"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.endPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.endPage"/>
+    </bean>
+
+    <bean id="wosTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.type"/>
+        <property name="query" value="static_data/summary/pub_info/@pubtype"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
+    </bean>
+
+    <bean id="wosVolumeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.volume"/>
+        <property name="query" value="static_data/summary/pub_info/@vol"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.volume"/>
+    </bean>
+
+    <bean id="wosIssueContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.issue"/>
+        <property name="query" value="static_data/summary/pub_info/@issue"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.issue" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.issue"/>
+    </bean>
+
+    <bean id="wosIdentifierContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosIdentifierContributor">
+        <property name="field" ref="wos.doi"/>
+        <property name="query" value="dynamic_data/cluster_related/identifiers/identifier"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+        <property name="identifier2field" ref="identifiers2fields"/>
+    </bean>
+
+    <util:map id="identifiers2fields" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <entry key="doi" value-ref="wos.doi" />
+        <entry key="issn" value-ref="wos.issn" />
+        <entry key="eisbn" value-ref="wos.isbn" />
+    </util:map>
+
+    <bean id="wos.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier"/>
+    </bean>
+    <bean id="wos.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.issn"/>
+    </bean>
+    <bean id="wos.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.isbn"/>
+    </bean>
+
+    <bean id="wosLanguageIsoContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.languageIso"/>
+        <property name="query" value="static_data/fullrecord_metadata/normalized_languages/@count"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.languageIso" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.language.iso"/>
+    </bean>
+
+    <bean id="wosTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosAttribute2ValueContributor">
+        <property name="query" value="static_data/summary/titles/title"/>
+        <property name="attribute" value="type"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+        <property name="attributeValue2metadata" ref="title2fields"/>
+    </bean>
+
+    <util:map id="title2fields" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <entry key="item" value-ref="wos.title" />
+    </util:map>
+
+    <bean id="wos.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="wosFullNameContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.fullName"/>
+        <property name="query" value="static_data/summary/names/name/full_name"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.fullName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+<!--    <bean id="wosFirstNameContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">-->
+<!--        <property name="field" ref="wos.firstName"/>-->
+<!--        <property name="query" value="static_data/summary/names/name/first_name"/>-->
+<!--        <property name="prefixToNamespaceMapping" ref="wosNs"/>-->
+<!--    </bean>-->
+
+<!--    <bean id="wos.firstName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">-->
+<!--        <constructor-arg value="person.givenName"/>-->
+<!--    </bean>-->
+
+    <bean id="wosAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleConcatContributor">
+        <property name="field" ref="wos.abstract"/>
+        <property name="query" value="static_data/fullrecord_metadata/abstracts/abstract/abstract_text/p"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean id="wosSubjectContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMultiplePathContributor">
+        <property name="field" ref="wos.subject"/>
+        <property name="paths" ref="paths"/>
+        <property name="query" value=""/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.subject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+    <util:list id="paths" value-type="java.lang.String">
+        <value>static_data/item/keywords_plus/keyword</value>
+        <value>static_data/fullrecord_metadata/keywords/keyword</value>
+        <value>static_data/fullrecord_metadata/category_info/headings/heading</value>
+        <value>static_data/fullrecord_metadata/category_info/subheadings/subheading</value>
+    </util:list>
+
+    <bean id="wosOrcidContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumAndAttributeContributor">
+        <property name="field" ref="wos.orcid"/>
+        <property name="attribute" value="orcid_id"/>
+        <property name="query" value="static_data/summary/names/name"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.orcid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.identifier.orcid"/>
+    </bean>
+
+    <bean id="wosPublisherContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.publisher"/>
+        <property name="query" value="static_data/summary/publishers/publisher/names/name/display_name"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.publisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.publisher"/>
+    </bean>
+
+    <bean id="wosIspartofContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosAttribute2ValueContributor">
+        <property name="attribute" value="type"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+        <property name="query" value="static_data/summary/titles/title"/>
+        <property name="attributeValue2metadata" ref="ispartof2fields"/>
+    </bean>
+
+    <util:map id="ispartof2fields" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <entry key="source" value-ref="wos.ispartof" />
+    </util:map>
+
+    <bean id="wos.ispartof" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.relation.ispartof"/>
+    </bean>
+
+    <bean id="wosIspartofseriesContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosAttribute2ValueContributor">
+        <property name="attribute" value="type"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+        <property name="query" value="static_data/summary/titles/title"/>
+        <property name="attributeValue2metadata" ref="ispartofseries2fields"/>
+    </bean>
+
+    <util:map id="ispartofseries2fields" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <entry key="source" value-ref="wos.ispartofseries" />
+    </util:map>
+
+    <bean id="wos.ispartofseries" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.relation.ispartofseries"/>
+    </bean>
+
+    <bean id="wosContributorEditorContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosAttribute2ValueContributor">
+        <property name="attribute" value="role"/>
+        <property name="firstChild" value="true"/>
+        <property name="childName" value="full_name"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+        <property name="query" value="static_data/summary/names/name"/>
+        <property name="attributeValue2metadata" ref="contributorEditor2fields"/>
+    </bean>
+
+    <bean id="wosIdContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="wos.wosId"/>
+        <property name="query" value="UID"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+    <bean id="wos.wosId" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+    <util:map id="contributorEditor2fields" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <entry key="book_editor" value-ref="wos.contributorEditor" />
+    </util:map>
+
+    <bean id="wos.contributorEditor" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.editor"/>
+    </bean>
+
+    <bean id="wosRidContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosIdentifierRidContributor">
+        <property name="field" ref="wos.rid"/>
+        <property name="query" value="static_data/contributors/contributor"/>
+        <property name="prefixToNamespaceMapping" ref="wosNs"/>
+    </bean>
+
+    <bean id="wos.rid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.identifier.rid"/>
+    </bean>
+
+    <util:map id="wosNs" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+    </util:map>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/rest/google-analytics.xml b/dspace/config/spring/rest/google-analytics.xml
new file mode 100644
index 0000000000..eb36f3c1b5
--- /dev/null
+++ b/dspace/config/spring/rest/google-analytics.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+    xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
+
+    <bean id="gaClient" class="org.dspace.google.client.GoogleAnalyticsClientImpl">
+        <constructor-arg name="keyPrefix" value="G-" />
+        <constructor-arg name="requestBuilder" ref="gaClientRequestBuilder" />     
+    </bean>
+
+    <bean id="uaClient" class="org.dspace.google.client.GoogleAnalyticsClientImpl">
+        <constructor-arg name="keyPrefix" value="UA-" />
+        <constructor-arg name="requestBuilder" ref="uaClientRequestBuilder" />
+    </bean>
+    
+    <bean id="uaClientRequestBuilder" class="org.dspace.google.client.UniversalAnalyticsClientRequestBuilder">
+        <constructor-arg name="endpointUrl" value="https://www.google-analytics.com/batch" />
+    </bean>
+    
+    <bean id="gaClientRequestBuilder" class="org.dspace.google.client.GoogleAnalytics4ClientRequestBuilder" >
+        <constructor-arg name="endpointUrl" value="https://www.google-analytics.com/mp/collect" />
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/rest/post-logged-in-actions.xml b/dspace/config/spring/rest/post-logged-in-actions.xml
new file mode 100644
index 0000000000..1e02569647
--- /dev/null
+++ b/dspace/config/spring/rest/post-logged-in-actions.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util" 
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+	<bean id="researcherProfileClaimByEmail" class="org.dspace.app.rest.login.impl.ResearcherProfileAutomaticClaim">
+		<constructor-arg name="ePersonField" value="email" />
+		<constructor-arg name="profileField" value="person.email" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/rest/scripts.xml b/dspace/config/spring/rest/scripts.xml
index 563c639a10..1748c0fb45 100644
--- a/dspace/config/spring/rest/scripts.xml
+++ b/dspace/config/spring/rest/scripts.xml
@@ -38,4 +38,29 @@
         <property name="description" value="Manage the OAI-PMH harvesting of external collections"/>
         <property name="dspaceRunnableClass" value="org.dspace.app.harvest.Harvest"/>
     </bean>
+    
+    <bean id="process-cleaner" class="org.dspace.administer.ProcessCleanerConfiguration" primary="true">
+        <property name="description" value="Cleanup all the old processes in the specified state"/>
+        <property name="dspaceRunnableClass" value="org.dspace.administer.ProcessCleaner"/>
+    </bean>
+    
+    <bean id="orcid-bulk-push" class="org.dspace.orcid.script.OrcidBulkPushScriptConfiguration" primary="true">
+        <property name="description" value="Perform the bulk synchronization of all the BATCH configured ORCID entities placed in the ORCID queue"/>
+        <property name="dspaceRunnableClass" value="org.dspace.orcid.script.OrcidBulkPush"/>
+    </bean>
+    
+    <bean name="metadata-export-search" class="org.dspace.app.bulkedit.MetadataExportSearchScriptConfiguration">
+        <property name="description" value="export metadata from a discovery search" />
+        <property name="dspaceRunnableClass" value="org.dspace.app.bulkedit.MetadataExportSearch" />
+    </bean>
+
+    <bean id="import" class="org.dspace.app.itemimport.ItemImportScriptConfiguration" primary="true">
+        <property name="description" value="Batch Import from Simple Archive Format (SAF)" />
+        <property name="dspaceRunnableClass" value="org.dspace.app.itemimport.ItemImport"/>
+    </bean>
+
+    <bean id="export" class="org.dspace.app.itemexport.ItemExportScriptConfiguration" primary="true">
+        <property name="description" value="Batch Export to Simple Archive Format (SAF)"/>
+        <property name="dspaceRunnableClass" value="org.dspace.app.itemexport.ItemExport"/>
+    </bean>
 </beans>
diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index 76dc1ad88d..8aee946d84 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -514,6 +514,37 @@
 <!--                    <hint>Enter the expected completion date of the project</hint>-->
 <!--                </field>-->
 <!--            </row>-->
+            <row>
+                <relation-field>
+                    <relationship-type>isProjectOfPerson</relationship-type>
+                    <search-configuration>person</search-configuration>
+                    <repeatable>true</repeatable>
+                    <label>Investigator</label>
+                    <hint>Enter the investigator's name (Family name, Given names).</hint>
+                    <linked-metadata-field>
+                        <dc-schema>project</dc-schema>
+                        <dc-element>investigator</dc-element>
+                        <input-type>onebox</input-type>
+                    </linked-metadata-field>
+                    <externalsources>orcid</externalsources>
+                </relation-field>
+            </row>
+            <row>
+                <relation-field>
+                    <relationship-type>isProjectOfOrgUnit</relationship-type>
+                    <search-configuration>orgunit</search-configuration>
+                    <repeatable>false</repeatable>
+                    <label>Organization</label>
+                    <hint>Enter the organization's name</hint>
+                    <linked-metadata-field>
+                        <dc-schema>project</dc-schema>
+                        <dc-element>funder</dc-element>
+                        <dc-qualifier>name</dc-qualifier>
+                        <input-type>onebox</input-type>
+                    </linked-metadata-field>
+                    <externalsources/>
+                </relation-field>
+            </row>
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>
@@ -524,6 +555,39 @@
                     <hint>Enter the keywords of the project</hint>
                 </field>
             </row>
+            <row>
+                <field>
+                    <dc-schema>project</dc-schema>
+                    <dc-element>startDate</dc-element>
+                    <label>Start date</label>
+                    <input-type>date</input-type>
+                    <hint>Enter the start date of the project</hint>
+                </field>
+                <field>
+                    <dc-schema>project</dc-schema>
+                    <dc-element>endDate</dc-element>
+                    <label>End date</label>
+                    <input-type>date</input-type>
+                    <hint>Enter the end date of the project</hint>
+                </field>
+            </row>
+            <row>
+                <field>
+                    <dc-schema>project</dc-schema>
+                    <dc-element>amount</dc-element>
+                    <label>Amount</label>
+                    <input-type>onebox</input-type>
+                    <hint>Enter the amount of the project</hint>
+                </field>
+                <field>
+                    <dc-schema>project</dc-schema>
+                    <dc-element>amount</dc-element>
+                    <dc-qualifier>currency</dc-qualifier>
+                    <label>Amount currency</label>
+                    <input-type>onebox</input-type>
+                    <hint>Enter the amount currency of the project</hint>
+                </field>
+            </row>
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>
diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
index 88ddce8b32..8ecdd8344f 100644
--- a/dspace/modules/additions/pom.xml
+++ b/dspace/modules/additions/pom.xml
@@ -17,7 +17,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>7.2</version>
+      <version>7.5-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -254,30 +254,34 @@
             </exclusion>
          </exclusions>
       </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-icu</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-smartcn</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-stempel</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-        </dependency>
-
+      <dependency>
+         <groupId>org.apache.solr</groupId>
+         <artifactId>solr-solrj</artifactId>
+         <version>${solr.client.version}</version>
+      </dependency>
+      <!-- Solr Core is only needed for Integration Tests (to run a MockSolrServer) -->
+      <!-- The following Solr / Lucene dependencies also support integration tests -->
+      <dependency>
+         <groupId>org.apache.solr</groupId>
+         <artifactId>solr-core</artifactId>
+         <version>${solr.client.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.lucene</groupId>
+         <artifactId>lucene-analyzers-icu</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.lucene</groupId>
+         <artifactId>lucene-analyzers-smartcn</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.lucene</groupId>
+         <artifactId>lucene-analyzers-stempel</artifactId>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
diff --git a/dspace/modules/pom.xml b/dspace/modules/pom.xml
index 7deb4bd0d0..a2ca42b9cb 100644
--- a/dspace/modules/pom.xml
+++ b/dspace/modules/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dspace/modules/rest/pom.xml b/dspace/modules/rest/pom.xml
index 6f4097f3d7..97ddb4a808 100644
--- a/dspace/modules/rest/pom.xml
+++ b/dspace/modules/rest/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>modules</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -113,20 +113,6 @@
         <dependency>
             <groupId>org.dspace.modules</groupId>
             <artifactId>additions</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- DSpace REST Webapp -->
diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
index fadd08b014..8c738b35f0 100644
--- a/dspace/modules/server/pom.xml
+++ b/dspace/modules/server/pom.xml
@@ -13,7 +13,7 @@ just adding new jar in the classloader</description>
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -278,6 +278,11 @@ just adding new jar in the classloader</description>
             <artifactId>dspace-server-webapp</artifactId>
             <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>${solr.client.version}</version>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
@@ -324,30 +329,13 @@ just adding new jar in the classloader</description>
             <artifactId>mockito-inline</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Solr Core is only needed for Integration Tests (to run a MockSolrServer) -->
+        <!-- The following Solr / Lucene dependencies also support integration tests -->
         <dependency>
             <groupId>org.apache.solr</groupId>
-            <artifactId>solr-cell</artifactId>
+            <artifactId>solr-core</artifactId>
+            <version>${solr.client.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <!-- Newer version brought in by opencsv -->
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-                <!-- Newer Jetty version brought in via Parent POM -->
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
diff --git a/dspace/pom.xml b/dspace/pom.xml
index 54819ee041..cbf2e10c33 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.2</version>
+        <version>7.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dspace/solr/authority/conf/solrconfig.xml b/dspace/solr/authority/conf/solrconfig.xml
index 373cbb661c..21f917ebf8 100644
--- a/dspace/solr/authority/conf/solrconfig.xml
+++ b/dspace/solr/authority/conf/solrconfig.xml
@@ -79,6 +79,7 @@
         <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
         <useColdSearcher>false</useColdSearcher>
         <maxWarmingSearchers>2</maxWarmingSearchers>
+        <slowQueryThresholdMillis>1000</slowQueryThresholdMillis>
     </query>
 
     <!-- Controls how the Solr HTTP RequestDispatcher responds to requests -->
diff --git a/dspace/solr/oai/conf/solrconfig.xml b/dspace/solr/oai/conf/solrconfig.xml
index 02789fa3c2..ce8d9ebe20 100644
--- a/dspace/solr/oai/conf/solrconfig.xml
+++ b/dspace/solr/oai/conf/solrconfig.xml
@@ -88,6 +88,7 @@
         <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
         <useColdSearcher>false</useColdSearcher>
         <maxWarmingSearchers>2</maxWarmingSearchers>
+        <slowQueryThresholdMillis>1000</slowQueryThresholdMillis>
     </query>
 
     <!-- Controls how the Solr HTTP RequestDispatcher responds to requests -->
diff --git a/dspace/solr/search/conf/schema.xml b/dspace/solr/search/conf/schema.xml
index 09eeb173e2..f9c8eb9760 100644
--- a/dspace/solr/search/conf/schema.xml
+++ b/dspace/solr/search/conf/schema.xml
@@ -281,6 +281,12 @@
     <field name="SolrIndexer.lastIndexed" type="date" indexed="true" stored="true" default="NOW" multiValued="false" omitNorms="true" />
     <field name="lastModified" type="date" indexed="true" stored="true" default="NOW" multiValued="false" omitNorms="true" />
 
+    <!-- used to filter out items that are older versions of another item -->
+    <field name="latestVersion" type="boolean" indexed="true" stored="true" default="true" multiValued="false" omitNorms="true"/>
+
+     <!-- The database status of the current item -->
+     <field name="database_status" type="string" indexed="true" stored="true" omitNorms="true" docValues="true" />
+
      <!-- Dynamic field used to store the relation metadata as a keywordFilter -->
      <dynamicField name="relation.*" type="keywordFilter" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
 
diff --git a/dspace/solr/search/conf/solrconfig.xml b/dspace/solr/search/conf/solrconfig.xml
index 204c1a056e..97b1d1ddbb 100644
--- a/dspace/solr/search/conf/solrconfig.xml
+++ b/dspace/solr/search/conf/solrconfig.xml
@@ -30,9 +30,6 @@
          regex='icu4j-.*\.jar'/>
     <lib dir='${solr.install.dir}/contrib/analysis-extras/lucene-libs/'
          regex='lucene-analyzers-icu-.*\.jar'/>
-    <lib dir="${solr.install.dir}/contrib/extraction/lib" />
-    <lib dir="${solr.install.dir}/dist/"
-         regex="solr-cell-\d.*\.jar" />
 
     <dataDir>${solr.data.dir:}</dataDir>
 
@@ -64,6 +61,11 @@
         <autoSoftCommit>
             <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
         </autoSoftCommit>
+
+        <!-- This is required for Atomic Updates -->
+        <updateLog>
+            <str name="dir">${solr.ulog.dir:}</str>
+        </updateLog>
     </updateHandler>
 
     <!-- Settings for how Solr will process & respond to queries -->
@@ -97,6 +99,7 @@
         <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
         <useColdSearcher>false</useColdSearcher>
         <maxWarmingSearchers>2</maxWarmingSearchers>
+        <slowQueryThresholdMillis>1000</slowQueryThresholdMillis>
     </query>
 
     <!-- Controls how the Solr HTTP RequestDispatcher responds to requests -->
diff --git a/dspace/solr/statistics/conf/solrconfig.xml b/dspace/solr/statistics/conf/solrconfig.xml
index 9a6c161462..2b1cff4537 100644
--- a/dspace/solr/statistics/conf/solrconfig.xml
+++ b/dspace/solr/statistics/conf/solrconfig.xml
@@ -88,6 +88,7 @@
         <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
         <useColdSearcher>false</useColdSearcher>
         <maxWarmingSearchers>2</maxWarmingSearchers>
+        <slowQueryThresholdMillis>1000</slowQueryThresholdMillis>
     </query>
 
     <!-- Controls how the Solr HTTP RequestDispatcher responds to requests -->
diff --git a/dspace/src/main/config/build.xml b/dspace/src/main/config/build.xml
index 57f8ee4d6c..8b33522d2b 100644
--- a/dspace/src/main/config/build.xml
+++ b/dspace/src/main/config/build.xml
@@ -66,7 +66,7 @@ Common usage:
     <property name="irus-config" value="config/modules/irus-statistics.cfg" />
 
     <!-- Give user a chance to override without editing this file
-       (and without typing -D each time s/he compiles it) -->
+       (and without typing -D each time they compiles it) -->
     <property file="${user.home}/.dspace.properties" />
 
     <!-- Load the configurations -->
diff --git a/dspace/src/main/docker-compose/README.md b/dspace/src/main/docker-compose/README.md
index 8e00ebbbf1..a83a466bdb 100644
--- a/dspace/src/main/docker-compose/README.md
+++ b/dspace/src/main/docker-compose/README.md
@@ -1,7 +1,9 @@
 # Docker Compose Resources
 
 ***
-:warning: **NOT PRODUCTION READY**  The below Docker Compose resources are not guaranteed "production ready" at this time. They have been built for development/testing only. Therefore, DSpace Docker images may not be fully secured or up-to-date. While you are welcome to base your own images on these DSpace images/resources, these should not be used "as is" in any production scenario.
+:warning: **THESE IMAGES ARE NOT PRODUCTION READY**  The below Docker Compose images/resources were built for development/testing only.  Therefore, they may not be fully secured or up-to-date, and should not be used in production.
+
+If you wish to run DSpace on Docker in production, we recommend building your own Docker images. You are welcome to borrow ideas/concepts from the below images in doing so. But, the below images should not be used "as is" in any production scenario.
 ***
 
 ## root directory Resources
diff --git a/dspace/src/main/docker-compose/cli.assetstore.yml b/dspace/src/main/docker-compose/cli.assetstore.yml
index 7773facae6..d6a6a4395f 100644
--- a/dspace/src/main/docker-compose/cli.assetstore.yml
+++ b/dspace/src/main/docker-compose/cli.assetstore.yml
@@ -24,6 +24,6 @@ services:
           tar xvfz /tmp/assetstore.tar.gz
         fi
 
-        /dspace/bin/dspace index-discovery
+        /dspace/bin/dspace index-discovery -b
         /dspace/bin/dspace oai import
         /dspace/bin/dspace oai clean-cache
diff --git a/dspace/src/main/docker-compose/db.entities.yml b/dspace/src/main/docker-compose/db.entities.yml
index 762519f508..8d86f7bb83 100644
--- a/dspace/src/main/docker-compose/db.entities.yml
+++ b/dspace/src/main/docker-compose/db.entities.yml
@@ -13,7 +13,7 @@ services:
     image: dspace/dspace-postgres-pgcrypto:loadsql
     environment:
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-      - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-2021-04-14.sql
+      - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
   dspace:
     ### OVERRIDE default 'entrypoint' in 'docker-compose.yml ####
     # Ensure that the database is ready BEFORE starting tomcat
diff --git a/dspace/src/main/docker/README.md b/dspace/src/main/docker/README.md
index 8d7588fd28..6c9da0190c 100644
--- a/dspace/src/main/docker/README.md
+++ b/dspace/src/main/docker/README.md
@@ -1,7 +1,9 @@
 # Docker images supporting DSpace
 
 ***
-:warning: **NOT PRODUCTION READY**  The below Docker images/resources are not guaranteed "production ready" at this time. They have been built for development/testing only. Therefore, DSpace Docker images may not be fully secured or up-to-date. While you are welcome to base your own images on these DSpace images/resources, these should not be used "as is" in any production scenario.
+:warning: **THESE IMAGES ARE NOT PRODUCTION READY**  The below Docker Compose images/resources were built for development/testing only.  Therefore, they may not be fully secured or up-to-date, and should not be used in production.
+
+If you wish to run DSpace on Docker in production, we recommend building your own Docker images. You are welcome to borrow ideas/concepts from the below images in doing so. But, the below images should not be used "as is" in any production scenario.
 ***
 
 ## Dockerfile.dependencies
diff --git a/pom.xml b/pom.xml
index 1f12c0c9f2..c66f46c9d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.dspace</groupId>
     <artifactId>dspace-parent</artifactId>
     <packaging>pom</packaging>
-    <version>7.2</version>
+    <version>7.5-SNAPSHOT</version>
     <name>DSpace Parent Project</name>
     <description>
    	DSpace open source software is a turnkey institutional repository application.
@@ -13,39 +13,42 @@
 
     <organization>
         <name>LYRASIS</name>
-        <url>http://www.dspace.org</url>
+        <url>https://dspace.org</url>
     </organization>
 
     <properties>
         <!--=== GENERAL / DSPACE-API DEPENDENCIES ===-->
         <java.version>11</java.version>
-        <spring.version>5.2.5.RELEASE</spring.version>
-        <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
-        <spring-security.version>5.2.2.RELEASE</spring-security.version> <!-- sync with version used by spring-boot-->
-        <hibernate.version>5.4.10.Final</hibernate.version>
-        <hibernate-validator.version>6.0.18.Final</hibernate-validator.version>
-        <postgresql.driver.version>42.2.25</postgresql.driver.version>
-        <solr.client.version>8.8.1</solr.client.version>
+        <spring.version>5.3.20</spring.version>
+        <spring-boot.version>2.6.8</spring-boot.version>
+        <spring-security.version>5.6.5</spring-security.version> <!-- sync with version used by spring-boot-->
+        <hibernate.version>5.6.5.Final</hibernate.version>
+        <hibernate-validator.version>6.0.23.Final</hibernate-validator.version>
+        <postgresql.driver.version>42.4.3</postgresql.driver.version>
+        <solr.client.version>8.11.1</solr.client.version>
 
-        <axiom.version>1.2.22</axiom.version>
+        <ehcache.version>3.4.0</ehcache.version>
         <errorprone.version>2.10.0</errorprone.version>
-        <!-- NOTE: when updating jackson.version, also sync jackson-databind dependency below -->
-        <jackson.version>2.12.3</jackson.version>
+        <!-- NOTE: when updating jackson.version, also sync jackson-databind.version below -->
+        <jackson.version>2.13.4</jackson.version>
+        <jackson-databind.version>2.13.4.2</jackson-databind.version>
         <javax-annotation.version>1.3.2</javax-annotation.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <jaxb-runtime.version>2.3.1</jaxb-runtime.version>
+        <jcache-version>1.1.0</jcache-version>
         <!-- NOTE: Jetty needed for Solr, Handle Server & tests -->
-        <jetty.version>9.4.41.v20210516</jetty.version>
+        <jetty.version>9.4.48.v20220622</jetty.version>
         <log4j.version>2.17.1</log4j.version>
-        <pdfbox-version>2.0.24</pdfbox-version>
-        <poi-version>3.17</poi-version>
+        <pdfbox-version>2.0.27</pdfbox-version>
+        <rome.version>1.18.0</rome.version>
         <slf4j.version>1.7.25</slf4j.version>
+        <tika.version>2.3.0</tika.version>
+        <!-- Sync with whatever version Tika uses -->
+        <bouncycastle.version>1.70</bouncycastle.version>
 
         <!--=== SERVER WEBAPP DEPENDENCIES ===-->
-        <!-- Spring Data REST HAL Browser (used by Server webapp) -->
-        <spring-hal-browser.version>3.2.6.RELEASE</spring-hal-browser.version>
         <!-- Library for reading JSON documents: https://github.com/json-path/JsonPath (used by Server webapp) -->
-        <json-path.version>2.4.0</json-path.version>
+        <json-path.version>2.6.0</json-path.version>
         <!-- Library for managing JSON Web Tokens (JWT): https://bitbucket.org/connect2id/nimbus-jose-jwt/wiki/Home
              (used by Server webapp) -->
         <nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version>
@@ -55,7 +58,7 @@
              https://jena.apache.org/documentation/migrate_jena2_jena3.html -->
         <jena.version>2.13.0</jena.version>
         <!-- Used by (now obsolete) 'dspace-rest' WAR -->
-        <jersey.version>2.30.1</jersey.version>
+        <jersey.version>2.35</jersey.version>
 
         <!--=== MAVEN SETTINGS ===-->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -155,6 +158,7 @@
                             <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
                             <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                             <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+                            <arg>-Xpkginfo:always</arg>
                         </compilerArgs>
                         <annotationProcessorPaths>
                             <path>
@@ -699,7 +703,7 @@
                                         <licenseMerge>Apache Software License, Version 2.0|The SAX License|The W3C License</licenseMerge>
                                         <!-- JDOM uses this license, but it's essentially just Apache -->
                                         <licenseMerge>Apache Software License, Version 2.0|Similar to Apache License but with the acknowledgment clause removed</licenseMerge>
-                                        <licenseMerge>BSD License|The BSD License|BSD licence|BSD license|BSD|BSD-style license|New BSD License|New BSD license|Revised BSD License|BSD 2-Clause license|3-Clause BSD License|BSD 2-Clause|BSD 3-clause New License|BSD Licence 3|BSD-2-Clause|BSD-3-Clause|Modified BSD|The New BSD License</licenseMerge>
+                                        <licenseMerge>BSD License|The BSD License|BSD licence|BSD license|BSD|BSD-style license|New BSD License|New BSD license|Revised BSD License|BSD 2-Clause license|3-Clause BSD License|BSD 2-Clause|BSD 3-clause New License|BSD Licence 3|BSD-2-Clause|BSD-3-Clause|Modified BSD|The New BSD License|The BSD 3-Clause License (BSD3)|BSD License 3</licenseMerge>
                                         <!-- DSpace uses a BSD License -->
                                         <licenseMerge>BSD License|DSpace BSD License|DSpace Sourcecode License</licenseMerge>
                                         <!-- Coverity uses modified BSD: https://github.com/coverity/coverity-security-library -->
@@ -720,7 +724,7 @@
                                         <!-- JBoss Transaction API claims this license, but it is dual licensed with CDDL being one: https://github.com/jboss/jboss-transaction-api_spec -->
                                         <licenseMerge>Common Development and Distribution License (CDDL)|GNU General Public License, Version 2 with the Classpath Exception</licenseMerge>
                                         <licenseMerge>Eclipse Distribution License, Version 1.0|Eclipse Distribution License (EDL), Version 1.0|Eclipse Distribution License - v 1.0|Eclipse Distribution License v. 1.0|EDL 1.0</licenseMerge>
-                                        <licenseMerge>Eclipse Public License|Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0|EPL 1.0 license|Eclipse Public License (EPL), Version 1.0|Eclipse Public License 1.0|Eclipse Public License v1.0|Eclipse Public License, Version 1.0|EPL 2.0</licenseMerge>
+                                        <licenseMerge>Eclipse Public License|Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0|EPL 1.0 license|Eclipse Public License (EPL), Version 1.0|Eclipse Public License 1.0|Eclipse Public License v1.0|Eclipse Public License, Version 1.0|EPL 1.0|EPL 2.0|Eclipse Public License - v 2.0</licenseMerge>
                                         <!-- JUnit claims this license but is actually Eclipse Public License: http://junit.org/license.html -->
                                         <licenseMerge>Eclipse Public License|Common Public License Version 1.0</licenseMerge>
                                         <!-- Jersey is dual licensed as EPL but lists its main license as GPL: https://github.com/eclipse-ee4j/jersey#licensing-and-governance -->
@@ -735,9 +739,9 @@
                                         <licenseMerge>MIT License|(MIT-style) netCDF C library license</licenseMerge>
                                         <licenseMerge>Mozilla Public License|Mozilla Public License version 1.1|Mozilla Public License 1.1 (MPL 1.1)|MPL 1.1|Mozilla Public License Version 2.0|Mozilla Public License, Version 2.0</licenseMerge>
                                         <!-- H2 Database claims this license, but for our purposes it's MPL: http://www.h2database.com -->
-                                        <licenseMerge>Mozilla Public License|MPL 2.0, and EPL 1.0</licenseMerge>
+                                        <licenseMerge>Mozilla Public License|MPL 2.0, and EPL 1.0|MPL 2.0</licenseMerge>
                                         <!-- "concurrent.concurrent" claims this license, but is actually Public Domain: http://mvnrepository.com/artifact/concurrent/concurrent/ -->
-                                        <licenseMerge>Public Domain|Public domain, Sun Microsoystems</licenseMerge>
+                                        <licenseMerge>Public Domain|Public domain, Sun Microsoystems|Public Domain, per Creative Commons CC0</licenseMerge>
                                         <!-- WTFPL is essentially Public Domain: http://www.wtfpl.net/ ;) -->
                                         <licenseMerge>Public Domain|WTFPL</licenseMerge>
                                     </licenseMerges>
@@ -868,14 +872,14 @@
                    <dependency>
                        <groupId>org.dspace</groupId>
                        <artifactId>dspace-rest</artifactId>
-                       <version>7.2</version>
+                       <version>7.5-SNAPSHOT</version>
                        <type>jar</type>
                        <classifier>classes</classifier>
                    </dependency>
                    <dependency>
                        <groupId>org.dspace</groupId>
                        <artifactId>dspace-rest</artifactId>
-                       <version>7.2</version>
+                       <version>7.5-SNAPSHOT</version>
                        <type>war</type>
                    </dependency>
                </dependencies>
@@ -1026,69 +1030,69 @@
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-api</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-api</artifactId>
                 <type>test-jar</type>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace.modules</groupId>
                 <artifactId>additions</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-sword</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-swordv2</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-oai</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-services</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
                 <type>test-jar</type>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-rdf</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-iiif</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
                 <type>jar</type>
                 <classifier>classes</classifier>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
-                <version>7.2</version>
+                <version>7.5-SNAPSHOT</version>
                 <type>war</type>
             </dependency>
             <!-- DSpace API Localization Packages -->
@@ -1106,28 +1110,6 @@
                 <version>${postgresql.driver.version}</version>
             </dependency>
 
-            <!-- Solr introduces multiple versions of zookeeper. So,
-                 we specify the version we want -->
-            <dependency>
-                <groupId>org.apache.zookeeper</groupId>
-                <artifactId>zookeeper</artifactId>
-                <version>3.4.14</version>
-            </dependency>
-
-            <!-- solr-cell and axiom-api disagree on versions -->
-            <dependency>
-                <groupId>org.apache.james</groupId>
-                <artifactId>apache-mime4j-core</artifactId>
-                <version>0.8.3</version>
-            </dependency>
-
-            <!-- solr-core, solr-cell disagree with nimbus-jose-jwt -->
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>8.0.1</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-core</artifactId>
@@ -1142,10 +1124,16 @@
 
             <dependency>
                 <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-ehcache</artifactId>
+                <artifactId>hibernate-jcache</artifactId>
                 <version>${hibernate.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>javax.cache</groupId>
+                <artifactId>cache-api</artifactId>
+                <version>${jcache-version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-validator</artifactId>
@@ -1153,6 +1141,30 @@
                 <version>${hibernate-validator.version}</version>
             </dependency>
 
+            <!-- Hibernate introduces multiple versions of jboss-logging. So, specify version we want -->
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging</artifactId>
+                <version>3.4.3.Final</version>
+            </dependency>
+
+            <!-- Rome is used for RSS / ATOM syndication feeds -->
+            <dependency>
+                <groupId>com.rometools</groupId>
+                <artifactId>rome</artifactId>
+                <version>${rome.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rometools</groupId>
+                <artifactId>rome-modules</artifactId>
+                <version>${rome.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rometools</groupId>
+                <artifactId>rome-utils</artifactId>
+                <version>${rome.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-orm</artifactId>
@@ -1254,7 +1266,7 @@
 
             <dependency>
                 <groupId>org.apache.solr</groupId>
-                <artifactId>solr-cell</artifactId>
+                <artifactId>solr-solrj</artifactId>
                 <version>${solr.client.version}</version>
             </dependency>
             <dependency>
@@ -1262,35 +1274,43 @@
                 <artifactId>lucene-core</artifactId>
                 <version>${solr.client.version}</version>
             </dependency>
-            <!-- Used for full-text indexing with Solr. Should be synced with version of Tika in solr-cell -->
+
+            <!-- Tika is used to extract full text from documents in order to index in Solr -->
             <dependency>
                 <groupId>org.apache.tika</groupId>
-                <artifactId>tika-parsers</artifactId>
-                <version>1.24.1</version>
-                <!-- Exclude a few tika-parsers dependencies that we already use, with slightly different versions -->
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.google.protobuf</groupId>
-                        <artifactId>protobuf-java</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>net.sf.ehcache</groupId>
-                        <artifactId>ehcache-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jakarta.ws.rs</groupId>
-                        <artifactId>jakarta.ws.rs-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.soap</groupId>
-                        <artifactId>javax.xml.soap-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.jvnet.staxex</groupId>
-                        <artifactId>stax-ex</artifactId>
-                    </exclusion>
-                </exclusions>
+                <artifactId>tika-core</artifactId>
+                <version>${tika.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.tika</groupId>
+                <artifactId>tika-parsers-standard-package</artifactId>
+                <version>${tika.version}</version>
+            </dependency>
+            <!-- Tika brings in multiple versions of this. Select the latest version. Always sync with Tika version -->
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <!-- Tika brings in multiple versions of this. Select the latest version. Always sync with Tika version -->
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <!-- Tika and axiom-api (in dspace-swordv2) disagree on versions -->
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>apache-mime4j-core</artifactId>
+                <version>0.8.4</version>
+            </dependency>
+            <!-- Tika and solr-core disagree on versions of ASM -->
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>8.0.1</version>
+            </dependency>
+
             <!-- Reminder: Keep icu4j (in Parent POM) synced with version used by lucene-analyzers-icu below,
              otherwise ICUFoldingFilterFactory may throw errors in tests.  -->
             <dependency>
@@ -1328,7 +1348,7 @@
                         <groupId>org.slf4j</groupId>
                         <artifactId>slf4j-log4j12</artifactId>
                     </exclusion>
-                    <!-- Newer version brought in by solr-cell -->
+                    <!-- Newer version brought in by Tika -->
                     <exclusion>
                         <groupId>org.apache.commons</groupId>
                         <artifactId>commons-csv</artifactId>
@@ -1339,34 +1359,83 @@
                 <groupId>net.handle</groupId>
                 <artifactId>handle</artifactId>
                 <version>9.3.0</version>
+		<exclusions>
+                    <!-- A later version is brought in by google-oauth-client -->
+                    <exclusion>
+                        <groupId>com.google.code.gson</groupId>
+                        <artifactId>gson</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <!-- Required to run Handle Server -->
             <dependency>
                 <groupId>net.cnri</groupId>
                 <artifactId>cnri-servlet-container</artifactId>
                 <version>3.0.0</version>
-                <exclusions>
-                    <!-- A later version of Jetty is pulled in below -->
-                    <exclusion>
-                        <groupId>org.eclipse.jetty</groupId>
-                        <artifactId>jetty-http</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.eclipse.jetty</groupId>
-                        <artifactId>jetty-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.eclipse.jetty</groupId>
-                        <artifactId>jetty-util</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
-            <!-- Jetty is needed to run Handle Server (and tests in some modules) -->
+            <!-- Jetty is needed to run Handle Server (and tests in some modules)
+                 Solr and Handle Server disagree on version of Jetty, so we force a specific version here. -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-alpn-java-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-deploy</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-http</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-io</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlets</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-webapp</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-xml</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.http2</groupId>
+                <artifactId>http2-common</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.http2</groupId>
+                <artifactId>http2-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>mets</artifactId>
@@ -1405,12 +1474,12 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-configuration2</artifactId>
-                <version>2.7</version>
+                <version>2.8.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>
-                <version>2.8.0</version>
+                <version>2.9.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-fileupload</groupId>
@@ -1425,7 +1494,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.7</version>
+                <version>3.12.0</version>
             </dependency>
             <!-- NOTE: We don't use commons-logging directly, but many dependencies rely on it.
                  So, we specify the version to use to avoid dependency convergence issues. -->
@@ -1437,7 +1506,12 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-pool2</artifactId>
-                <version>2.9.0</version>
+                <version>2.11.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>1.10.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-validator</groupId>
@@ -1460,6 +1534,7 @@
                 <version>3.1.0</version>
             </dependency>
 
+            <!-- Jaxen is needed by xoai and sword2-server, but they disagree on the versions -->
             <dependency>
                 <groupId>jaxen</groupId>
                 <artifactId>jaxen</artifactId>
@@ -1473,8 +1548,8 @@
             </dependency>
             <dependency>
                 <groupId>org.jdom</groupId>
-                <artifactId>jdom</artifactId>
-                <version>1.1.3</version>
+                <artifactId>jdom2</artifactId>
+                <version>2.0.6.1</version>
             </dependency>
 
             <dependency>
@@ -1523,55 +1598,13 @@
                 <artifactId>fontbox</artifactId>
                 <version>${pdfbox-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi</artifactId>
-                <version>${poi-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-scratchpad</artifactId>
-                <version>${poi-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>${poi-version}</version>
-                <exclusions>
-                    <!-- Newer version brought in by solr-cell -->
-                    <exclusion>
-                        <groupId>com.github.virtuald</groupId>
-                        <artifactId>curvesapi</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml-schemas</artifactId>
-                <version>${poi-version}</version>
-                <exclusions>
-                    <!-- Newer version pulled in below -->
-                    <exclusion>
-                        <groupId>org.apache.xmlbeans</groupId>
-                        <artifactId>xmlbeans</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xmlbeans</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>3.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>xalan</groupId>
-                <artifactId>xalan</artifactId>
-                <version>2.7.0</version>
-            </dependency>
+            <!-- Tika and Jena disagree on version of Xerces to use. Select latest -->
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
-                <version>2.12.0</version>
+                <version>2.12.2</version>
             </dependency>
+            <!-- SWORDv1 and SWORDv2 modules both pull in various versions of xml-apis. Select latest version -->
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
@@ -1589,21 +1622,27 @@
                 <artifactId>ojdbc6</artifactId>
                 <version>11.2.0.4.0</version>
             </dependency>
+            <!-- Codebase at https://github.com/DSpace/oclc-harvester2 -->
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>oclc-harvester2</artifactId>
-                <version>0.1.12</version>
+                <version>1.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.4</version>
+                <version>4.4.15</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
                 <version>4.5.13</version>
             </dependency>
+            <dependency>
+              <groupId>org.apache.httpcomponents</groupId>
+              <artifactId>httpmime</artifactId>
+              <version>4.5.13</version>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
@@ -1660,15 +1699,9 @@
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>1.4.187</version>
+                <version>2.1.210</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>2.8.6</version>
-                <scope>compile</scope>
-            </dependency>
             <!-- Google Analytics -->
             <dependency>
                 <groupId>com.google.apis</groupId>
@@ -1703,7 +1736,7 @@
             <dependency>
                 <groupId>com.google.oauth-client</groupId>
                 <artifactId>google-oauth-client</artifactId>
-                <version>1.32.1</version>
+                <version>1.33.3</version>
             </dependency>
 
             <!-- Findbugs annotations -->
@@ -1739,18 +1772,40 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson.version}</version>
+                <version>${jackson-databind.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>30.0-jre</version>
+                <version>31.0.1-jre</version>
+                <exclusions>
+                    <!-- Use version provided by Solr / Postgres -->
+                    <exclusion>
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>xom</groupId>
                 <artifactId>xom</artifactId>
                 <version>1.2.5</version>
             </dependency>
+
+            <!-- json-path is needed by Spring HATEOAS -->
+            <dependency>
+                <groupId>com.jayway.jsonpath</groupId>
+                <artifactId>json-path</artifactId>
+                <version>${json-path.version}</version>
+            </dependency>
+            <!-- json-path-assert is just needed by tests -->
+            <dependency>
+                <groupId>com.jayway.jsonpath</groupId>
+                <artifactId>json-path-assert</artifactId>
+                <version>${json-path.version}</version>
+                <scope>test</scope>
+            </dependency>
+
             <!-- JAXB API and implementation (no longer bundled as of Java 11) -->
             <dependency>
                 <groupId>javax.xml.bind</groupId>
@@ -1877,7 +1932,7 @@
         <connection>scm:git:git@github.com:DSpace/DSpace.git</connection>
         <developerConnection>scm:git:git@github.com:DSpace/DSpace.git</developerConnection>
         <url>git@github.com:DSpace/DSpace.git</url>
-        <tag>dspace-7.2</tag>
+        <tag>HEAD</tag>
     </scm>